commit 0eca04d84e39ca16c60bea91d77a1c458300c16c
author Damjan Marion <damarion@cisco.com> Tue Jan 03 20:11:35 2017 +0100
committer John Lo <loj@cisco.com> Tue Jan 03 20:34:42 2017 +0000
tree fba13213d7d75f8f69a040911a4d314c4b5c9eb0
parent 99c201964ab7514e55d66ad2ca5bbe68440bd75b

vlib: merge libvlib_unix.so into libvlib.so

Change-Id: Iedbee427d838794c4b26db5bd07b8d27aad9fcd8
Signed-off-by: Damjan Marion <damarion@cisco.com>

src/vlib.am

diff --git a/src/vlib.am b/src/vlib.am
index 2464076..9c3b4d5 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 @@
   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 @@
   vlib/unix/physmem.h				\
   vlib/unix/plugin.h				\
   vlib/unix/unix.h
-    
+
 if !WITH_DPDK
 noinst_PROGRAMS += vlib_unix
 
@@ -96,7 +93,7 @@
   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