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>

10 files changed, 12 insertions, 143 deletions

diff --git a/build-root/emacs-lisp/README b/build-root/emacs-lisp/README
index 483e1c39709..1f09a3fa4e4 100644
--- a/build-root/emacs-lisp/README
+++ b/build-root/emacs-lisp/README
@@ -66,7 +66,7 @@ Or, generate each file individually:
 
    $ mkdir build
    $ cd build
-   $ ../configure --with-plugin-toolkit
+   $ ../configure
    $ make
    $ sudo make install
 
diff --git a/build-root/scripts/make-plugin-toolkit b/build-root/scripts/make-plugin-toolkit
deleted file mode 100755
index e1d6fcfb01c..00000000000
--- a/build-root/scripts/make-plugin-toolkit
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-build_tarball() {
-    for dir in vppinfra dpdk svm vlib-api vlib vnet vpp vpp-api-test
-    do
-        tar -C install-$1/$dir/include -cf - . | tar -C $tmp_dir/include -xf -
-    done
-    tar -C ../sample-plugin -cf - . \
-       | tar -C $tmp_dir/src/sample-plugin -xf -
-    cp tools/bin/vppapigen $tmp_dir/tools/bin
-    echo Created by `id -u -n` on `hostname` at `date` >		\
-		$tmp_dir/toolkit-version-stamp
-    cp scripts/vpp-plugin-toolkit-readme $tmp_dir/README
-    tar -C $tmp_dir -zcf $PWD/vpp-plugin-toolkit-$1.tar.gz .
-}
-
-if [ `basename $PWD` != "build-root" ] ; then
-   echo Please run this script from build-root
-   exit 1
-fi   
-
-echo Pull additional tookit repos
-make PLATFORM=vpp sample-plugin-find-source
-
-make PLATFORM=vpp TAG=vpp wipe-all
-echo Build vpp forwarder production package
-make PLATFORM=vpp TAG=vpp strip_sumbols=yes install-packages
-
-tmp_dir="`mktemp -d /tmp/plugin-XXXXXX`"
-trap "rm -rf $tmp_dir" err 
-
-echo Create vpp forwarder production plugin toolkit tarball
-mkdir -p $tmp_dir/tools/bin $tmp_dir/include $tmp_dir/lib64 \
-         $tmp_dir/src/sample-plugin
-build_tarball vpp-native
-rm -rf $tmp_dir
-
-exit 0
diff --git a/src/Makefile.am b/src/Makefile.am
index bba90eaebf8..18a41a153ee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,6 +17,7 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 ACLOCAL_AMFLAGS = -I m4
+AM_LIBTOOLFLAGS = --quiet
 
 AM_CFLAGS = -Wall
 
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 3e9ab91cd24..f0c455a51bb 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -16,6 +16,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
 
 AM_CFLAGS = -Wall -I${top_srcdir} -I${top_builddir}
 AM_LDFLAGS = -module -shared -avoid-version
+AM_LIBTOOLFLAGS = --quiet
 SUFFIXES = .api.h .api .api.json
 API_FILES =
 BUILT_SOURCES =
diff --git a/src/vnet.am b/src/vnet.am
index bca56227076..665a16ea0dc 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -11,8 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+lib_LTLIBRARIES += libvnet.la
+
 libvnet_la_SOURCES =
-libvnetplugin_la_SOURCES =
 
 libvnet_la_LIBADD = libvppinfra.la libsvm.la
 libvnet_la_DEPENDENCIES = libvppinfra.la libvlib.la libsvmdb.la libsvm.la libvlibapi.la libvlibmemory.la libvlibmemoryclient.la
@@ -966,15 +967,9 @@ nobase_include_HEADERS +=			\
 # Plugin client library
 ########################################
 
-libvnetplugin_la_SOURCES +=                    \
-  vnet/plugin/p1.c
-
 nobase_include_HEADERS +=                      \
   vnet/plugin/plugin.h
 
-libvnetdir = ${libdir}
-libvnet_LTLIBRARIES = libvnet.la libvnetplugin.la
-
 pcap2pg_SOURCES = 				\
   vnet/unix/pcap2pg.c				\
   vnet/unix/pcap.h
diff --git a/src/vnet/plugin/p1.c b/src/vnet/plugin/p1.c
deleted file mode 100644
index 3102eccea39..00000000000
--- a/src/vnet/plugin/p1.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/* 
- * This file and in fact the entire directory shouldn't even exist.
- *
- * Unfortunately, various things malfunction when we try to go there. 
- * Plugin DLL's end up with their own copies of critical
- * data structures. No one of these problems would be tough to fix, 
- * but there are quite a number of them.
- */
-
-/* 
- * Make certain that plugin .dll's which reference the following functions
- * can find them...
- */
-
-#if DPDK > 0
-#define foreach_dpdk_plugin_reference		\
-_(rte_calloc)                                   \
-_(rte_free)                                     \
-_(rte_malloc)                                   \
-_(rte_zmalloc)                                  \
-_(rte_malloc_virt2phy)                          \
-_(rte_eal_get_configuration)
-#else
-#define foreach_dpdk_plugin_reference
-#endif
-
-#define _(a) void a (void);
-foreach_dpdk_plugin_reference
-#undef _
-
-void *vnet_library_plugin_references[] =
-  {
-#define _(a) &a,
-    foreach_dpdk_plugin_reference
-#undef _
-  };
-
-void vnet_library_plugin_reference(void) { }
diff --git a/src/vpp-api/java/Makefile.am b/src/vpp-api/java/Makefile.am
index bfb5665aecb..00ee5946945 100644
--- a/src/vpp-api/java/Makefile.am
+++ b/src/vpp-api/java/Makefile.am
@@ -13,6 +13,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
+AM_LIBTOOLFLAGS = --quiet
 
 AM_CFLAGS = -Wall -I${top_srcdir} -I${top_builddir} \
   -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux \
diff --git a/src/vpp-api/python/Makefile.am b/src/vpp-api/python/Makefile.am
index a5dabc3d4a6..16c47627157 100644
--- a/src/vpp-api/python/Makefile.am
+++ b/src/vpp-api/python/Makefile.am
@@ -13,6 +13,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I m4
+AM_LIBTOOLFLAGS = --quiet
 AM_CFLAGS = -Wall -I${top_srcdir} -I${top_builddir}
 
 BUILT_SOURCES =
@@ -48,6 +49,7 @@ install-exec-local:
 #
 # Test client
 #
+if ENABLE_TESTS
 noinst_PROGRAMS += test_pneum
 test_pneum_SOURCES = pneum/pneum.c pneum/test_pneum.c
 test_pneum_LDADD = \
@@ -56,5 +58,4 @@ test_pneum_LDADD = \
   $(top_builddir)/libvlibapi.la \
   $(top_builddir)/libsvm.la \
   -lpthread -lm -lrt
-
-
+endif
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
 
diff --git a/src/vppinfra.am b/src/vppinfra.am
index 836c7213d62..19485d2df4f 100644
--- a/src/vppinfra.am
+++ b/src/vppinfra.am
@@ -11,13 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-libvppinfradir = ${libdir}
-
-if WITH_UNIX
-  libvppinfra_LTLIBRARIES = libvppinfra.la
-endif
-
-lib_LIBRARIES =
+lib_LTLIBRARIES += libvppinfra.la
 
 TESTS =