move DEP_LIBS to common.mak

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12777 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/Makefile b/Makefile
index 228e8455cb2a8cf7242b955afaf0edfe3151194e..47f811c9d9c16048d8a44e7095b36dbc058e3f0e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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
 

diff --git a/common.mak b/common.mak
index 117fc170b5a9ce3a74743bb232aa598eb5d97b46..d87de3e1f705b56d5d1d57472bc832a093729a8c 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -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))
 

diff --git a/subdir.mak b/subdir.mak
index f78d3cbdd3356f2fbaf61ea9be9f3b15c28f6439..68850c80ba566969a845ca00a811cb5d27730e1c 100644 (file)
--- a/subdir.mak
+++ b/subdir.mak
@@ -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