[FFmpeg-cvslog] build: do not use LIB as variable name

Mans Rullgard git at videolan.org
Thu Oct 11 16:00:18 CEST 2012


ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Wed Oct 10 23:02:57 2012 +0100| [effe443877c589a6a466093ed0ac9704b165b90a] | committer: Mans Rullgard

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 at mansr.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=effe443877c589a6a466093ed0ac9704b165b90a
---

 library.mak |    6 +++---
 1 file 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)



More information about the ffmpeg-cvslog mailing list