commit 6548ae9f99beba89f3dcf5c7b0c86c75d5c0ab5c
author Paul Menzel <paulepanter@users.sourceforge.net> Sun May 03 09:35:32 2015 +0200
committer Patrick Georgi <pgeorgi@google.com> Mon May 04 12:09:59 2015 +0200
tree 552eb66a1e25b01168956b65bd08bd003ca16a76
parent 58649b058baecf24a07a2bc85fff68b339d67503

cbfstool/Makefile*: Use `LDFLAGS` instead of `LINKFLAGS`

Commit 0e53931f (cbfstool: Clean up in preparation for adding new
files) split out the flags and introduced the variable `LINKFLAGS`.
Rename it to `LDFLAGS` which is more commonly used.

Change-Id: Ib6299f8ef5cf30dbe05bfae36f30ae4371f0a738
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-on: http://review.coreboot.org/10064
Tested-by: build bot (Jenkins)
Reviewed-by: Sol Boucher <solb@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>

util/cbfstool/Makefile

diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile
index 9595773..86338db 100644
--- a/util/cbfstool/Makefile
+++ b/util/cbfstool/Makefile
@@ -7,7 +7,7 @@
 CFLAGS += -Wcast-qual -Wmissing-prototypes -Wredundant-decls -Wshadow
 CFLAGS += -Wstrict-prototypes -Wwrite-strings
 CPPFLAGS += -D_POSIX_C_SOURCE=200809L # strdup() from string.h
-LINKFLAGS += -g3
+LDFLAGS += -g3
 
 CBFSTOOL_BINARY:=$(obj)/cbfstool
 CBFSTOOL_COMMON:=common.o cbfs_image.o compress.o fit.o
@@ -30,7 +30,7 @@
 
 $(obj)/%: $(obj)/%.o
 	mkdir -p $(dir $@)
-	$(HOSTCC) $(LINKFLAGS) -o $@ $^ $(LDLIBS)
+	$(HOSTCC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 $(obj)/%.o: %.c
 	mkdir -p $(dir $@)
 	$(HOSTCC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<

util/cbfstool/Makefile.inc

diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc
index a846e99..5bf0b70 100644
--- a/util/cbfstool/Makefile.inc
+++ b/util/cbfstool/Makefile.inc
@@ -28,7 +28,7 @@
 TOOLCFLAGS += -Wcast-qual -Wmissing-prototypes -Wredundant-decls -Wshadow
 TOOLCFLAGS += -Wstrict-prototypes -Wwrite-strings
 TOOLCPPFLAGS ?= -D_POSIX_C_SOURCE=200809L # strdup() from string.h
-TOOLLINKFLAGS ?=
+TOOLLDFLAGS ?=
 
 ifeq ($(shell uname -s | cut -c-7 2>/dev/null), MINGW32)
 TOOLFLAGS+=-mno-ms-bitfields
@@ -48,11 +48,11 @@
 
 $(objutil)/cbfstool/cbfstool: $(addprefix $(objutil)/cbfstool/,$(cbfsobj))
 	printf "    HOSTCC     $(subst $(objutil)/,,$(@)) (link)\n"
-	$(HOSTCC) $(TOOLLINKFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(cbfsobj))
+	$(HOSTCC) $(TOOLLDFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(cbfsobj))
 
 $(objutil)/cbfstool/rmodtool: $(addprefix $(objutil)/cbfstool/,$(rmodobj))
 	printf "    HOSTCC     $(subst $(objutil)/,,$(@)) (link)\n"
-	$(HOSTCC) $(TOOLLINKFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(rmodobj))
+	$(HOSTCC) $(TOOLLDFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(rmodobj))
 
 # Tolerate lzma sdk warnings
 $(objutil)/cbfstool/LzmaEnc.o: TOOLCFLAGS += -Wno-sign-compare -Wno-cast-qual