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 : l2tp
[vpp.git]
/
vnet
/
Makefile.am
diff --git
a/vnet/Makefile.am
b/vnet/Makefile.am
index
f1ba400
..
37798c9
100644
(file)
--- a/
vnet/Makefile.am
+++ b/
vnet/Makefile.am
@@
-18,12
+18,20
@@
AM_CFLAGS = -Wall -Werror @DPDK@ @DPDK_CRYPTO@ @IPSEC@ @IPV6SR@
BUILT_SOURCES = \
vnet/devices/af_packet/af_packet.api.h \
vnet/devices/af_packet/af_packet.api.json \
BUILT_SOURCES = \
vnet/devices/af_packet/af_packet.api.h \
vnet/devices/af_packet/af_packet.api.json \
+ vnet/devices/netmap/netmap.api.h \
+ vnet/devices/netmap/netmap.api.json \
+ vnet/devices/virtio/vhost_user.api.h \
+ vnet/devices/virtio/vhost_user.api.json \
+ vnet/gre/gre.api.h \
+ vnet/gre/gre.api.json \
vnet/interface.api.h \
vnet/interface.api.json \
vnet/ip/ip.api.h \
vnet/ip/ip.api.json \
vnet/l2/l2.api.h \
vnet/l2/l2.api.json \
vnet/interface.api.h \
vnet/interface.api.json \
vnet/ip/ip.api.h \
vnet/ip/ip.api.json \
vnet/l2/l2.api.h \
vnet/l2/l2.api.json \
+ vnet/l2tp/l2tp.api.h \
+ vnet/l2tp/l2tp.api.json \
vnet/map/map.api.h \
vnet/map/map.api.json \
vnet/span/span.api.h \
vnet/map/map.api.h \
vnet/map/map.api.json \
vnet/span/span.api.h \
@@
-31,7
+39,9
@@
BUILT_SOURCES = \
vnet/unix/tap.api.h \
vnet/unix/tap.api.json \
vnet/vxlan/vxlan.api.h \
vnet/unix/tap.api.h \
vnet/unix/tap.api.json \
vnet/vxlan/vxlan.api.h \
- vnet/vxlan/vxlan.api.json
+ vnet/vxlan/vxlan.api.json \
+ vnet/vxlan-gpe/vxlan_gpe.api.h \
+ vnet/vxlan-gpe/vxlan_gpe.api.json
libvnet_la_SOURCES =
libvnetplugin_la_SOURCES =
libvnet_la_SOURCES =
libvnetplugin_la_SOURCES =
@@
-463,12
+473,14
@@
libvnet_la_SOURCES += \
vnet/gre/gre.c \
vnet/gre/node.c \
vnet/gre/interface.c \
vnet/gre/gre.c \
vnet/gre/node.c \
vnet/gre/interface.c \
- vnet/gre/pg.c
+ vnet/gre/pg.c \
+ vnet/gre/gre_api.c
nobase_include_HEADERS += \
vnet/gre/gre.h \
vnet/gre/packet.h \
nobase_include_HEADERS += \
vnet/gre/gre.h \
vnet/gre/packet.h \
- vnet/gre/error.def
+ vnet/gre/error.def \
+ vnet/gre/gre.api.h
########################################
# Tunnel protocol: l2tpv3
########################################
# Tunnel protocol: l2tpv3
@@
-477,11
+489,13
@@
libvnet_la_SOURCES += \
vnet/l2tp/l2tp.c \
vnet/l2tp/encap.c \
vnet/l2tp/decap.c \
vnet/l2tp/l2tp.c \
vnet/l2tp/encap.c \
vnet/l2tp/decap.c \
- vnet/l2tp/pg.c
+ vnet/l2tp/pg.c \
+ vnet/l2tp/l2tp_api.c
nobase_include_HEADERS += \
vnet/l2tp/l2tp.h \
nobase_include_HEADERS += \
vnet/l2tp/l2tp.h \
- vnet/l2tp/packet.h
+ vnet/l2tp/packet.h \
+ vnet/l2tp/l2tp.api.h
########################################
# Tunnel protocol: gre+mpls
########################################
# Tunnel protocol: gre+mpls
@@
-511,12
+525,14
@@
nobase_include_HEADERS += \
libvnet_la_SOURCES += \
vnet/vxlan-gpe/vxlan_gpe.c \
vnet/vxlan-gpe/encap.c \
libvnet_la_SOURCES += \
vnet/vxlan-gpe/vxlan_gpe.c \
vnet/vxlan-gpe/encap.c \
- vnet/vxlan-gpe/decap.c
+ vnet/vxlan-gpe/decap.c \
+ vnet/vxlan-gpe/vxlan_gpe_api.c
nobase_include_HEADERS += \
vnet/vxlan-gpe/vxlan_gpe.h \
vnet/vxlan-gpe/vxlan_gpe_packet.h \
nobase_include_HEADERS += \
vnet/vxlan-gpe/vxlan_gpe.h \
vnet/vxlan-gpe/vxlan_gpe_packet.h \
- vnet/vxlan-gpe/vxlan_gpe_error.def
+ vnet/vxlan-gpe/vxlan_gpe_error.def \
+ vnet/vxlan-gpe/vxlan_gpe.api.h
########################################
# Tunnel protocol: ipsec+gre
########################################
# Tunnel protocol: ipsec+gre
@@
-749,10
+765,12
@@
endif
########################################
libvnet_la_SOURCES += \
########################################
libvnet_la_SOURCES += \
- vnet/devices/virtio/vhost-user.c
+ vnet/devices/virtio/vhost-user.c \
+ vnet/devices/virtio/vhost_user_api.c
nobase_include_HEADERS += \
nobase_include_HEADERS += \
- vnet/devices/virtio/vhost-user.h
+ vnet/devices/virtio/vhost-user.h \
+ vnet/devices/virtio/vhost_user.api.h
########################################
# ssvm ethernet
########################################
# ssvm ethernet
@@
-787,11
+805,12
@@
libvnet_la_SOURCES += \
vnet/devices/netmap/netmap.c \
vnet/devices/netmap/device.c \
vnet/devices/netmap/node.c \
vnet/devices/netmap/netmap.c \
vnet/devices/netmap/device.c \
vnet/devices/netmap/node.c \
- vnet/devices/netmap/cli.c
+ vnet/devices/netmap/cli.c \
+ vnet/devices/netmap/netmap_api.c
nobase_include_HEADERS += \
nobase_include_HEADERS += \
- vnet/devices/netmap/netmap.h
-
+ vnet/devices/netmap/netmap.h
\
+ vnet/devices/netmap/netmap.api.h
########################################
# Driver feature graph arc support
########################################
# Driver feature graph arc support
@@
-943,13
+962,18
@@
apidir = $(prefix)/vnet
api_DATA = \
vnet/devices/af_packet/af_packet.api.json \
api_DATA = \
vnet/devices/af_packet/af_packet.api.json \
+ vnet/devices/netmap/netmap.api.json \
+ vnet/devices/virtio/vhost_user.api.json \
+ vnet/gre/gre.api.json \
vnet/interface.api.json \
vnet/ip/ip.api.json \
vnet/l2/l2.api.json \
vnet/interface.api.json \
vnet/ip/ip.api.json \
vnet/l2/l2.api.json \
+ vnet/l2tp/l2tp.api.json \
vnet/map/map.api.json \
vnet/span/span.api.json \
vnet/unix/tap.api.json \
vnet/map/map.api.json \
vnet/span/span.api.json \
vnet/unix/tap.api.json \
- vnet/vxlan/vxlan.api.json
+ vnet/vxlan/vxlan.api.json \
+ vnet/vxlan-gpe/vxlan_gpe.api.json
# The actual %.api.h rule is in .../build-data/packages/suffix-rules.mk
# and requires a symbolic link at the top of the vnet source tree
# The actual %.api.h rule is in .../build-data/packages/suffix-rules.mk
# and requires a symbolic link at the top of the vnet source tree