X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp.am;h=10a4e311252760074c96e270d8e57d4d061ea7a8;hb=52851e6aa9304054fd1059c8dd284abf8e532bf2;hp=8cdc60d9440c912b4ab3e8c9f1960866f9ff58c1;hpb=654ceaff759b89c00d242b7d494abaeeea356f32;p=vpp.git

diff --git a/src/vpp.am b/src/vpp.am
index 8cdc60d9440..10a4e311252 100644
--- a/src/vpp.am
+++ b/src/vpp.am
@@ -33,11 +33,11 @@ if WITH_APICLI
   vpp/api/plugin.h
 endif
 
-# comment out to disable stats upload to gmond
+# uncomment to enable stats upload to gmond
+# bin_vpp_SOURCES +=				\
+#  vpp/api/gmon.c
 
 bin_vpp_CFLAGS = @APICLI@
-bin_vpp_SOURCES +=				\
-  vpp/api/gmon.c
 
 nobase_include_HEADERS +=			\
   vpp/api/vpe_all_api_h.h			\
@@ -54,6 +54,10 @@ vpp/app/version.o:	vpp/app/version.h
 
 VPP_VERSION = $(shell $(srcdir)/scripts/version)
 
+VPP_BUILD_DATE ?= $$(date)
+VPP_BUILD_USER ?= $$(whoami)
+VPP_BUILD_HOST ?= $$(hostname)
+
 # update version.h only when version changes, to avoid
 # unnecessary re-linking of vpp binary
 
@@ -62,9 +66,9 @@ VPP_VERSION = $(shell $(srcdir)/scripts/version)
 	  f="vpp/app/version.h" 							;\
 	  echo "  VERSION  $$f ($(VPP_VERSION))"					;\
 	  echo $(VPP_VERSION) > .version						;\
-	  echo "#define VPP_BUILD_DATE \"$$(date)\"" > $$f 				;\
-	  echo "#define VPP_BUILD_USER \"$$(whoami)\"" >> $$f 				;\
-	  echo "#define VPP_BUILD_HOST \"$$(hostname)\"" >> $$f				;\
+          echo "#define VPP_BUILD_DATE \"$(VPP_BUILD_DATE)\"" > $$f                             ;\
+          echo "#define VPP_BUILD_USER \"$(VPP_BUILD_USER)\"" >> $$f                            ;\
+          echo "#define VPP_BUILD_HOST \"$(VPP_BUILD_HOST)\"" >> $$f                            ;\
 	  echo -n "#define VPP_BUILD_TOPDIR " >> $$f					;\
 	  echo "\"$$(cd $(srcdir) && git rev-parse --show-toplevel)\"" >> $$f 		;\
 	  echo "#define VPP_BUILD_VER \"$(VPP_VERSION)\"" >> $$f			;\
@@ -81,6 +85,10 @@ bin_vpp_LDADD = \
 
 bin_vpp_LDFLAGS = -Wl,--export-dynamic
 
+bin_PROGRAMS += bin/vppctl
+bin_vppctl_SOURCES = vpp/app/vppctl.c
+bin_vppctl_LDADD = libvppinfra.la
+
 if ENABLE_TESTS
 noinst_PROGRAMS += bin/test_client
 
@@ -100,7 +108,6 @@ bin_test_ha_SOURCES = \
 
 bin_test_ha_LDADD = \
   libvlibmemoryclient.la \
-  libvlibapi.la \
   libsvm.la \
   libvppinfra.la \
   -lpthread -lm -lrt