[FFmpeg-cvslog] r12777 - in trunk: Makefile common.mak subdir.mak

[mru]

Author: mru
Date: Wed Apr  9 23:11:39 2008
New Revision: 12777

Log:
move DEP_LIBS to common.mak


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

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Wed Apr  9 23:11:39 2008
@@ -33,9 +33,6 @@ include common.mak
 FF_LDFLAGS   := $(FFLDFLAGS)
 FF_EXTRALIBS := $(FFEXTRALIBS)
 
-S := $(BUILD_SHARED:yes=S)
-DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(S)LIBNAME))
-
 ALL_TARGETS-$(CONFIG_VHOOK) += videohook
 ALL_TARGETS-$(BUILD_DOC)    += documentation
 

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Wed Apr  9 23:11:39 2008
@@ -57,6 +57,8 @@ SRCS  := $(addprefix $(SUBDIR),$(SRCS))
 OBJS  := $(addprefix $(SUBDIR),$(OBJS))
 TESTS := $(addprefix $(SUBDIR),$(TESTS))
 
+DEP_LIBS:=$(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME))
+
 ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h))
 checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
 

Modified: trunk/subdir.mak
==============================================================================
--- trunk/subdir.mak	(original)
+++ trunk/subdir.mak	Wed Apr  9 23:11:39 2008
@@ -33,8 +33,7 @@ $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS)
 	$(SLIB_EXTRA_CMD)
 
 ifdef SUBDIR
-$(SUBDIR)$(SLIBNAME_WITH_MAJOR): \
-    $(foreach NAME,$(FFLIBS),lib$(NAME)/$(SLIBNAME))
+$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)
 endif
 endif