Merge commit 'a14a12ca137bf1526452b97bedfc9f7b301d4e04'

[ffmpeg] / ffbuild / library.mak

diff --git a/ffbuild/library.mak b/ffbuild/library.mak
index 430da3f72a25ed1580c9e2e249a8bbe05070c0f7..ed269fdab6d1f610c399a8769709b1ce560476d5 100644 (file)
--- a/ffbuild/library.mak
+++ b/ffbuild/library.mak
@@ -1,6 +1,6 @@
 include $(SRC_PATH)/ffbuild/common.mak
 
-ifeq (,$(filter %clean,$(MAKECMDGOALS)))
+ifeq (,$(filter %clean config,$(MAKECMDGOALS)))
 -include $(SUBDIR)lib$(NAME).version
 endif
 
@@ -48,7 +48,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
 
 $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver
        $(SLIB_CREATE_DEF_CMD)
-       $$(LD) $(SHFLAGS) $(LDFLAGS) $(LDLIBFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
+       $$(LD) $(SHFLAGS) $(LDFLAGS) $(LDSOFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
        $(SLIB_EXTRA_CMD)
 
 ifdef SUBDIR