| author | Mans Rullgard <mans@mansr.com> | 2012-10-10 22:02:57 (GMT) |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-10-10 22:46:31 (GMT) |
| commit | effe443877c589a6a466093ed0ac9704b165b90a (patch) | |
| tree | 84c0012ccb768aa1290cd35b4dc333861a0e0de3 | |
| parent | 1c7428e6554a4cf4cd0bcf6d0d27fd669383e199 (diff) | |
| download | ffmpeg-effe443877c589a6a466093ed0ac9704b165b90a.zip ffmpeg-effe443877c589a6a466093ed0ac9704b165b90a.tar.gz ffmpeg-effe443877c589a6a466093ed0ac9704b165b90a.tar.bz2 | |
build: do not use LIB as variable name
The Microsoft linker uses the LIB environment variable which
clashes with a make variable of the same name.
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 64b5f2b..b365935 100644 --- a/library.mak +++ b/library.mak @@ -33,11 +33,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) $(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB)) +$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME) $(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o - $$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(LIB) $(FFEXTRALIBS) $$(ELIBS) + $$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS) $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME) |