Fix use of format_ip46_address in custom_format

[vpp.git] / vpp / Makefile.am

diff --git a/vpp/Makefile.am b/vpp/Makefile.am
index 0f2cf83..bd2d30a 100644 (file)
--- a/vpp/Makefile.am
+++ b/vpp/Makefile.am
@@ -64,15 +64,19 @@ app/version.h:
 
 vpp_LDADD = -lvlibapi -lvlibmemory  -lvlib_unix -lvlib
 
-vpp_LDADD += -l:libvnet.a
+vpp_LDADD += -lvnet
 
 vpp_LDADD += -lsvm -lsvmdb -lrt
 
 vpp_LDADD += -lvnetplugin
 
 if WITH_DPDK
+if ENABLE_DPDK_SHARED
+vpp_LDADD += -ldpdk
+else
 vpp_LDADD += -l:libdpdk.a
 endif
+endif
 
 vpp_LDADD += -lvppinfra -lm -lpthread -ldl
 
@@ -84,7 +88,7 @@ SUFFIXES = .api.h .api
 
 %.api.h: %.api
        @echo "  APIGEN  " $@ ;                                 \
-       @mkdir -p `dirname $@` ;                                \
+       mkdir -p `dirname $@` ;                                 \
        $(CC) $(CPPFLAGS) -E -P -C -x c $^                      \
        | vppapigen --input - --output $@ --show-name $@