Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
IP6 FIB: Micro optimization in lookup
[vpp.git]
/
vpp
/
Makefile.am
diff --git
a/vpp/Makefile.am
b/vpp/Makefile.am
index
5103646
..
bd2d30a
100644
(file)
--- a/
vpp/Makefile.am
+++ b/
vpp/Makefile.am
@@
-13,13
+13,12
@@
AUTOMAKE_OPTIONS = foreign subdir-objects
AUTOMAKE_OPTIONS = foreign subdir-objects
-AM_CFLAGS = -Wall @
Q_PLATFORM_DEFINE@ @Q_PLATFORM_PLUGPATH@ @DPDK
@
+AM_CFLAGS = -Wall @
DPDK@ @IPSEC@ @VCGN@ @IPV6SR
@
noinst_PROGRAMS =
BUILT_SOURCES =
bin_PROGRAMS =
CLEANFILES =
noinst_PROGRAMS =
BUILT_SOURCES =
bin_PROGRAMS =
CLEANFILES =
-lib_LTLIBRARIES =
bin_PROGRAMS += vpp
bin_PROGRAMS += vpp
@@
-65,25
+64,31
@@
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
+if ENABLE_DPDK_SHARED
+vpp_LDADD += -ldpdk
+else
vpp_LDADD += -l:libdpdk.a
endif
vpp_LDADD += -l:libdpdk.a
endif
+endif
-# These go last
+vpp_LDADD += -lvppinfra -lm -lpthread -ldl
-vpp_LDADD += -lvppinfra -lm -lpthread -lcrypto -ldl
+if WITH_IPV6SR
+ vpp_LDADD += -lcrypto
+endif
SUFFIXES = .api.h .api
%.api.h: %.api
@echo " APIGEN " $@ ; \
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 $@
$(CC) $(CPPFLAGS) -E -P -C -x c $^ \
| vppapigen --input - --output $@ --show-name $@