[FFmpeg-cvslog] r10874 - in trunk: common.mak libpostproc/Makefile

[diego]

Author: diego
Date: Tue Oct 30 08:54:18 2007
New Revision: 10874

Log:
Declare libpostproc prerequisites directly instead of using a layer of
indirection. This moves build system workarounds closer to libpostproc
where they are really needed.


Modified:
   trunk/common.mak
   trunk/libpostproc/Makefile

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Tue Oct 30 08:54:18 2007
@@ -16,12 +16,10 @@ CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFF
 
 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)
 

Modified: trunk/libpostproc/Makefile
==============================================================================
--- trunk/libpostproc/Makefile	(original)
+++ trunk/libpostproc/Makefile	Tue Oct 30 08:54:18 2007
@@ -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