From cf947c9f51bfff415ebd1f7cbddca189923d811f Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Tue, 9 Nov 2021 17:02:47 +0100 Subject: Makefile: clean up variables - replace $(LIBS) by $(LDFLAGS) - use override to handle CPPFLAGS, CFLAGS, LDFLAGS This allows to append flags to the users input. - remove unused $(DIFF) Change-Id: I1c9e869377677d624469af1ee9ece9a28fc3b559 Signed-off-by: Thomas Heijligen Reviewed-on: https://review.coreboot.org/c/flashrom/+/59230 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Paul Menzel --- Makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 4ed52e3b..40b3eac8 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,6 @@ PROGRAM = flashrom STRIP ?= strip STRIP_ARGS = -s INSTALL = install -DIFF = diff PREFIX ?= /usr/local MANDIR ?= $(PREFIX)/share/man CFLAGS ?= -Os -Wall -Wextra -Wno-unused-parameter -Wshadow -Wmissing-prototypes -Wwrite-strings @@ -263,7 +262,7 @@ ifeq ($(TARGET_OS), DOS) EXEC_SUFFIX := .exe # DJGPP has odd uint*_t definitions which cause lots of format string warnings. override CFLAGS += -Wno-format -LIBS += -lgetopt +override LDFLAGS += -lgetopt # Missing serial support. $(call mark_unsupported,$(DEPENDS_ON_SERIAL)) endif @@ -815,7 +814,7 @@ endif ifneq ($(NEED_POSIX_SOCKETS), ) ifeq ($(TARGET_OS), SunOS) -LIBS += -lsocket -lnsl +override LDFLAGS += -lsocket -lnsl endif endif @@ -894,7 +893,7 @@ endif ifeq ($(HAS_CLOCK_GETTIME), yes) FEATURE_CFLAGS += -D'HAVE_CLOCK_GETTIME=1' -FEATURE_LIBS += -lrt +override LDFLAGS += -lrt endif LIBFLASHROM_OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS) @@ -906,7 +905,7 @@ ifeq ($(ARCH), x86) endif $(PROGRAM)$(EXEC_SUFFIX): $(OBJS) - $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) $(LIBS) $(FEATURE_LIBS) + $(CC) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LDFLAGS) libflashrom.a: $(LIBFLASHROM_OBJS) $(AR) rcs $@ $^ -- cgit v1.2.3