Author: stefanct Date: Fri Feb 19 09:17:24 2016 New Revision: 1931 URL: http://flashrom.org/trac/flashrom/changeset/1931
Log: Makefile: fix overriding of make command line arguments. Command line arguments given when executing make should not stop us from setting commonly user-configurable variables like CPPFLAGS or LDFLAGS. Without this patch 'make CPPFLAGS="-Ifail"' would fail to find libusb1 headers and abort. Add override statements where we append mandatory options to these variables to make (Debian) packagers more happy. Also, r1920 introduced some explicit calls to pkg-config instead of $(PKG_CONFIG). This patch corrects that as well. Signed-off-by: Stefan Tauner <stefan.tau...@alumni.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2...@gmx.net> Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Fri Feb 19 00:11:52 2016 (r1930) +++ trunk/Makefile Fri Feb 19 09:17:24 2016 (r1931) @@ -67,14 +67,14 @@ endif ifdef LIBS_BASE -CPPFLAGS += -I$(LIBS_BASE)/include -LDFLAGS += -L$(LIBS_BASE)/lib -Wl,-rpath -Wl,$(LIBS_BASE)/lib PKG_CONFIG_LIBDIR ?= $(LIBS_BASE)/lib/pkgconfig +override CPPFLAGS += -I$(LIBS_BASE)/include +override LDFLAGS += -L$(LIBS_BASE)/lib -Wl,-rpath -Wl,$(LIBS_BASE)/lib endif ifeq ($(CONFIG_STATIC),yes) -PKG_CONFIG += --static -LDFLAGS += -static +override PKG_CONFIG += --static +override LDFLAGS += -static endif # Set LC_ALL=C to minimize influences of the locale. @@ -112,34 +112,34 @@ override TARGET_OS := $(strip $(call debug_shell,$(CC) $(CPPFLAGS) -E os.h 2>/dev/null | grep -v '^\#' | grep '"' | cut -f 2 -d'"')) ifeq ($(TARGET_OS), Darwin) -CPPFLAGS += -I/opt/local/include -I/usr/local/include -LDFLAGS += -L/opt/local/lib -L/usr/local/lib +override CPPFLAGS += -I/opt/local/include -I/usr/local/include +override LDFLAGS += -L/opt/local/lib -L/usr/local/lib endif ifeq ($(TARGET_OS), FreeBSD) -CPPFLAGS += -I/usr/local/include -LDFLAGS += -L/usr/local/lib +override CPPFLAGS += -I/usr/local/include +override LDFLAGS += -L/usr/local/lib endif ifeq ($(TARGET_OS), OpenBSD) -CPPFLAGS += -I/usr/local/include -LDFLAGS += -L/usr/local/lib +override CPPFLAGS += -I/usr/local/include +override LDFLAGS += -L/usr/local/lib endif ifeq ($(TARGET_OS), NetBSD) -CPPFLAGS += -I/usr/pkg/include -LDFLAGS += -L/usr/pkg/lib +override CPPFLAGS += -I/usr/pkg/include +override LDFLAGS += -L/usr/pkg/lib endif ifeq ($(TARGET_OS), DragonFlyBSD) -CPPFLAGS += -I/usr/local/include -LDFLAGS += -L/usr/local/lib +override CPPFLAGS += -I/usr/local/include +override LDFLAGS += -L/usr/local/lib endif ifeq ($(TARGET_OS), DOS) EXEC_SUFFIX := .exe # DJGPP has odd uint*_t definitions which cause lots of format string warnings. -CFLAGS += -Wno-format +override CFLAGS += -Wno-format LIBS += -lgetopt # Bus Pirate, Serprog and PonyProg are not supported under DOS (missing serial support). ifeq ($(CONFIG_BUSPIRATE_SPI), yes) @@ -821,11 +821,11 @@ USB1LIBS += -lusb else ifeq ($(TARGET_OS),NetBSD) -CPPFLAGS += -I/usr/pkg/include/libusb-1.0 +override CPPFLAGS += -I/usr/pkg/include/libusb-1.0 USB1LIBS += -lusb-1.0 else -USB1LIBS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; pkg-config --libs libusb-1.0 || printf "%s" "-lusb-1.0") -CPPFLAGS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; pkg-config --cflags-only-I libusb-1.0 || printf "%s" "-I/usr/include/libusb-1.0") +USB1LIBS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; $(PKG_CONFIG) --libs libusb-1.0 || printf "%s" "-lusb-1.0") +override CPPFLAGS += $(call debug_shell,[ -n "$(PKG_CONFIG_LIBDIR)" ] && export PKG_CONFIG_LIBDIR="$(PKG_CONFIG_LIBDIR)"; $(PKG_CONFIG) --cflags-only-I libusb-1.0 || printf "%s" "-I/usr/include/libusb-1.0") endif endif endif _______________________________________________ flashrom mailing list flashrom@flashrom.org http://www.flashrom.org/mailman/listinfo/flashrom
