Fix vnet unit tests

[vpp.git] / src / vpp.am

diff --git a/src/vpp.am b/src/vpp.am
index 3bb2c1b..d8b3e4e 100644 (file)
--- 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
@@ -68,52 +70,18 @@ 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 \
   libvlib.la \
   libvnet.la \
   libsvm.la \
   libsvmdb.la \
-  libvnetplugin.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
 
+if ENABLE_TESTS
 noinst_PROGRAMS += bin/test_client
 
 bin_test_client_SOURCES = \
@@ -121,7 +89,6 @@ bin_test_client_SOURCES = \
 
 bin_test_client_LDADD = \
   libvlibmemoryclient.la \
-  libvlibapi.la \
   libsvm.la \
   libvppinfra.la \
   -lpthread -lm -lrt
@@ -133,11 +100,10 @@ bin_test_ha_SOURCES = \
 
 bin_test_ha_LDADD = \
   libvlibmemoryclient.la \
-  libvlibapi.la \
-  libsvmdb.la \
   libsvm.la \
   libvppinfra.la \
   -lpthread -lm -lrt
+endif
 
 noinst_PROGRAMS += bin/summary_stats_client
 
@@ -146,7 +112,6 @@ bin_summary_stats_client_SOURCES = \
 
 bin_summary_stats_client_LDADD = \
   libvlibmemoryclient.la \
-  libvlibapi.la \
   libsvm.la \
   libvppinfra.la \
   -lpthread -lm -lrt
@@ -162,4 +127,6 @@ bin_vpp_get_metrics_LDADD = \
   libvppinfra.la \
   -lpthread -lm -lrt
 
+CLEANFILES += vpp/app/version.h
+
 # vi:syntax=automake