From 5a6586937b201b4b8daeb5299a7279873767801f Mon Sep 17 00:00:00 2001
From: Daniel Borkmann <dborkman@redhat.com>
Date: Thu, 23 May 2013 23:25:59 +0200
Subject: make: include build name

Include long version string into tools when called with --version.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Makefile')

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)
-- 
cgit v1.2.3-54-g00ecf