diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-30 17:28:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-30 17:28:21 +0200 |
| commit | e8e4c8bddee7b77747346ca5047a84cc40dafc11 (patch) | |
| tree | 8062747ec4d71f28da7fc9377af81cea3394022b /library.mak | |
| parent | f4c020e3ad0a2a1412cc94b3d7df7063b37ae429 (diff) | |
| parent | 8db73c61a7b24bc4f4d3d415bea2990d17d16354 (diff) | |
| download | ffmpeg-e8e4c8bddee7b77747346ca5047a84cc40dafc11.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: allow non-standard variations of linker -l/-L flags
Add reminders to update the codec descriptor list with new codec IDs.
Conflicts:
Makefile
configure
libavcodec/avcodec.h
libavformat/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 9c01e34c73..e943615ba7 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) $$^ -l$(FULLNAME) $(FFEXTRALIBS) $$(ELIBS) + $$(LD) $(LDFLAGS) $$(LD_O) $$^ $(FULLNAME:%=$(LD_LIB)) $(FFEXTRALIBS) $$(ELIBS) $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) |