Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VOM: bond: Add support for LACP
[vpp.git]
/
src
/
vpp-api
/
vom
/
Makefile.am
diff --git
a/src/vpp-api/vom/Makefile.am
b/src/vpp-api/vom/Makefile.am
index
57ddb84
..
00ab467
100644
(file)
--- a/
src/vpp-api/vom/Makefile.am
+++ b/
src/vpp-api/vom/Makefile.am
@@
-15,8
+15,7
@@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
AM_LIBTOOLFLAGS = --quiet
ACLOCAL_AMFLAGS = -I m4
AM_LIBTOOLFLAGS = --quiet
-AM_CXXFLAGS = -Wall -std=gnu++11 -I${top_srcdir} -I${top_builddir}/vpp-api/vapi/ -I$(top_srcdir)/vpp-api/ -I${libdir}/../include
-AM_LDFLAGS = -shared -avoid-version -no-undefined
+AM_CXXFLAGS = -Wall -Werror -std=gnu++11 -I${top_srcdir} -I${top_builddir}/vpp-api/vapi/ -I$(top_srcdir)/vpp-api/ -I${libdir}/../include
bin_PROGRAMS =
noinst_LTLIBRARIES =
bin_PROGRAMS =
noinst_LTLIBRARIES =
@@
-34,18
+33,56
@@
libvom_la_LIBADD = \
$(BOOST_ASIO_LIB) \
-lm -lrt
$(BOOST_ASIO_LIB) \
-lm -lrt
-libvom_la_SOURCES = \
+ACL_SOURCES =
+if ENABLE_ACL_PLUGIN
+ACL_SOURCES += \
acl_binding_cmds.cpp \
acl_binding.cpp \
acl_binding_cmds.cpp \
acl_binding.cpp \
+ acl_ethertype_cmds.cpp \
+ acl_ethertype.cpp \
acl_l2_rule.cpp \
acl_l3_rule.cpp \
acl_list_cmds.cpp \
acl_list.cpp \
acl_l2_rule.cpp \
acl_l3_rule.cpp \
acl_list_cmds.cpp \
acl_list.cpp \
- acl_types.cpp \
+ acl_types.cpp
+endif
+
+NAT_SOURCES =
+if ENABLE_NAT_PLUGIN
+NAT_SOURCES += \
+ nat_static.cpp \
+ nat_static_cmds.cpp \
+ nat_binding.cpp \
+ nat_binding_cmds.cpp
+endif
+
+L2E_SOURCES =
+if ENABLE_L2E_PLUGIN
+L2E_SOURCES += \
+ l2_emulation_cmds.cpp \
+ l2_emulation.cpp
+endif
+
+GBP_SOURCES =
+if ENABLE_GBP_PLUGIN
+GBP_SOURCES += \
+ gbp_endpoint_cmds.cpp \
+ gbp_endpoint.cpp \
+ gbp_contract_cmds.cpp \
+ gbp_contract.cpp
+endif
+
+libvom_la_SOURCES = \
+ types.cpp \
arp_proxy_binding_cmds.cpp \
arp_proxy_binding.cpp \
arp_proxy_config_cmds.cpp \
arp_proxy_config.cpp \
arp_proxy_binding_cmds.cpp \
arp_proxy_binding.cpp \
arp_proxy_config_cmds.cpp \
arp_proxy_config.cpp \
+ bond_group_binding_cmds.cpp \
+ bond_group_binding.cpp \
+ bond_interface_cmds.cpp \
+ bond_interface.cpp \
+ bond_member.cpp \
bridge_domain_cmds.cpp \
bridge_domain.cpp \
bridge_domain_arp_entry.cpp \
bridge_domain_cmds.cpp \
bridge_domain.cpp \
bridge_domain_arp_entry.cpp \
@@
-78,10
+115,6
@@
libvom_la_SOURCES = \
lldp_global_cmds.cpp \
lldp_global.cpp \
logger.cpp \
lldp_global_cmds.cpp \
lldp_global.cpp \
logger.cpp \
- nat_static.cpp \
- nat_static_cmds.cpp \
- nat_binding.cpp \
- nat_binding_cmds.cpp \
neighbour.cpp \
neighbour_cmds.cpp \
object_base.cpp \
neighbour.cpp \
neighbour_cmds.cpp \
object_base.cpp \
@@
-97,20
+130,53
@@
libvom_la_SOURCES = \
sub_interface.cpp \
tap_interface.cpp \
tap_interface_cmds.cpp \
sub_interface.cpp \
tap_interface.cpp \
tap_interface_cmds.cpp \
- types.cpp \
vxlan_tunnel_cmds.cpp \
vxlan_tunnel_cmds.cpp \
- vxlan_tunnel.cpp
+ vxlan_tunnel.cpp \
+ $(ACL_SOURCES) \
+ $(NAT_SOURCES) \
+ $(L2E_SOURCES) \
+ $(GBP_SOURCES)
+
vomincludedir = $(includedir)/vom
vomincludedir = $(includedir)/vom
-vominclude_HEADERS = \
+ACL_INCLUDES =
+if ENABLE_ACL_PLUGIN
+ACL_INCLUDES += \
acl_binding.hpp \
acl_binding.hpp \
+ acl_ethertype.hpp \
acl_l2_rule.hpp \
acl_l3_rule.hpp \
acl_list.hpp \
acl_l2_rule.hpp \
acl_l3_rule.hpp \
acl_list.hpp \
- acl_types.hpp \
+ acl_types.hpp
+endif
+
+NAT_INCLUDES =
+if ENABLE_NAT_PLUGIN
+NAT_INCLUDES += \
+ nat_static.hpp \
+ nat_binding.hpp
+endif
+
+L2E_INCLUDES =
+if ENABLE_L2E_PLUGIN
+L2E_INCLUDES += \
+ l2_emulation.hpp
+endif
+
+GBP_INCLUDES =
+if ENABLE_GBP_PLUGIN
+GBP_INCLUDES += \
+ gbp_endpoint.hpp \
+ gbp_contract.hpp
+endif
+
+vominclude_HEADERS = \
arp_proxy_binding.hpp \
arp_proxy_config.hpp \
arp_proxy_binding.hpp \
arp_proxy_config.hpp \
+ bond_group_binding.hpp \
+ bond_interface.hpp \
+ bond_member.hpp \
bridge_domain.hpp \
bridge_domain_arp_entry.hpp \
bridge_domain_entry.hpp \
bridge_domain.hpp \
bridge_domain_arp_entry.hpp \
bridge_domain_entry.hpp \
@@
-118,12
+184,14
@@
vominclude_HEADERS = \
cmd.hpp \
connection.hpp \
dhcp_config.hpp \
cmd.hpp \
connection.hpp \
dhcp_config.hpp \
+ dhcp_config_cmds.hpp \
dump_cmd.hpp \
enum_base.hpp \
event_cmd.hpp \
hw.hpp \
inspect.hpp \
interface.hpp \
dump_cmd.hpp \
enum_base.hpp \
event_cmd.hpp \
hw.hpp \
inspect.hpp \
interface.hpp \
+ interface_cmds.hpp \
interface_ip6_nd.hpp \
interface_span.hpp \
ip_unnumbered.hpp \
interface_ip6_nd.hpp \
interface_span.hpp \
ip_unnumbered.hpp \
@@
-132,8
+200,6
@@
vominclude_HEADERS = \
lldp_binding.hpp \
lldp_global.hpp \
logger.hpp \
lldp_binding.hpp \
lldp_global.hpp \
logger.hpp \
- nat_static.hpp \
- nat_binding.hpp \
neighbour.hpp \
object_base.hpp \
om.hpp \
neighbour.hpp \
object_base.hpp \
om.hpp \
@@
-147,6
+213,10
@@
vominclude_HEADERS = \
sub_interface.hpp \
tap_interface.hpp \
types.hpp \
sub_interface.hpp \
tap_interface.hpp \
types.hpp \
- vxlan_tunnel.hpp
+ vxlan_tunnel.hpp \
+ $(ACL_INCLUDES) \
+ $(NAT_INCLUDES) \
+ $(L2E_INCLUDES) \
+ $(GBP_INCLUDES)
# vi:syntax=automake
# vi:syntax=automake