Commit 1e8dc1a8 authored by diego's avatar diego

Move EXTRALIBS handling to common.mak.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6545 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 32b251dd
...@@ -10,6 +10,8 @@ OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS) ...@@ -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)
......
...@@ -366,8 +366,6 @@ CFLAGS += $(CFLAGS-yes) ...@@ -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)
......
...@@ -160,8 +160,7 @@ OBJS-$(CONFIG_AUDIO_DEMUXER) += audio.o ...@@ -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
......
...@@ -4,8 +4,6 @@ include ../config.mak ...@@ -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)
......
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