summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-05-23 23:25:59 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-05-23 23:25:59 +0200
commit5a6586937b201b4b8daeb5299a7279873767801f (patch)
treed5dc56e8f97c51a3eea0e5333f5b940add02ae8b /Makefile
parentff2abdaf68579bb0e95de2ffb8b3c438dbabd5d4 (diff)
make: include build name
Include long version string into tools when called with --version. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9fa4436..c35cd07 100644
--- a/Makefile
+++ b/Makefile
@@ -95,6 +95,7 @@ endif
ALL_CFLAGS = $(CFLAGS) -I.
ALL_CFLAGS += -DVERSION_STRING=\"$(VERSION_STRING)\"
+ALL_CFLAGS += -DVERSION_LONG=\"$(VERSION_LONG)\"
ALL_CFLAGS += -DPREFIX_STRING=\"$(PREFIX)\"
ifneq ($(wildcard /usr/include/linux/net_tstamp.h),)
ALL_CFLAGS += -D__WITH_HARDWARE_TIMESTAMPING
@@ -141,7 +142,7 @@ export VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION
export CROSS_COMPILE
VERSION_STRING = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
-VERSION_SHORT = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
+VERSION_LONG = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)~$(NAME)
bold = $(shell tput bold)
normal = $(shell tput sgr0)
@@ -229,7 +230,7 @@ bpfc: ALL_CFLAGS += -I..
curvetun: ALL_CFLAGS += -I ${NACL_INC_DIR}
curvetun: ALL_LDFLAGS += -L ${NACL_LIB_DIR}
# This gets some extra treatment here until the code looks properly
-mausezahn: ALL_CFLAGS = -O2 -I. -I.. -DVERSION_STRING=\"$(VERSION_STRING)\" -DPREFIX_STRING=\"$(PREFIX)\"
+mausezahn: ALL_CFLAGS = -O2 -I. -I.. -DVERSION_STRING=\"$(VERSION_STRING)\" -DPREFIX_STRING=\"$(PREFIX)\" -DVERSION_LONG=\"$(VERSION_LONG)\"
bpfc_clean_custom:
$(Q)$(call RM,$(BUILD_DIR)/*.h $(BUILD_DIR)/*.c)