Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add MAC address support to LISP map-cache
[vpp.git]
/
vpp
/
Makefile.am
diff --git
a/vpp/Makefile.am
b/vpp/Makefile.am
index
73e01b7
..
4c28fb7
100644
(file)
--- a/
vpp/Makefile.am
+++ b/
vpp/Makefile.am
@@
-19,7
+19,6
@@
noinst_PROGRAMS =
BUILT_SOURCES =
bin_PROGRAMS =
CLEANFILES =
BUILT_SOURCES =
bin_PROGRAMS =
CLEANFILES =
-lib_LTLIBRARIES =
bin_PROGRAMS += vpp
bin_PROGRAMS += vpp
@@
-65,14
+64,20
@@
app/version.h:
vpp_LDADD = -lvlibapi -lvlibmemory -lvlib_unix -lvlib
vpp_LDADD = -lvlibapi -lvlibmemory -lvlib_unix -lvlib
-vpp_LDADD += -l
:libvnet.a
+vpp_LDADD += -l
vnet
vpp_LDADD += -lsvm -lsvmdb -lrt
vpp_LDADD += -lvnetplugin
if WITH_DPDK
vpp_LDADD += -lsvm -lsvmdb -lrt
vpp_LDADD += -lvnetplugin
if WITH_DPDK
-vpp_LDADD += -l:libdpdk.a
+vpp_LDFLAGS = -Wl,--whole-archive
+if ENABLE_DPDK_SHARED
+vpp_LDFLAGS += -ldpdk
+else
+vpp_LDFLAGS += -l:libdpdk.a
+endif
+vpp_LDFLAGS += -Wl,--no-whole-archive
endif
vpp_LDADD += -lvppinfra -lm -lpthread -ldl
endif
vpp_LDADD += -lvppinfra -lm -lpthread -ldl
@@
-85,21
+90,25
@@
SUFFIXES = .api.h .api
%.api.h: %.api
@echo " APIGEN " $@ ; \
%.api.h: %.api
@echo " APIGEN " $@ ; \
-
@mkdir -p `dirname $@` ;
\
+
mkdir -p `dirname $@` ;
\
$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
| vppapigen --input - --output $@ --show-name $@
$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
| vppapigen --input - --output $@ --show-name $@
-noinst_PROGRAMS += test_client
test_ha
+noinst_PROGRAMS += test_client
test_client_SOURCES = api/test_client.c
test_client_LDADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
-lpthread -lm -lrt
test_client_SOURCES = api/test_client.c
test_client_LDADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra \
-lpthread -lm -lrt
+noinst_PROGRAMS += test_client test_ha
+
test_ha_SOURCES = api/test_ha.c
test_ha_LDADD = -lvlibmemoryclient -lvlibapi -lsvmdb -lsvm -lvppinfra \
-lpthread -lm -lrt
test_ha_SOURCES = api/test_ha.c
test_ha_LDADD = -lvlibmemoryclient -lvlibapi -lsvmdb -lsvm -lvppinfra \
-lpthread -lm -lrt
+
+
noinst_PROGRAMS += summary_stats_client
summary_stats_client_SOURCES = api/summary_stats_client.c
noinst_PROGRAMS += summary_stats_client
summary_stats_client_SOURCES = api/summary_stats_client.c