X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib.am;h=111dcfa30cb199971304eabd65c57fec8bec3271;hb=9793477a28c45e4eb5bba3f2050fe415e57e8ad8;hp=2464076fcaf715456259526b2d602f31281cba3d;hpb=7cd468a3d7dee7d6c92f69a0bb7061ae208ec727;p=vpp.git

diff --git a/src/vlib.am b/src/vlib.am
index 2464076fcaf..111dcfa30cb 100644
--- a/src/vlib.am
+++ b/src/vlib.am
@@ -12,17 +12,18 @@
 # 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
+libvlib_la_DEPENDENCIES = libvppinfra.la
 
 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					\
+  vlib/buffer_serialize.c			\
   vlib/cli.c					\
   vlib/cli.h					\
   vlib/config.h					\
@@ -69,9 +70,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,16 +87,14 @@ nobase_include_HEADERS +=			\
   vlib/unix/physmem.h				\
   vlib/unix/plugin.h				\
   vlib/unix/unix.h
-    
-if !WITH_DPDK
+
 noinst_PROGRAMS += vlib_unix
 
 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
 
 # vi:syntax=automake