diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 02:45:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-22 02:45:45 +0200 |
| commit | dac096cf39d24735f1992b7d867519f17974865b (patch) | |
| tree | 94803d59c376db3bd998de821b517e21661a2993 /library.mak | |
| parent | 7f1543d46cd88e86bd662695d79c16c93892223e (diff) | |
| parent | bb0babd7054bed7edfd9f4d6b20cdba864de1830 (diff) | |
| download | ffmpeg-streaming-dac096cf39d24735f1992b7d867519f17974865b.zip ffmpeg-streaming-dac096cf39d24735f1992b7d867519f17974865b.tar.gz | |
Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'
* commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830':
build: Support executable only ldflags
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'library.mak')
| -rw-r--r-- | library.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library.mak b/library.mak index cd39f11..72e5574 100644 --- a/library.mak +++ b/library.mak @@ -46,7 +46,7 @@ $(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB)) $(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS) - $$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS) + $$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS) $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) |
