janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-22 06:00:40 +01:00
Code Activity

defs.mk: Fix echo-makefiles target, add USE_VERSION_MACROS

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-11-20 13:13:49 +00:00
commit 106e9675a1
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
make/defs.mk
View file

@ -226,8 +226,11 @@ SYSCFG_FILE ?= $(SYSCFG_DIR)/$(PROJECT)
endif endif
OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid OPTS_PID_FILE ?= $(PIDDIR)/$(PROJECT).pid
BUILD_CFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" USE_VERSION_MACROS ?= true
BUILD_CPPFLAGS += -DVERSION=$(HEX_VERSION) -DVERSION_STR=\"$(VERSION)\" 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) ifeq ($(TARGET),mingw)
ifneq ($(wildcard /usr/bin/i686-w64-mingw32-gcc),) ifneq ($(wildcard /usr/bin/i686-w64-mingw32-gcc),)
@ -1073,7 +1076,7 @@ echo-vars:
make -p nothing | grep -B1 "^[A-Z_]* *[?:]*=" make -p nothing | grep -B1 "^[A-Z_]* *[?:]*="
echo-makefiles: 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: doc-module:
$(BROWSER) $(JANWARE_URL_DOC_MODULE) $(BROWSER) $(JANWARE_URL_DOC_MODULE)