diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-10-05 00:32:56 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-10-05 00:32:56 +0000 |
| commit | 425139d55f62b302ba7d5249d1ce2482a8d5a447 (patch) | |
| tree | 979ee675fe750e7cecb111e1c4cd6783c6061e80 /libavcodec/Makefile | |
| parent | 0eb59ddba4315a6cd2e979e653c551d3463449ec (diff) | |
| download | ffmpeg-425139d55f62b302ba7d5249d1ce2482a8d5a447.tar.gz | |
Simplify EXTRALIBS handling.
Originally committed as revision 6558 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 09b3009cce..0d24bb96d9 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -400,7 +400,6 @@ OBJS += $(OBJS-yes) ASM_OBJS += $(ASM_OBJS-yes) NAME=avcodec -LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF) ifeq ($(BUILD_SHARED),yes) LIBVERSION=$(LAVCVERSION) LIBMAJOR=$(LAVCMAJOR) @@ -432,7 +431,7 @@ clean:: # api example program apiexample: apiexample.c $(LIB) - $(CC) $(CFLAGS) -o $@ $^ $(LIBAVUTIL) $(EXTRALIBS) + $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS) # cpuid test cpuid_test: i386/cputest.c @@ -444,12 +443,12 @@ imgresample-test: imgresample.c $(CC) $(CFLAGS) -DTEST -o $@ $^ -lm dct-test: dct-test.o fdctref.o $(LIB) - $(CC) -o $@ $^ -lm $(LIBAVUTIL) + $(CC) -o $@ $^ $(EXTRALIBS) motion-test: motion_test.o $(LIB) $(CC) -o $@ $^ -lm fft-test: fft-test.o $(LIB) - $(CC) -o $@ $^ $(LIBAVUTIL) -lm + $(CC) -o $@ $^ $(EXTRALIBS) .PHONY: amrlibs tests |