diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-04-09 21:11:39 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-04-09 21:11:39 +0000 |
| commit | 76ca42a8a010acf7939f5635282279c90a313d78 (patch) | |
| tree | 69682b0f760d5da7ea8c2c644a27eda8e3bc1f96 | |
| parent | 8a03404d4f15e2b8aefdeca9294f5c31d429ca75 (diff) | |
| download | ffmpeg-76ca42a8a010acf7939f5635282279c90a313d78.tar.gz | |
move DEP_LIBS to common.mak
Originally committed as revision 12777 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | common.mak | 2 | ||||
| -rw-r--r-- | subdir.mak | 3 |
3 files changed, 3 insertions, 5 deletions
@@ -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 |