| author | Mans Rullgard <mans@mansr.com> | 2012-10-08 19:35:03 (GMT) |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-10-09 13:16:21 (GMT) |
| commit | 0fb3b24adac11cc62ad8daacf3c8e01469baa918 (patch) | |
| tree | 64afdd5a088dd1905d9c9ec4e6ea659859c6513f | |
| parent | cbcd497f384f0f8ef3f76f85b29b644b900d6b9f (diff) | |
| download | ffmpeg-0fb3b24adac11cc62ad8daacf3c8e01469baa918.zip ffmpeg-0fb3b24adac11cc62ad8daacf3c8e01469baa918.tar.gz ffmpeg-0fb3b24adac11cc62ad8daacf3c8e01469baa918.tar.bz2 | |
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@mansr.com>
| -rw-r--r-- | library.mak | 6 |
1 files 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) |