[SCM] libav/experimental: Declare libpostproc prerequisites directly instead of using a layer of indirection. This moves build system workarounds closer to libpostproc where they are really needed.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:08:49 UTC 2013
The following commit has been merged in the experimental branch:
commit 582c1c47da05f621b84568deb50e7f89ca0dc88c
Author: Diego Biurrun <diego at biurrun.de>
Date: Tue Oct 30 07:54:18 2007 +0000
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
diff --git a/common.mak b/common.mak
index 9030a69..babcd10 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)
diff --git a/libpostproc/Makefile b/libpostproc/Makefile
index 452c105..a39470b 100644
--- a/libpostproc/Makefile
+++ b/libpostproc/Makefile
@@ -10,13 +10,13 @@ NAME=postproc
LIBVERSION=$(SPPVERSION)
LIBMAJOR=$(SPPMAJOR)
-STATIC_OBJS=postprocess.o
-SHARED_OBJS=postprocess_pic.o
-
HEADERS = postprocess.h
include ../common.mak
+$(LIBNAME): postprocess.o
+$(SLIBNAME_WITH_MAJOR): postprocess_pic.o
+
depend dep: postprocess.c
postprocess_pic.o: postprocess.c
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list