X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=vpp%2FMakefile.am;h=52ce0655c1fde64d6513db70e7f64a972810a899;hb=e21c52861d7c503bef7fc464f23bbc7891e150d7;hp=5577c0755e0b2a17be2f75a6f7776c8e77671929;hpb=aa6920e0a80d8271be1dda59f613a1d2b0e1d3e6;p=vpp.git diff --git a/vpp/Makefile.am b/vpp/Makefile.am index 5577c0755e0..52ce0655c1f 100644 --- a/vpp/Makefile.am +++ b/vpp/Makefile.am @@ -71,6 +71,12 @@ BUILT_SOURCES += vpp_plugin_configure .PHONY: vpp_plugin_configure +if WITH_DPDK +PLUGIN_DPDK_ARG="--with-dpdk" +else +PLUGIN_DPDK_ARG="" +endif + vpp_plugin_configure: @echo "PLUGIN CONFIGURE " $@ @echo "#!/bin/bash" > $@ @@ -78,10 +84,10 @@ vpp_plugin_configure: @echo "set +eu" >> $@ @echo " " >> $@ @echo "if [ -f ./configure ] ; then" >> $@ - @echo " CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ./configure --with-plugin-toolkit" >> $@ + @echo " CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ./configure --with-plugin-toolkit $(PLUGIN_DPDK_ARG)" >> $@ @echo "else" >> $@ @echo " if [ -f ../configure ] ; then" >> $@ - @echo " CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ../configure --with-plugin-toolkit" >> $@ + @echo " CFLAGS='$(CFLAGS) $(AM_CFLAGS) -I/usr/include/vpp-dpdk' ../configure --with-plugin-toolkit $(PLUGIN_DPDK_ARG)" >> $@ @echo " else" >> $@ @echo " echo Couldnt find ./configure or ../configure " >> $@ @echo " exit 1" >> $@ @@ -134,9 +140,14 @@ test_ha_LDADD = -lvlibmemoryclient -lvlibapi -lsvmdb -lsvm -lvppinfra \ -lpthread -lm -lrt - noinst_PROGRAMS += summary_stats_client summary_stats_client_SOURCES = vpp-api/summary_stats_client.c summary_stats_client_LDADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \ -lpthread -lm -lrt + +bin_PROGRAMS += vpp_get_metrics + +vpp_get_metrics_SOURCES = vpp-api/vpp_get_metrics.c +vpp_get_metrics_LDADD = -lsvmdb -lsvm -lvppinfra \ + -lpthread -lm -lrt