diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:13:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:13:51 +0200 |
| commit | c6d39fb3c5a763c2cfba34154e0f8ba52f02a96e (patch) | |
| tree | 2c2e94db251ff485d92f4ee81396342265132b9b /library.mak | |
| parent | cd6f5c4895c49b483542030324ea5198521ab28b (diff) | |
| parent | 4b895cb294d610fb3bf9e57385e665488e8a9ffa (diff) | |
| download | ffmpeg-c6d39fb3c5a763c2cfba34154e0f8ba52f02a96e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: sanitize linking of tools and test programs
fate: Refactor setting of environment variables for groups of tests
Conflicts:
tests/fate/audio.mak
tests/fate/real.mak
tests/fate/voice.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'library.mak')
| -rw-r--r-- | library.mak | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/library.mak b/library.mak index cc77729c41..1c37d0ac14 100644 --- a/library.mak +++ b/library.mak @@ -34,8 +34,11 @@ install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared define RULES +$(EXAMPLES) $(TOOLS): LIB = $(FULLNAME:%=$(LD_LIB)) +$(TESTPROGS): LIB = $(SUBDIR)$(LIBNAME) + $(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o - $$(LD) $(LDFLAGS) $$(LD_O) $$^ $(FFEXTRALIBS) $$(ELIBS) + $$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(LIB) $(FFEXTRALIBS) $$(ELIBS) $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) |