aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-10-05 17:10:33 +0000
committerDiego Biurrun <diego@biurrun.de>2006-10-05 17:10:33 +0000
commitc6c4651138107827b8ad700de2148037df640f38 (patch)
treeec87a8f085d5302a2bfda452597c1f7e400c0abc
parent885e691aafa4c55ac1be5507bf702c29ba96be2a (diff)
downloadffmpeg-c6c4651138107827b8ad700de2148037df640f38.tar.gz
Simplify test program build.
Originally committed as revision 6563 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--common.mak3
-rw-r--r--libavcodec/Makefile10
2 files changed, 4 insertions, 9 deletions
diff --git a/common.mak b/common.mak
index 01d44840c8..7ef4693b12 100644
--- a/common.mak
+++ b/common.mak
@@ -36,6 +36,9 @@ $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
%.o: %.cpp
g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
+%: %.o $(LIB)
+ $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS)
+
depend dep: $(SRCS)
$(CC) -MM $(CFLAGS) $^ 1>.depend
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index fbf8e0b17d..daef1b2840 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -429,26 +429,18 @@ clean::
-$(MAKE) -C amr clean
-$(MAKE) -C amrwb_float -f makefile.gcc clean
-# api example program
-apiexample: apiexample.c $(LIB)
- $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS)
+apiexample: apiexample.o $(LIB)
-# cpuid test
cpuid_test: i386/cputest.c
$(CC) $(CFLAGS) -D__TEST__ -o $@ $<
-# testing progs
-
imgresample-test: imgresample.c $(LIB)
$(CC) $(CFLAGS) -DTEST -o $@ $^ $(EXTRALIBS)
dct-test: dct-test.o fdctref.o $(LIB)
- $(CC) -o $@ $^ $(EXTRALIBS)
motion-test: motion_test.o $(LIB)
- $(CC) -o $@ $^ -lm
fft-test: fft-test.o $(LIB)
- $(CC) -o $@ $^ $(EXTRALIBS)
.PHONY: amrlibs tests