summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2010-02-02 19:57:40 +0000
committerReinhard Tartler <siretart@tauware.de>2010-02-02 19:57:40 +0000
commit15dfbc503dec612ab79aa891284f875bdd0ecd6a (patch)
treeed8ff7412443e992dc37c2829ba9744ca668655e
parentf5c694972e9b245870b9a3b741ae42fce311f568 (diff)
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 Originally committed as revision 21608 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
-rw-r--r--subdir.mak2
1 files changed, 1 insertions, 1 deletions
diff --git a/subdir.mak b/subdir.mak
index 4749d4efd6..a5f83c5b88 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -29,7 +29,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
$(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