summaryrefslogtreecommitdiff
path: root/common.mak
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-10-30 07:54:18 +0000
committerDiego Biurrun <diego@biurrun.de>2007-10-30 07:54:18 +0000
commit582c1c47da05f621b84568deb50e7f89ca0dc88c (patch)
tree1f22081f43eda899bf6600d470afae040d1bf20a /common.mak
parent992e78f5f2724bf4649211aaceb353fc0e22f7ee (diff)
downloadffmpeg-582c1c47da05f621b84568deb50e7f89ca0dc88c.tar.gz
Declare libpostproc prerequisites directly instead of using a layer of
indirection. This moves build system workarounds closer to libpostproc where they are really needed. Originally committed as revision 10874 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'common.mak')
-rw-r--r--common.mak6
1 files changed, 2 insertions, 4 deletions
diff --git a/common.mak b/common.mak
index 9030a6969f..babcd10329 100644
--- a/common.mak
+++ b/common.mak
@@ -16,12 +16,10 @@ CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
-STATIC_OBJS := $(OBJS) $(STATIC_OBJS)
-SHARED_OBJS := $(OBJS) $(SHARED_OBJS)
all: $(LIBNAME) $(SLIBNAME)
-$(LIBNAME): $(STATIC_OBJS)
+$(LIBNAME): $(OBJS)
rm -f $@
$(AR) rc $@ $^ $(EXTRAOBJS)
$(RANLIB) $@
@@ -29,7 +27,7 @@ $(LIBNAME): $(STATIC_OBJS)
$(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
$(LN_S) $^ $@
-$(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
+$(SLIBNAME_WITH_MAJOR): $(OBJS)
$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
$(SLIB_EXTRA_CMD)