[FFmpeg-cvslog] build: Add DEP_LIBS dependency directly to the shared library build rule.

Diego Biurrun git at videolan.org
Sun Jun 26 02:39:26 CEST 2011


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Jun 25 02:01:12 2011 +0200| [729f953fb5079ca09bbac391b824be454df029d6] | committer: Diego Biurrun

build: Add DEP_LIBS dependency directly to the shared library build rule.

The dependency was added conditional to a variable that is always defined,
so it is safe to add it directly.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=729f953fb5079ca09bbac391b824be454df029d6
---

 subdir.mak |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/subdir.mak b/subdir.mak
index 6339860..e4d7377 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -39,15 +39,11 @@ $(SUBDIR)%$(EXESUF): $(SUBDIR)%.o
 $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
 	$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
 
-$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver
+$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver $(DEP_LIBS)
 	$(SLIB_CREATE_DEF_CMD)
 	$$(LD) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter %.o,$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
 	$(SLIB_EXTRA_CMD)
 
-ifdef SUBDIR
-$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)
-endif
-
 clean::
 	$(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
 	    $(foreach dir,$(DIRS),$(CLEANSUFFIXES:%=$(SUBDIR)$(dir)/%)) \



More information about the ffmpeg-cvslog mailing list