diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-10-03 19:23:39 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-10-03 19:23:39 +0000 |
| commit | 0533322ea3e91c3f7efc642456a024a305ecb967 (patch) | |
| tree | deb208cddefd73ea415ee6771474e8d8f42b9dec | |
| parent | 5523d5f41ef1b47bf262c333e504f589668ed30f (diff) | |
| download | ffmpeg-0533322ea3e91c3f7efc642456a024a305ecb967.tar.gz | |
Move EXTRALIBS handling to common.mak.
Originally committed as revision 6545 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | common.mak | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 3 | ||||
| -rw-r--r-- | libpostproc/Makefile | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/common.mak b/common.mak index cc7c7823f4..ac570c1f51 100644 --- a/common.mak +++ b/common.mak @@ -10,6 +10,8 @@ OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS) STATIC_OBJS := $(OBJS) $(STATIC_OBJS) SHARED_OBJS := $(OBJS) $(SHARED_OBJS) +EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) + all: $(EXTRADEPS) $(LIB) $(SLIBNAME) $(LIB): $(STATIC_OBJS) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 17481c3893..937269a006 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -366,8 +366,6 @@ CFLAGS += $(CFLAGS-yes) OBJS += $(OBJS-yes) ASM_OBJS += $(ASM_OBJS-yes) -EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) - NAME=avcodec LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF) ifeq ($(BUILD_SHARED),yes) diff --git a/libavformat/Makefile b/libavformat/Makefile index 0c01c67761..a9a4632e0a 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -160,8 +160,7 @@ OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o OBJS-$(CONFIG_AUDIO_MUXER) += audio.o endif -EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) \ - -lavcodec$(BUILDSUF) -L../libavcodec $(EXTRALIBS) +EXTRALIBS := -lavcodec$(BUILDSUF) -L../libavcodec $(EXTRALIBS) ifeq ($(CONFIG_AUDIO_BEOS),yes) CPPOBJS+= beosaudio.o diff --git a/libpostproc/Makefile b/libpostproc/Makefile index 6f3527c24d..e3d320bc62 100644 --- a/libpostproc/Makefile +++ b/libpostproc/Makefile @@ -4,8 +4,6 @@ include ../config.mak # Overload incdir, postproc include files go in a different directory. incdir=$(prefix)/include/postproc -EXTRALIBS := -L../libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) - NAME=postproc ifeq ($(BUILD_SHARED),yes) LIBVERSION=$(SPPVERSION) |