X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=2601f48ae4fdc12f6affdccce49d73a17bfb55a9;hb=d723161e038d00e59766aa67a6a0dcc350227e4b;hp=2a5a4b8328665cd9c65bdd3f2ec58a2cfb5842ea;hpb=a35cc14d37466f0737fa928d25697fbfe6e7d657;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index 2a5a4b83286..2601f48ae4f 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -12,6 +12,7 @@
 # limitations under the License.
 
 lib_LTLIBRARIES += libvnet.la
+noinst_LTLIBRARIES =
 
 libvnet_la_SOURCES =
 libvnet_la_DEPENDENCIES = \
@@ -20,6 +21,7 @@ libvnet_la_DEPENDENCIES = \
 	libsvmdb.la		\
 	libsvm.la 		\
 	libvlibmemory.la
+libvnet_multiversioning_sources =
 
 libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt
 
@@ -126,6 +128,9 @@ libvnet_la_SOURCES +=				\
  vnet/ethernet/p2p_ethernet_input.c		\
  vnet/ethernet/p2p_ethernet_api.c
 
+libvnet_multiversioning_sources +=		\
+ vnet/l2/l2_output.c
+
 nobase_include_HEADERS +=			\
  vnet/ethernet/arp_packet.h			\
  vnet/ethernet/error.def			\
@@ -289,6 +294,9 @@ nobase_include_HEADERS +=			\
   vnet/bonding/node.h                           \
   vnet/bonding/bond.api.h
 
+libvnet_multiversioning_sources +=		\
+  vnet/bonding/node.c
+
 API_FILES += vnet/bonding/bond.api
 
 ########################################
@@ -362,6 +370,7 @@ libvnet_la_SOURCES +=				\
  vnet/ip/ip6_pg.c				\
  vnet/ip/ip6_reassembly.c                       \
  vnet/ip/rd_cp.c                                \
+ vnet/ip/ip_neighbor.c				\
  vnet/ip/ip_api.c				\
  vnet/ip/ip_checksum.c				\
  vnet/ip/ip_frag.c				\
@@ -394,6 +403,7 @@ nobase_include_HEADERS +=			\
  vnet/ip/ip.h					\
  vnet/ip/ip_packet.h				\
  vnet/ip/ip_source_and_port_range_check.h	\
+ vnet/ip/ip_neighbor.h				\
  vnet/ip/lookup.h				\
  vnet/ip/ports.def				\
  vnet/ip/protocols.def				\
@@ -406,6 +416,9 @@ API_FILES += 					\
  vnet/ip/rd_cp.api                              \
  vnet/ip/punt.api
 
+libvnet_multiversioning_sources +=		\
+ vnet/ip/ip4_input.c
+
 ########################################
 # Bidirectional Forwarding Detection
 ########################################
@@ -770,13 +783,19 @@ API_FILES += vnet/lisp-gpe/lisp_gpe.api
 libvnet_la_SOURCES +=				\
  vnet/dhcp/client.c				\
  vnet/dhcp/dhcp_client_detect.c			\
+ vnet/dhcp/dhcp6_pd_client_dp.c			\
+ vnet/dhcp/dhcp6_pd_client_cp.c			\
  vnet/dhcp/dhcp_api.c
 
 nobase_include_HEADERS +=			\
  vnet/dhcp/client.h				\
- vnet/dhcp/dhcp.api.h
+ vnet/dhcp/dhcp6_pd_client_dp.h			\
+ vnet/dhcp/dhcp.api.h				\
+ vnet/dhcp/dhcp6_pd_client_cp.api.h
 
-API_FILES += vnet/dhcp/dhcp.api
+API_FILES +=					\
+ vnet/dhcp/dhcp.api				\
+ vnet/dhcp/dhcp6_pd_client_cp.api
 
 ########################################
 # DHCP proxy
@@ -1268,6 +1287,32 @@ nobase_include_HEADERS +=			\
 
 API_FILES += vnet/bier/bier.api
 
+if CPU_X86_64
+if CC_SUPPORTS_AVX2
+###############################################################
+# AVX2
+###############################################################
+libvnet_avx2_la_SOURCES = $(libvnet_multiversioning_sources)
+libvnet_avx2_la_CFLAGS =			\
+	$(AM_CFLAGS)  @CPU_AVX2_FLAGS@		\
+	-DCLIB_MARCH_VARIANT=avx2
+noinst_LTLIBRARIES += libvnet_avx2.la
+libvnet_la_LIBADD += libvnet_avx2.la
+endif
+
+if CC_SUPPORTS_AVX512
+###############################################################
+# AVX512
+###############################################################
+libvnet_avx512_la_SOURCES = $(libvnet_multiversioning_sources)
+libvnet_avx512_la_CFLAGS =			\
+	$(AM_CFLAGS) @CPU_AVX512_FLAGS@		\
+	-DCLIB_MARCH_VARIANT=avx512
+noinst_LTLIBRARIES += libvnet_avx512.la
+libvnet_la_LIBADD += libvnet_avx512.la
+endif
+endif
+
 ########################################
 # Test apps
 ########################################