X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp.am;h=1c95949aa3a01499fe0221f3504d988aaddb3438;hb=f03a59ab008908f98fd7d1b187a8c0fb78b01add;hp=425f1e329259808a0a33d811d1f56c90e2efcb8a;hpb=c74a86af08ae9cf312c47ad4dad54d70ae3093ed;p=vpp.git diff --git a/src/vpp.am b/src/vpp.am index 425f1e32925..1c95949aa3a 100644 --- a/src/vpp.am +++ b/src/vpp.am @@ -28,7 +28,9 @@ 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 @@ -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,16 +66,15 @@ 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 \ @@ -78,6 +83,8 @@ bin_vpp_LDADD = \ libvppinfra.la \ -lrt -lm -lpthread -ldl +bin_vpp_LDFLAGS = -Wl,--export-dynamic + if ENABLE_TESTS noinst_PROGRAMS += bin/test_client @@ -86,7 +93,6 @@ bin_test_client_SOURCES = \ bin_test_client_LDADD = \ libvlibmemoryclient.la \ - libvlibapi.la \ libsvm.la \ libvppinfra.la \ -lpthread -lm -lrt @@ -98,8 +104,6 @@ bin_test_ha_SOURCES = \ bin_test_ha_LDADD = \ libvlibmemoryclient.la \ - libvlibapi.la \ - libsvmdb.la \ libsvm.la \ libvppinfra.la \ -lpthread -lm -lrt @@ -112,7 +116,6 @@ bin_summary_stats_client_SOURCES = \ bin_summary_stats_client_LDADD = \ libvlibmemoryclient.la \ - libvlibapi.la \ libsvm.la \ libvppinfra.la \ -lpthread -lm -lrt @@ -128,4 +131,6 @@ bin_vpp_get_metrics_LDADD = \ libvppinfra.la \ -lpthread -lm -lrt +CLEANFILES += vpp/app/version.h + # vi:syntax=automake