[FFmpeg-cvslog] build: link test programs only against static libs
Mans Rullgard
git at videolan.org
Wed Oct 10 13:23:57 CEST 2012
ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Mon Oct 8 20:35:03 2012 +0100| [0fb3b24adac11cc62ad8daacf3c8e01469baa918] | committer: Mans Rullgard
build: link test programs only against static libs
The test programs use internal symbols so cannot be linked against the
shared libs. Linking against both shared and static is pointless and
might do something strange depending on the linker. This changes the
dependencies so the test programs are linked only against the static
library for the component they belong to.
Signed-off-by: Mans Rullgard <mans at mansr.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fb3b24adac11cc62ad8daacf3c8e01469baa918
---
library.mak | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/library.mak b/library.mak
index 19f05f9..7b78e59 100644
--- a/library.mak
+++ b/library.mak
@@ -35,7 +35,7 @@ install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared
define RULES
$(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o
- $$(LD) $(LDFLAGS) $$(LD_O) $$^ $(FULLNAME:%=$(LD_LIB)) $(FFEXTRALIBS) $$(ELIBS)
+ $$(LD) $(LDFLAGS) $$(LD_O) $$^ $(FFEXTRALIBS) $$(ELIBS)
$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
@@ -89,8 +89,8 @@ endef
$(eval $(RULES))
-$(EXAMPLES) $(TESTPROGS) $(TOOLS): $(THIS_LIB) $(DEP_LIBS)
-$(TESTPROGS): $(SUBDIR)$(LIBNAME)
+$(EXAMPLES) $(TOOLS): $(THIS_LIB) $(DEP_LIBS)
+$(TESTPROGS): $(SUBDIR)$(LIBNAME) $(DEP_LIBS)
examples: $(EXAMPLES)
testprogs: $(TESTPROGS)
More information about the ffmpeg-cvslog
mailing list