virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Move EXTRALIBS handling to common.mak.

Browse Source 
Originally committed as revision 6545 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-10-03 19:23:39 +00:00
parent 5523d5f41e
commit 0533322ea3
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.mak
View File

@ -10,6 +10,8 @@ OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
STATIC_OBJS := $(OBJS) $(STATIC_OBJS) STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
SHARED_OBJS := $(OBJS) $(SHARED_OBJS) SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
all: $(EXTRADEPS) $(LIB) $(SLIBNAME) all: $(EXTRADEPS) $(LIB) $(SLIBNAME)
$(LIB): $(STATIC_OBJS) $(LIB): $(STATIC_OBJS)

2
libavcodec/Makefile
View File

@ -366,8 +366,6 @@ CFLAGS += $(CFLAGS-yes)
OBJS += $(OBJS-yes) OBJS += $(OBJS-yes)
ASM_OBJS += $(ASM_OBJS-yes) ASM_OBJS += $(ASM_OBJS-yes)
EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
NAME=avcodec NAME=avcodec
LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF) LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF)
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)

3
libavformat/Makefile
View File

@ -160,8 +160,7 @@ OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o
OBJS-$(CONFIG_AUDIO_MUXER) += audio.o OBJS-$(CONFIG_AUDIO_MUXER) += audio.o
endif endif
EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) \ EXTRALIBS := -lavcodec$(BUILDSUF) -L../libavcodec $(EXTRALIBS)
-lavcodec$(BUILDSUF) -L../libavcodec $(EXTRALIBS)
ifeq ($(CONFIG_AUDIO_BEOS),yes) ifeq ($(CONFIG_AUDIO_BEOS),yes)
CPPOBJS+= beosaudio.o CPPOBJS+= beosaudio.o

2
libpostproc/Makefile
View File

@ -4,8 +4,6 @@ include ../config.mak
# Overload incdir, postproc include files go in a different directory. # Overload incdir, postproc include files go in a different directory.
incdir=$(prefix)/include/postproc incdir=$(prefix)/include/postproc
EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
NAME=postproc NAME=postproc
ifeq ($(BUILD_SHARED),yes) ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(SPPVERSION) LIBVERSION=$(SPPVERSION)