aboutsummaryrefslogtreecommitdiffstats
path: root/src/vpp.am
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2017-01-11 11:11:00 +0100
committerDave Barach <openvpp@barachs.net>2017-01-11 12:58:03 +0000
commit724f64ccf691e170973bdcdc6c09bfdc7e2ab5e4 (patch)
treed648e5f5b49699d93d7055716ea62b63eb1bcb29 /src/vpp.am
parent1c5ee872b14c5e9412b8c0e4f169b85d11238d14 (diff)
Makefile.am cleanup
- remove unused stuff - add --quiet flag to libtool - avoid building some tests programs when tests are not enabled Change-Id: Ie34aeec1a598ad811256a00354f66cfddae9d0b9 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/vpp.am')
-rw-r--r--src/vpp.am36
1 files changed, 2 insertions, 34 deletions
diff --git a/src/vpp.am b/src/vpp.am
index 3bb2c1beaae..be55c4000d3 100644
--- a/src/vpp.am
+++ b/src/vpp.am
@@ -68,39 +68,6 @@ VPP_VERSION = $(shell $(srcdir)/scripts/version)
echo "#define VPP_BUILD_VER \"$(VPP_VERSION)\"" >> $$f ;\
fi
-
-# Generate a plugin configuration script. Misconfiguring a
-# plugin can cause very subtle problems.
-
-bin_SCRIPTS = vpp_plugin_configure
-
-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 CFG" $@
- @echo "#!/bin/bash" > $@
- @echo " " >> $@
- @echo "set +eu" >> $@
- @echo " " >> $@
- @echo "if [ -f ./configure ] ; then" >> $@
- @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 $(PLUGIN_DPDK_ARG)" >> $@
- @echo " else" >> $@
- @echo " echo Couldnt find ./configure or ../configure " >> $@
- @echo " exit 1" >> $@
- @echo " fi" >> $@
- @echo "fi" >> $@
-
bin_vpp_LDADD = \
libvlibapi.la \
libvlibmemory.la \
@@ -108,12 +75,12 @@ bin_vpp_LDADD = \
libvnet.la \
libsvm.la \
libsvmdb.la \
- libvnetplugin.la \
-lrt
bin_vpp_LDFLAGS = $(DPDK_LD_FLAGS)
bin_vpp_LDADD += libvppinfra.la -lm -lpthread -ldl $(DPDK_LD_ADD)
+if ENABLE_TESTS
noinst_PROGRAMS += bin/test_client
bin_test_client_SOURCES = \
@@ -138,6 +105,7 @@ bin_test_ha_LDADD = \
libsvm.la \
libvppinfra.la \
-lpthread -lm -lrt
+endif
noinst_PROGRAMS += bin/summary_stats_client