X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp.am;h=10a4e311252760074c96e270d8e57d4d061ea7a8;hb=d756b35032cdf7fdaaf0d6611388a54d32d72e92;hp=be55c4000d3d2346de559135cf144ee7dd0bf69b;hpb=724f64ccf691e170973bdcdc6c09bfdc7e2ab5e4;p=vpp.git diff --git a/src/vpp.am b/src/vpp.am index be55c4000d3..10a4e311252 100644 --- a/src/vpp.am +++ b/src/vpp.am @@ -28,14 +28,16 @@ bin_vpp_SOURCES += \ if WITH_APICLI bin_vpp_SOURCES += \ vpp/api/api_format.c \ - vpp/api/api_main.c + vpp/api/api_main.c \ + vpp/api/plugin.c \ + 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 \ @@ -52,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 @@ -60,25 +66,28 @@ 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 ;\ fi bin_vpp_LDADD = \ - libvlibapi.la \ libvlibmemory.la \ libvlib.la \ libvnet.la \ libsvm.la \ libsvmdb.la \ - -lrt + libvppinfra.la \ + -lrt -lm -lpthread -ldl -bin_vpp_LDFLAGS = $(DPDK_LD_FLAGS) -bin_vpp_LDADD += libvppinfra.la -lm -lpthread -ldl $(DPDK_LD_ADD) +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 @@ -88,7 +97,6 @@ bin_test_client_SOURCES = \ bin_test_client_LDADD = \ libvlibmemoryclient.la \ - libvlibapi.la \ libsvm.la \ libvppinfra.la \ -lpthread -lm -lrt @@ -100,8 +108,6 @@ bin_test_ha_SOURCES = \ bin_test_ha_LDADD = \ libvlibmemoryclient.la \ - libvlibapi.la \ - libsvmdb.la \ libsvm.la \ libvppinfra.la \ -lpthread -lm -lrt @@ -114,7 +120,6 @@ bin_summary_stats_client_SOURCES = \ bin_summary_stats_client_LDADD = \ libvlibmemoryclient.la \ - libvlibapi.la \ libsvm.la \ libvppinfra.la \ -lpthread -lm -lrt @@ -130,4 +135,6 @@ bin_vpp_get_metrics_LDADD = \ libvppinfra.la \ -lpthread -lm -lrt +CLEANFILES += vpp/app/version.h + # vi:syntax=automake