Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
API refactoring : l2, mpls, sr
[vpp.git]
/
src
/
vnet.am
diff --git
a/src/vnet.am
b/src/vnet.am
index
0323348
..
bca5622
100644
(file)
--- a/
src/vnet.am
+++ b/
src/vnet.am
@@
-14,7
+14,12
@@
libvnet_la_SOURCES =
libvnetplugin_la_SOURCES =
libvnet_la_SOURCES =
libvnetplugin_la_SOURCES =
-libvnet_la_LIBAD = libvppinfra.la libvlib.la libsvm.la
+libvnet_la_LIBADD = libvppinfra.la libsvm.la
+libvnet_la_DEPENDENCIES = libvppinfra.la libvlib.la libsvmdb.la libsvm.la libvlibapi.la libvlibmemory.la libvlibmemoryclient.la
+
+if WITH_IPV6SR
+libvnet_la_LIBADD += -lcrypto
+endif
########################################
# Generic stuff
########################################
# Generic stuff
@@
-440,7
+445,7
@@
test_map_SOURCES = \
test_map_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
test_map_LDADD = libvnet.la libvppinfra.la libvlib.la \
test_map_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
test_map_LDADD = libvnet.la libvppinfra.la libvlib.la \
- -lpthread -lvlibmemory -lvlibapi
-lvlib_unix
\
+ -lpthread -lvlibmemory -lvlibapi \
-ldl -lsvm -lrt
test_map_LDFLAGS = -static
-ldl -lsvm -lrt
test_map_LDFLAGS = -static
@@
-493,15
+498,18
@@
libvnet_la_SOURCES += \
vnet/mpls/node.c \
vnet/mpls/interface.c \
vnet/mpls/mpls_tunnel.c \
vnet/mpls/node.c \
vnet/mpls/interface.c \
vnet/mpls/mpls_tunnel.c \
- vnet/mpls/pg.c
+ vnet/mpls/pg.c \
+ vnet/mpls/mpls_api.c
nobase_include_HEADERS += \
vnet/mpls/mpls.h \
vnet/mpls/mpls_types.h \
vnet/mpls/mpls_tunnel.h \
vnet/mpls/packet.h \
nobase_include_HEADERS += \
vnet/mpls/mpls.h \
vnet/mpls/mpls_types.h \
vnet/mpls/mpls_tunnel.h \
vnet/mpls/packet.h \
- vnet/mpls/error.def
+ vnet/mpls/error.def \
+ vnet/mpls/mpls.api.h
+API_FILES += vnet/mpls/mpls.api
########################################
# Tunnel protocol: vxlan-gpe
########################################
# Tunnel protocol: vxlan-gpe
@@
-566,7
+574,6
@@
LDS = \
libvppinfra.la \
libvnet.la \
libvlib.la \
libvppinfra.la \
libvnet.la \
libvlib.la \
- libvlib_unix.la \
libsvm.la \
libsvmdb.la \
libvlibapi.la \
libsvm.la \
libsvmdb.la \
libvlibapi.la \
@@
-662,13
+669,17
@@
nobase_include_HEADERS += \
if WITH_IPV6SR
libvnet_la_SOURCES += \
vnet/sr/sr.c \
if WITH_IPV6SR
libvnet_la_SOURCES += \
vnet/sr/sr.c \
- vnet/sr/sr_replicate.c
+ vnet/sr/sr_replicate.c \
+ vnet/sr/sr_api.c
endif
nobase_include_HEADERS += \
vnet/sr/sr_packet.h \
vnet/sr/sr_error.def \
endif
nobase_include_HEADERS += \
vnet/sr/sr_packet.h \
vnet/sr/sr_error.def \
- vnet/sr/sr.h
+ vnet/sr/sr.h \
+ vnet/sr/sr.api.h
+
+API_FILES += vnet/sr/sr.api
########################################
# DHCPv6 proxy
########################################
# DHCPv6 proxy
@@
-755,10
+766,14
@@
libvnet_la_SOURCES += \
vnet/devices/dpdk/init.c \
vnet/devices/dpdk/node.c \
vnet/devices/dpdk/hqos.c \
vnet/devices/dpdk/init.c \
vnet/devices/dpdk/node.c \
vnet/devices/dpdk/hqos.c \
- vnet/devices/dpdk/cli.c
+ vnet/devices/dpdk/cli.c \
+ vnet/devices/dpdk/dpdk_api.c
nobase_include_HEADERS += \
nobase_include_HEADERS += \
- vnet/devices/dpdk/dpdk.h
+ vnet/devices/dpdk/dpdk.h \
+ vnet/devices/dpdk/dpdk.api.h
+
+API_FILES += vnet/devices/dpdk/dpdk.api
else
libvnet_la_SOURCES += \
vnet/devices/nic/ixge.c \
else
libvnet_la_SOURCES += \
vnet/devices/nic/ixge.c \