From 76ca42a8a010acf7939f5635282279c90a313d78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Wed, 9 Apr 2008 21:11:39 +0000
Subject: move DEP_LIBS to common.mak

Originally committed as revision 12777 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 Makefile   | 3 ---
 common.mak | 2 ++
 subdir.mak | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 228e8455cb..47f811c9d9 100644
--- 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 117fc170b5..d87de3e1f7 100644
--- 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 f78d3cbdd3..68850c80ba 100644
--- 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
 
-- 
cgit v1.2.3