From 106e9675a1cbbd66ca0d795826a4e56cf5c927c4 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 20 Nov 2017 13:13:49 +0000 Subject: [PATCH] defs.mk: Fix echo-makefiles target, add USE_VERSION_MACROS Signed-off-by: Jan Lindemann --- make/defs.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index 33719f3e..3b551968 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -226,8 +226,11 @@ SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT) endif OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid -BUILD_CFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" -BUILD_CPPFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" +USE_VERSION_MACROS ?= true +ifeq ($(USE_VERSION_MACROS),true) + BUILD_CFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" + BUILD_CPPFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" +endif ifeq ($(TARGET),mingw) ifneq ($(wildcard /usr/bin/i686-w64-mingw32-gcc),) @@ -1073,7 +1076,7 @@ echo-vars: make -p nothing | grep -B1 "^[A-Z_]* *[?:]*=" echo-makefiles: - strace -f make nothing 2>&1 | sed '/open(.*\(Makefile\|\.mk\)/ !d; s/.*open("//; s/", O_.*//' + strace -f make nothing 2>&1 | sed '/open\(at\)*(.*\(Makefile\|\.mk\)/ !d; s/.*open("//; s/.*openat([A-Z_]\+, "//; s/", O_.*//' doc-module: $(BROWSER) $(JANWARE_URL_DOC_MODULE)