X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vpp%2FMakefile.am;h=52ce0655c1fde64d6513db70e7f64a972810a899;hb=50a4e1429477e41848b1cdb632aab20cb8154386;hp=bd2d30a9b7031c8b0d168b761be3318bb9b1b747;hpb=aa04a0ff8ee9aa7779b30e936f7fe1304c613d57;p=vpp.git

diff --git a/vpp/Makefile.am b/vpp/Makefile.am
index bd2d30a9b70..52ce0655c1f 100644
--- a/vpp/Makefile.am
+++ b/vpp/Makefile.am
@@ -30,25 +30,25 @@ vpp_SOURCES =					\
   stats/stats.c
 
 vpp_SOURCES +=					\
-  api/api.c					\
-  api/custom_dump.c
+  vpp-api/api.c					\
+  vpp-api/custom_dump.c
 
 # comment out to disable stats upload to gmond 
 
 vpp_SOURCES +=					\
-  api/gmon.c	
+  vpp-api/gmon.c	
 
 nobase_include_HEADERS =			\
-  api/vpe_all_api_h.h				\
-  api/vpe_msg_enum.h				\
-  api/vpe.api.h
+  vpp-api/vpe_all_api_h.h			\
+  vpp-api/vpe_msg_enum.h			\
+  vpp-api/vpe.api.h
 
 # install the API definition, so we can produce java bindings, etc.
 
-apidir = $(prefix)/api
-api_DATA = api/vpe.api
+apidir = $(prefix)/vpp-api
+api_DATA = vpp-api/vpe.api
 
-BUILT_SOURCES += api/vpe.api.h app/version.h
+BUILT_SOURCES += vpp-api/vpe.api.h app/version.h
 
 app/version.o:	app/version.h
 
@@ -62,6 +62,38 @@ app/version.h:
 	@echo "#define VPP_BUILD_TOPDIR \"$$(git rev-parse --show-toplevel)\"" 	>> $@
 	@echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" >> $@
 
+# 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 CONFIGURE " $@ 
+	@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" >> $@
+
 vpp_LDADD = -lvlibapi -lvlibmemory  -lvlib_unix -lvlib
 
 vpp_LDADD += -lvnet
@@ -71,11 +103,13 @@ vpp_LDADD += -lsvm -lsvmdb -lrt
 vpp_LDADD += -lvnetplugin
 
 if WITH_DPDK
+vpp_LDFLAGS = -Wl,--whole-archive
 if ENABLE_DPDK_SHARED
-vpp_LDADD += -ldpdk
+vpp_LDFLAGS += -ldpdk
 else
-vpp_LDADD += -l:libdpdk.a
+vpp_LDFLAGS += -l:libdpdk.a
 endif
+vpp_LDFLAGS += -Wl,--no-whole-archive
 endif
 
 vpp_LDADD += -lvppinfra -lm -lpthread -ldl
@@ -93,18 +127,27 @@ SUFFIXES = .api.h .api
 	| vppapigen --input - --output $@ --show-name $@
 
 
-noinst_PROGRAMS += test_client test_ha
+noinst_PROGRAMS += test_client
 
-test_client_SOURCES = api/test_client.c
+test_client_SOURCES = vpp-api/test_client.c
 test_client_LDADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
 	-lpthread -lm -lrt
 
-test_ha_SOURCES = api/test_ha.c
+noinst_PROGRAMS += test_client test_ha
+
+test_ha_SOURCES = vpp-api/test_ha.c
 test_ha_LDADD = -lvlibmemoryclient -lvlibapi -lsvmdb -lsvm -lvppinfra \
 		-lpthread -lm -lrt
 
+
 noinst_PROGRAMS += summary_stats_client
 
-summary_stats_client_SOURCES = api/summary_stats_client.c
+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