Skip to content

F
ffmpeg.wasm-core
Commit 425139d5 authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

Simplify EXTRALIBS handling. 

Originally committed as revision 6558 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 0eb59ddb
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
libavcodec/Makefile
View file @ 425139d5
...@@ -400,7 +400,6 @@ OBJS += $(OBJS-yes) ...@@ -400,7 +400,6 @@ OBJS += $(OBJS-yes)
ASM_OBJS += $(ASM_OBJS-yes) ASM_OBJS += $(ASM_OBJS-yes)
NAME=avcodec NAME=avcodec
LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVCVERSION) LIBVERSION=$(LAVCVERSION)
LIBMAJOR=$(LAVCMAJOR) LIBMAJOR=$(LAVCMAJOR)
...@@ -432,7 +431,7 @@ clean:: ...@@ -432,7 +431,7 @@ clean::
# api example program # api example program
apiexample: apiexample.c $(LIB) apiexample: apiexample.c $(LIB)
$(CC) $(CFLAGS) -o $@ $^ $(LIBAVUTIL) $(EXTRALIBS) $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS)
# cpuid test # cpuid test
cpuid_test: i386/cputest.c cpuid_test: i386/cputest.c
...@@ -444,12 +443,12 @@ imgresample-test: imgresample.c ...@@ -444,12 +443,12 @@ imgresample-test: imgresample.c
$(CC) $(CFLAGS) -DTEST -o $@ $^ -lm $(CC) $(CFLAGS) -DTEST -o $@ $^ -lm
dct-test: dct-test.o fdctref.o $(LIB) dct-test: dct-test.o fdctref.o $(LIB)
$(CC) -o $@ $^ -lm $(LIBAVUTIL) $(CC) -o $@ $^ $(EXTRALIBS)
motion-test: motion_test.o $(LIB) motion-test: motion_test.o $(LIB)
$(CC) -o $@ $^ -lm $(CC) -o $@ $^ -lm
fft-test: fft-test.o $(LIB) fft-test: fft-test.o $(LIB)
$(CC) -o $@ $^ $(LIBAVUTIL) -lm $(CC) -o $@ $^ $(EXTRALIBS)
.PHONY: amrlibs tests .PHONY: amrlibs tests
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment