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

Reimar Döffinger git at videolan.org
Sun Jun 26 09:50:53 CEST 2011


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Sun Jun 26 09:42:42 2011 +0200| [b3ca11f07feb08738128f6b7127ccf8eb3f72ede] | committer: Reimar Döffinger

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

This reverts commit 729f953fb5079ca09bbac391b824be454df029d6.

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

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

diff --git a/subdir.mak b/subdir.mak
index f8473da..8b38073 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -39,11 +39,15 @@ $(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 $(DEP_LIBS)
+$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver
 	$(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