X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=3d681a13374696fc1a19b748d1c921b45bdbf93a;hb=d9aad2940530e63aa3f91194e0997a2f9307433c;hp=bca5622707668d210fed2359f5c070b65de47759;hpb=0f971d8c22adf89d3f8592ac0d207727f2b1a23a;p=vpp.git diff --git a/src/vnet.am b/src/vnet.am index bca56227076..3d681a13374 100644 --- a/src/vnet.am +++ b/src/vnet.am @@ -11,13 +11,22 @@ # See the License for the specific language governing permissions and # limitations under the License. -libvnet_la_SOURCES = -libvnetplugin_la_SOURCES = - -libvnet_la_LIBADD = libvppinfra.la libsvm.la -libvnet_la_DEPENDENCIES = libvppinfra.la libvlib.la libsvmdb.la libsvm.la libvlibapi.la libvlibmemory.la libvlibmemoryclient.la +lib_LTLIBRARIES += libvnet.la -if WITH_IPV6SR +libvnet_la_SOURCES = +libvnet_la_DEPENDENCIES = \ + libvppinfra.la \ + libvlib.la \ + libsvmdb.la \ + libsvm.la \ + libvlibapi.la \ + libvlibmemory.la \ + libvlibmemoryclient.la + +libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt $(DPDK_LD_ADD) +libvnet_la_LDFLAGS = $(DPDK_LD_FLAGS) + +if WITH_LIBSSL libvnet_la_LIBADD += -lcrypto endif @@ -64,12 +73,16 @@ API_FILES += vnet/interface.api libvnet_la_SOURCES += \ vnet/policer/node_funcs.c \ vnet/policer/policer.c \ - vnet/policer/xlate.c + vnet/policer/xlate.c \ + vnet/policer/policer_api.c nobase_include_HEADERS += \ vnet/policer/police.h \ vnet/policer/policer.h \ - vnet/policer/xlate.h + vnet/policer/xlate.h \ + vnet/policer/policer.api.h + +API_FILES += vnet/policer/policer.api ######################################## # Cop - junk filter @@ -79,10 +92,14 @@ libvnet_la_SOURCES += \ vnet/cop/cop.c \ vnet/cop/node1.c \ vnet/cop/ip4_whitelist.c \ - vnet/cop/ip6_whitelist.c + vnet/cop/ip6_whitelist.c \ + vnet/cop/cop_api.c nobase_include_HEADERS += \ - vnet/cop/cop.h + vnet/cop/cop.h \ + vnet/cop/cop.api.h + +API_FILES += vnet/cop/cop.api ######################################## # Layer 2 protocols go here @@ -261,13 +278,17 @@ libvnet_la_SOURCES += \ vnet/classify/policer_classify.c \ vnet/classify/flow_classify.c \ vnet/classify/flow_classify_node.c \ - vnet/classify/vnet_classify.h + vnet/classify/vnet_classify.h \ + vnet/classify/classify_api.c nobase_include_HEADERS += \ vnet/classify/vnet_classify.h \ vnet/classify/input_acl.h \ vnet/classify/policer_classify.h \ - vnet/classify/flow_classify.h + vnet/classify/flow_classify.h \ + vnet/classify/classify.api.h + +API_FILES += vnet/classify/classify.api ######################################## # Layer 3 protocols go here @@ -363,7 +384,7 @@ API_FILES += vnet/bfd/bfd.api ######################################## # Layer 3 protocol: IPSec ######################################## -if WITH_IPSEC +if WITH_LIBSSL libvnet_la_SOURCES += \ vnet/ipsec/ipsec.c \ vnet/ipsec/ipsec_cli.c \ @@ -383,7 +404,7 @@ libvnet_la_SOURCES += \ API_FILES += vnet/ipsec/ipsec.api -if WITH_DPDK_CRYPTO +if WITH_DPDK libvnet_la_SOURCES += \ vnet/devices/dpdk/ipsec/esp_encrypt.c \ vnet/devices/dpdk/ipsec/esp_decrypt.c \ @@ -402,7 +423,7 @@ nobase_include_HEADERS += \ vnet/ipsec/ikev2.h \ vnet/ipsec/ikev2_priv.h \ vnet/ipsec/ipsec.api.h -if WITH_DPDK_CRYPTO +if WITH_DPDK nobase_include_HEADERS += \ vnet/devices/dpdk/ipsec/ipsec.h \ vnet/devices/dpdk/ipsec/esp.h @@ -556,6 +577,7 @@ libvnet_la_SOURCES += \ vnet/lisp-cp/gid_dictionary.c \ vnet/lisp-cp/lisp_msg_serdes.c \ vnet/lisp-cp/packets.c \ + vnet/lisp-cp/lisp_cli.c \ vnet/lisp-cp/lisp_api.c nobase_include_HEADERS += \ @@ -578,7 +600,7 @@ LDS = \ libsvmdb.la \ libvlibapi.la \ libvlibmemory.la \ - -lpthread -ldl -lrt -lm -lcrypto + -lpthread -ldl -lrt -lm TESTS += test_cp_serdes test_lisp_types @@ -596,10 +618,8 @@ test_lisp_types_SOURCES = \ test_cp_serdes_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG test_lisp_types_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG -test_cp_serdes_LDFLAGS = $(DPDK_LD_FLAGS) -test_cp_serdes_LDADD = $(LDS) $(DPDK_LD_ADD) -test_lisp_types_LDFLAGS = $(DPDK_LD_FLAGS) -test_lisp_types_LDADD = $(LDS) $(DPDK_LD_ADD) +test_cp_serdes_LDADD = $(LDS) +test_lisp_types_LDADD = $(LDS) endif ######################################## @@ -645,10 +665,14 @@ endif ######################################## libvnet_la_SOURCES += \ vnet/dhcp/client.c \ - vnet/dhcp/client.h + vnet/dhcp/client.h \ + vnet/dhcp/dhcp_api.c nobase_include_HEADERS += \ - vnet/dhcp/client.h + vnet/dhcp/client.h \ + vnet/dhcp/dhcp.api.h + +API_FILES += vnet/dhcp/dhcp.api ######################################## # DHCP proxy @@ -666,7 +690,7 @@ nobase_include_HEADERS += \ # ipv6 segment routing ######################################## -if WITH_IPV6SR +if WITH_LIBSSL libvnet_la_SOURCES += \ vnet/sr/sr.c \ vnet/sr/sr_replicate.c \ @@ -696,12 +720,16 @@ nobase_include_HEADERS += \ # IPFIX / netflow v10 ######################################## libvnet_la_SOURCES += \ - vnet/flow/flow_report.c + vnet/flow/flow_report.c \ + vnet/flow/flow_api.c nobase_include_HEADERS += \ vnet/flow/flow_report.h \ vnet/flow/ipfix_info_elements.h \ - vnet/flow/ipfix_packet.h + vnet/flow/ipfix_packet.h \ + vnet/flow/flow.api.h + +API_FILES += vnet/flow/flow.api ######################################## # IPFIX classify code @@ -760,11 +788,14 @@ nobase_include_HEADERS += \ ######################################## if WITH_DPDK libvnet_la_SOURCES += \ + vnet/devices/dpdk/buffer.c \ vnet/devices/dpdk/dpdk_priv.h \ vnet/devices/dpdk/device.c \ vnet/devices/dpdk/format.c \ vnet/devices/dpdk/init.c \ + vnet/devices/dpdk/main.c \ vnet/devices/dpdk/node.c \ + vnet/devices/dpdk/thread.c \ vnet/devices/dpdk/hqos.c \ vnet/devices/dpdk/cli.c \ vnet/devices/dpdk/dpdk_api.c @@ -923,16 +954,15 @@ nobase_include_HEADERS += \ libvnet_la_SOURCES += \ vnet/adj/adj_nbr.c \ - vnet/adj/adj_rewrite.c \ vnet/adj/adj_glean.c \ vnet/adj/adj_midchain.c \ + vnet/adj/adj_mcast.c \ vnet/adj/adj_l2.c \ vnet/adj/adj.c nobase_include_HEADERS += \ vnet/adj/adj.h \ vnet/adj/adj_types.h \ - vnet/adj/adj_rewrite.h \ vnet/adj/adj_glean.h \ vnet/adj/adj_nbr.h @@ -948,8 +978,9 @@ libvnet_la_SOURCES += \ vnet/dpo/receive_dpo.c \ vnet/dpo/load_balance.c \ vnet/dpo/load_balance_map.c \ - vnet/dpo/lookup_dpo.c \ - vnet/dpo/classify_dpo.c \ + vnet/dpo/lookup_dpo.c \ + vnet/dpo/classify_dpo.c \ + vnet/dpo/replicate_dpo.c \ vnet/dpo/mpls_label_dpo.c nobase_include_HEADERS += \ @@ -963,18 +994,39 @@ nobase_include_HEADERS += \ vnet/dpo/dpo.h ######################################## -# Plugin client library +# Multicast FIB ######################################## -libvnetplugin_la_SOURCES += \ - vnet/plugin/p1.c +libvnet_la_SOURCES += \ + vnet/mfib/mfib_test.c \ + vnet/mfib/mfib_forward.c \ + vnet/mfib/ip4_mfib.c \ + vnet/mfib/ip6_mfib.c \ + vnet/mfib/mfib_types.c \ + vnet/mfib/mfib_signal.c \ + vnet/mfib/mfib_itf.c \ + vnet/mfib/mfib_entry.c \ + vnet/mfib/mfib_table.c + +nobase_include_HEADERS += \ + vnet/mfib/ip4_mfib.h \ + vnet/mfib/mfib_types.h \ + vnet/mfib/mfib_table.h + +######################################## +# Utilities +######################################## + +libvnet_la_SOURCES += \ + vnet/util/radix.c + +######################################## +# Plugin client library +######################################## nobase_include_HEADERS += \ vnet/plugin/plugin.h -libvnetdir = ${libdir} -libvnet_LTLIBRARIES = libvnet.la libvnetplugin.la - pcap2pg_SOURCES = \ vnet/unix/pcap2pg.c \ vnet/unix/pcap.h