X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp.am;h=0e9ddb045c60bde32c31446da63c8650e1de4ef6;hb=b384b543313b6b47a277c903e9d4fcd4343054fa;hp=d8b3e4ec205bb0c48b71c07e5592c79aaec8dab6;hpb=816f437d943688f67d61fb6b9708eff59432b2ee;p=vpp.git

diff --git a/src/vpp.am b/src/vpp.am
index d8b3e4ec205..0e9ddb045c6 100644
--- a/src/vpp.am
+++ b/src/vpp.am
@@ -18,6 +18,7 @@ bin_vpp_SOURCES =				\
   vpp/app/vpe_cli.c				\
   vpp/app/version.c				\
   vpp/oam/oam.c					\
+  vpp/oam/oam_api.c				\
   vpp/stats/stats.c
 
 bin_vpp_SOURCES +=				\
@@ -33,18 +34,23 @@ 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			\
   vpp/api/vpe_msg_enum.h			\
+  vpp/stats/stats.api.h 			\
+  vpp/oam/oam.api.h 				\
   vpp/api/vpe.api.h
 
-API_FILES += vpp/api/vpe.api
+API_FILES += 					\
+  vpp/api/vpe.api				\
+  vpp/stats/stats.api				\
+  vpp/oam/oam.api
 
 BUILT_SOURCES += .version
 
@@ -54,6 +60,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 +72,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 +91,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
 
@@ -108,13 +122,13 @@ endif
 noinst_PROGRAMS += bin/summary_stats_client
 
 bin_summary_stats_client_SOURCES = \
-  vpp/api/summary_stats_client.c
+   vpp/api/summary_stats_client.c
 
 bin_summary_stats_client_LDADD = \
-  libvlibmemoryclient.la \
-  libsvm.la \
-  libvppinfra.la \
-  -lpthread -lm -lrt
+   libvlibmemoryclient.la \
+   libsvm.la \
+   libvppinfra.la \
+   -lpthread -lm -lrt
 
 bin_PROGRAMS += bin/vpp_get_metrics