From 0eca04d84e39ca16c60bea91d77a1c458300c16c Mon Sep 17 00:00:00 2001
From: Damjan Marion <damarion@cisco.com>
Date: Tue, 3 Jan 2017 20:11:35 +0100
Subject: vlib: merge libvlib_unix.so into libvlib.so

Change-Id: Iedbee427d838794c4b26db5bd07b8d27aad9fcd8
Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 src/vlib.am            | 15 ++++++---------
 src/vlib/unix/plugin.h |  2 +-
 src/vnet.am            |  3 +--
 src/vpp-api-test.am    |  3 +--
 src/vpp.am             |  1 -
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/vlib.am b/src/vlib.am
index 2464076fcaf..9c3b4d5b8a3 100644
--- a/src/vlib.am
+++ b/src/vlib.am
@@ -12,14 +12,13 @@
 # limitations under the License.
 
 
-libvlibdir = ${libdir}
-libvlib_LTLIBRARIES = libvlib.la
-libvlib_la_LIBAD = libvppinfra.la
+lib_LTLIBRARIES += libvlib.la
+libvlib_la_LIBADD = libvppinfra.la -ldl -lpthread
 
 BUILT_SOURCES += vlib/config.h
 
 vlib/config.h:
-	echo "#define __PRE_DATA_SIZE" @PRE_DATA_SIZE@ > $@
+	@echo "#define __PRE_DATA_SIZE" @PRE_DATA_SIZE@ > $@
 
 libvlib_la_SOURCES =				\
   vlib/buffer.c					\
@@ -69,9 +68,7 @@ nobase_include_HEADERS +=			\
   vlib/trace.h					\
   vlib/vlib.h
 
-libvlib_LTLIBRARIES += libvlib_unix.la
-
-libvlib_unix_la_SOURCES =			\
+libvlib_la_SOURCES +=				\
   vlib/unix/cj.c				\
   vlib/unix/cli.c				\
   vlib/unix/input.c				\
@@ -88,7 +85,7 @@ nobase_include_HEADERS +=			\
   vlib/unix/physmem.h				\
   vlib/unix/plugin.h				\
   vlib/unix/unix.h
-    
+
 if !WITH_DPDK
 noinst_PROGRAMS += vlib_unix
 
@@ -96,7 +93,7 @@ vlib_unix_SOURCES =				\
   examples/vlib/main_stub.c			\
   examples/vlib/mc_test.c
 
-vlib_unix_LDADD = libvlib_unix.la libvlib.la \
+vlib_unix_LDADD = libvlib.la \
 	          libvppinfra.la -lpthread -lm -ldl -lrt
 endif
 
diff --git a/src/vlib/unix/plugin.h b/src/vlib/unix/plugin.h
index c17053bd306..f35c9c5de1e 100644
--- a/src/vlib/unix/plugin.h
+++ b/src/vlib/unix/plugin.h
@@ -48,7 +48,7 @@
  *
  * Applications control the plugin search path and name filter by
  * declaring the variables vlib_plugin_path and vlib_plugin_name_filter.
- * libvlib_unix.la supplies weak references for these symbols which
+ * libvlib.la supplies weak references for these symbols which
  * effectively disable the scheme. In order for the elf-section magic to
  * work, static plugins must be loaded at the earliest possible moment.
  *
diff --git a/src/vnet.am b/src/vnet.am
index 032334874d5..1baa1d25afb 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -440,7 +440,7 @@ test_map_SOURCES =                             \
 test_map_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
 
 test_map_LDADD = libvnet.la libvppinfra.la libvlib.la	\
-  -lpthread -lvlibmemory -lvlibapi -lvlib_unix	\
+  -lpthread -lvlibmemory -lvlibapi \
   -ldl -lsvm -lrt
 
 test_map_LDFLAGS = -static
@@ -566,7 +566,6 @@ LDS = \
   libvppinfra.la \
   libvnet.la \
   libvlib.la  \
-  libvlib_unix.la \
   libsvm.la \
   libsvmdb.la \
   libvlibapi.la \
diff --git a/src/vpp-api-test.am b/src/vpp-api-test.am
index fe25f6e1c73..66d223c0a05 100644
--- a/src/vpp-api-test.am
+++ b/src/vpp-api-test.am
@@ -33,8 +33,7 @@ vpp_json_test_SOURCES = \
 
 vpp_api_test_LDFLAGS = $(DPDK_LD_FLAGS)
 vpp_api_test_LDADD = \
-  libvlib.la \
-  libvlib_unix.la \
+  libvlib.la				\
   libvlibmemoryclient.la		\
   libsvm.la				\
   libvatplugin.la			\
diff --git a/src/vpp.am b/src/vpp.am
index 5128e8ac302..77010e1f36a 100644
--- a/src/vpp.am
+++ b/src/vpp.am
@@ -93,7 +93,6 @@ vpp_plugin_configure:
 bin_vpp_LDADD = \
   libvlibapi.la \
   libvlibmemory.la \
-  libvlib_unix.la \
   libvlib.la \
   libvnet.la \
   libsvm.la \
-- 
cgit 1.2.3-korg