summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2015-12-13 15:10:31 -0500
committerDave Barach <dave@barachs.net>2015-12-13 15:10:52 -0500
commitcd9752ce4f27dcad68ae085b519654ad5b10731a (patch)
tree830d6b75d5a76ca1b2b0d94033ee7ae017b289c5
parenta0d4a1a6d1b81b132787e382ac3f8487b71cf52c (diff)
Force recompilation of version.c
Change-Id: Ife9d074c83df739a39f363203fac149bfbc2c49b Signed-off-by: Dave Barach <dave@barachs.net>
-rw-r--r--vpp/Makefile.am13
-rw-r--r--vpp/Makefile.in13
-rw-r--r--vpp/app/version.c7
3 files changed, 20 insertions, 13 deletions
diff --git a/vpp/Makefile.am b/vpp/Makefile.am
index 1e3bbf08ebd..8560fe5462f 100644
--- a/vpp/Makefile.am
+++ b/vpp/Makefile.am
@@ -51,14 +51,17 @@ api_DATA = api/vpe.api
BUILT_SOURCES += api/vpe.api.h app/version.h
+app/version.o: app/version.h
+
.PHONY: app/version.h
-app/version.h: ../build-root/scripts/version
- @echo "#define VPP_BUILD_DATE \"$$(date)\"" > $@
- @echo "#define VPP_BUILD_USER \"$$(whoami)\"" >> $@
- @echo "#define VPP_BUILD_HOST \"$$(hostname)\"" >> $@
+app/version.h:
+ @echo " VERSION " $@
+ @echo "#define VPP_BUILD_DATE \"$$(date)\"" > $@
+ @echo "#define VPP_BUILD_USER \"$$(whoami)\"" >> $@
+ @echo "#define VPP_BUILD_HOST \"$$(hostname)\"" >> $@
@echo "#define VPP_BUILD_TOPDIR \"$$(git rev-parse --show-toplevel)\"" >> $@
- @echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" >> $@
+ @echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" >> $@
vpe_LDADD = -lvlibapi -lvlibmemory -lvlib_unix -lvlib
diff --git a/vpp/Makefile.in b/vpp/Makefile.in
index 17f3a8cddf1..13247166925 100644
--- a/vpp/Makefile.in
+++ b/vpp/Makefile.in
@@ -1074,17 +1074,18 @@ uninstall-am: uninstall-apiDATA uninstall-binPROGRAMS \
uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
uninstall-nobase_includeHEADERS
-.PRECIOUS: Makefile
+app/version.o: app/version.h
.PHONY: app/version.h
-app/version.h: ../build-root/scripts/version
- @echo "#define VPP_BUILD_DATE \"$$(date)\"" > $@
- @echo "#define VPP_BUILD_USER \"$$(whoami)\"" >> $@
- @echo "#define VPP_BUILD_HOST \"$$(hostname)\"" >> $@
+app/version.h:
+ @echo " VERSION " $@
+ @echo "#define VPP_BUILD_DATE \"$$(date)\"" > $@
+ @echo "#define VPP_BUILD_USER \"$$(whoami)\"" >> $@
+ @echo "#define VPP_BUILD_HOST \"$$(hostname)\"" >> $@
@echo "#define VPP_BUILD_TOPDIR \"$$(git rev-parse --show-toplevel)\"" >> $@
- @echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" >> $@
+ @echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" >> $@
%.api.h: %.api
@echo " APIGEN " $@ ; \
diff --git a/vpp/app/version.c b/vpp/app/version.c
index 354c0296306..f6aaa0be283 100644
--- a/vpp/app/version.c
+++ b/vpp/app/version.c
@@ -16,8 +16,11 @@
#include <app/version.h>
static char * vpe_version_string =
-"vpp v" VPP_BUILD_VER " built by " VPP_BUILD_USER " on " VPP_BUILD_HOST " at " VPP_BUILD_DATE;
-static char * vpe_dir_string = "workspace is " VPP_BUILD_TOPDIR;
+ "vpp v" VPP_BUILD_VER
+ " built by " VPP_BUILD_USER
+ " on " VPP_BUILD_HOST
+ " at " VPP_BUILD_DATE;
+static char * vpe_dir_string = "Built in " VPP_BUILD_TOPDIR;
static clib_error_t *
show_vpe_version_command_fn (vlib_main_t * vm,