Browse Source

Move EXTRALIBS handling to common.mak.

Originally committed as revision 6545 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Diego Biurrun 19 years ago
parent
commit
0533322ea3
4 changed files with 3 additions and 6 deletions
  1. +2
    -0
      common.mak
  2. +0
    -2
      libavcodec/Makefile
  3. +1
    -2
      libavformat/Makefile
  4. +0
    -2
      libpostproc/Makefile

+ 2
- 0
common.mak View File

@@ -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)


+ 0
- 2
libavcodec/Makefile View File

@@ -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)


+ 1
- 2
libavformat/Makefile View File

@@ -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


+ 0
- 2
libpostproc/Makefile View File

@@ -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)


Loading…
Cancel
Save