[FFmpeg-cvslog] r21608 - branches/0.5/subdir.mak

siretart subversion
Tue Feb 2 20:57:40 CET 2010


Author: siretart
Date: Tue Feb  2 20:57:40 2010
New Revision: 21608

Log:
missing hunk to unbreak linking with symbol versioning

this hunk is does not apply in trunk/ because there the dependencies for
this rule was reworked

Modified:
   branches/0.5/subdir.mak

Modified: branches/0.5/subdir.mak
==============================================================================
--- branches/0.5/subdir.mak	Tue Feb  2 20:35:52 2010	(r21607)
+++ branches/0.5/subdir.mak	Tue Feb  2 20:57:40 2010	(r21608)
@@ -29,7 +29,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAM
 
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver
 	$(SLIB_CREATE_DEF_CMD)
-	$(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter-out $(DEP_LIBS),$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
+	$(CC) $(SHFLAGS) $(FFLDFLAGS) -o $$@ $$(filter-out $(SUBDIR)lib$(NAME).ver $(DEP_LIBS),$$^) $(FFEXTRALIBS) $(EXTRAOBJS)
 	$(SLIB_EXTRA_CMD)
 
 ifdef SUBDIR



More information about the ffmpeg-cvslog mailing list