X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp-api%2Fvom%2FMakefile.am;h=f802849d7582a7972b7c08da1b05586bb294446b;hb=25b049484fcf9161edb2c19250066b893c38c264;hp=8eab140896a4792b3ec621b68bb3e86d3a6064ca;hpb=fd920609819a5b10d3d7c8d34fe4fa4214c7da22;p=vpp.git

diff --git a/src/vpp-api/vom/Makefile.am b/src/vpp-api/vom/Makefile.am
index 8eab140896a..f802849d758 100644
--- 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
 
-AM_CXXFLAGS = -Wall -std=gnu++11 -I${top_srcdir} -I${top_builddir}/vpp-api/vapi/ -I$(top_srcdir)/vpp-api/ -I${libdir}/../include -O0
-AM_LDFLAGS = -shared -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 =
@@ -34,19 +33,62 @@ libvom_la_LIBADD = 					\
 	$(BOOST_ASIO_LIB) 				\
 	-lm -lrt
 
-libvom_la_SOURCES = 			\
-	types.cpp			\
+ACL_SOURCES =
+if ENABLE_ACL_PLUGIN
+ACL_SOURCES += 				\
 	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_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_recirc_cmds.cpp		\
+	gbp_recirc.cpp			\
+	gbp_subnet_cmds.cpp		\
+	gbp_subnet.cpp			\
+	gbp_endpoint_cmds.cpp		\
+	gbp_endpoint.cpp		\
+	gbp_endpoint_group_cmds.cpp	\
+	gbp_endpoint_group.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		\
+	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	\
@@ -79,10 +121,6 @@ libvom_la_SOURCES = 			\
 	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			\
@@ -99,18 +137,55 @@ libvom_la_SOURCES = 			\
 	tap_interface.cpp		\
 	tap_interface_cmds.cpp		\
 	vxlan_tunnel_cmds.cpp 		\
-	vxlan_tunnel.cpp
+	vxlan_tunnel.cpp		\
+	$(ACL_SOURCES) 			\
+	$(NAT_SOURCES) 			\
+	$(L2E_SOURCES) 			\
+	$(GBP_SOURCES)
+
 
 vomincludedir = $(includedir)/vom
 
-vominclude_HEADERS =			\
+ACL_INCLUDES =
+if ENABLE_ACL_PLUGIN
+ACL_INCLUDES += 			\
 	acl_binding.hpp			\
+	acl_ethertype.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_endpoint_group.hpp		\
+	gbp_subnet.hpp			\
+	gbp_recirc.hpp			\
+	gbp_contract.hpp
+endif
+
+vominclude_HEADERS =			\
 	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		\
@@ -134,8 +209,6 @@ vominclude_HEADERS =			\
 	lldp_binding.hpp		\
 	lldp_global.hpp			\
 	logger.hpp			\
-	nat_static.hpp			\
-	nat_binding.hpp			\
 	neighbour.hpp			\
 	object_base.hpp			\
 	om.hpp				\
@@ -146,9 +219,14 @@ vominclude_HEADERS =			\
 	route_domain.hpp		\
 	rpc_cmd.hpp			\
 	singular_db.hpp			\
+	singular_db_funcs.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