X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet.am;h=78eb481bc052543b3b46e5f2f4b190bde62e5eeb;hb=0dbd5171344bf89d1519dae7e8ddbc056df6132e;hp=835597822df56285a1de4ec8dce5855aeac443b0;hpb=5e5adb310c5ac19209d3d9fb03094c01b2a29610;p=vpp.git

diff --git a/src/vnet.am b/src/vnet.am
index 835597822df..78eb481bc05 100644
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -21,7 +21,7 @@ libvnet_la_DEPENDENCIES = \
 	libsvmdb.la		\
 	libsvm.la 		\
 	libvlibmemory.la
-libvnet_multiversioning_files =
+libvnet_multiversioning_sources =
 
 libvnet_la_LIBADD = $(libvnet_la_DEPENDENCIES) -lm -lpthread -ldl -lrt
 
@@ -128,7 +128,7 @@ libvnet_la_SOURCES +=				\
  vnet/ethernet/p2p_ethernet_input.c		\
  vnet/ethernet/p2p_ethernet_api.c
 
-libvnet_multiversioning_files +=		\
+libvnet_multiversioning_sources +=		\
  vnet/l2/l2_output.c
 
 nobase_include_HEADERS +=			\
@@ -294,7 +294,7 @@ nobase_include_HEADERS +=			\
   vnet/bonding/node.h                           \
   vnet/bonding/bond.api.h
 
-libvnet_multiversioning_files = 		\
+libvnet_multiversioning_sources +=		\
   vnet/bonding/node.c
 
 API_FILES += vnet/bonding/bond.api
@@ -416,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
 ########################################
@@ -448,7 +451,6 @@ libvnet_la_SOURCES +=				\
  vnet/ipsec/ipsec_input.c			\
  vnet/ipsec/ipsec_if.c				\
  vnet/ipsec/ipsec_if_in.c			\
- vnet/ipsec/ipsec_if_out.c			\
  vnet/ipsec/esp_format.c			\
  vnet/ipsec/esp_encrypt.c			\
  vnet/ipsec/esp_decrypt.c			\
@@ -486,37 +488,6 @@ libvnet_la_SOURCES +=				\
 nobase_include_HEADERS +=			\
  vnet/osi/osi.h
 
-########################################
-# Layer 3 protocol: MAP
-########################################
-libvnet_la_SOURCES +=				\
- vnet/map/map.c					\
- vnet/map/map_dpo.c				\
- vnet/map/ip4_map.c				\
- vnet/map/ip6_map.c				\
- vnet/map/ip4_map_t.c				\
- vnet/map/ip6_map_t.c				\
- vnet/map/map_api.c
-
-nobase_include_HEADERS +=			\
- vnet/map/map.h					\
- vnet/map/map_dpo.h				\
- vnet/map/map.api.h
-
-API_FILES += vnet/map/map.api
-
-if ENABLE_TESTS
-TESTS += test_map
-test_map_SOURCES =                             \
- vnet/map/test.c
-test_map_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
-
-test_map_LDADD = libvnet.la libvppinfra.la libvlib.la	\
-  -lpthread -lvlibmemory -ldl -lsvm -lrt
-
-test_map_LDFLAGS = -static
-endif
-
 ########################################
 # Layer 4 protocol: tcp
 ########################################
@@ -780,13 +751,26 @@ API_FILES += vnet/lisp-gpe/lisp_gpe.api
 libvnet_la_SOURCES +=				\
  vnet/dhcp/client.c				\
  vnet/dhcp/dhcp_client_detect.c			\
+ vnet/dhcp/dhcp6_client_common_dp.c		\
+ vnet/dhcp/dhcp6_pd_client_dp.c			\
+ vnet/dhcp/dhcp6_pd_client_cp.c			\
+ vnet/dhcp/dhcp6_ia_na_client_dp.c		\
+ vnet/dhcp/dhcp6_ia_na_client_cp.c		\
  vnet/dhcp/dhcp_api.c
 
 nobase_include_HEADERS +=			\
  vnet/dhcp/client.h				\
- vnet/dhcp/dhcp.api.h
+ vnet/dhcp/dhcp6_client_common_dp.h		\
+ vnet/dhcp/dhcp6_pd_client_dp.h			\
+ vnet/dhcp/dhcp6_ia_na_client_dp.h		\
+ vnet/dhcp/dhcp.api.h				\
+ vnet/dhcp/dhcp6_pd_client_cp.api.h		\
+ vnet/dhcp/dhcp6_ia_na_client_cp.api.h
 
-API_FILES += vnet/dhcp/dhcp.api
+API_FILES +=					\
+ vnet/dhcp/dhcp.api				\
+ vnet/dhcp/dhcp6_pd_client_cp.api		\
+ vnet/dhcp/dhcp6_ia_na_client_cp.api
 
 ########################################
 # DHCP proxy
@@ -1283,10 +1267,10 @@ if CC_SUPPORTS_AVX2
 ###############################################################
 # AVX2
 ###############################################################
-libvnet_avx2_la_SOURCES = $(libvnet_multiversioning_files)
+libvnet_avx2_la_SOURCES = $(libvnet_multiversioning_sources)
 libvnet_avx2_la_CFLAGS =			\
 	$(AM_CFLAGS)  @CPU_AVX2_FLAGS@		\
-	-DCLIB_MULTIARCH_VARIANT=avx2
+	-DCLIB_MARCH_VARIANT=avx2
 noinst_LTLIBRARIES += libvnet_avx2.la
 libvnet_la_LIBADD += libvnet_avx2.la
 endif
@@ -1295,10 +1279,10 @@ if CC_SUPPORTS_AVX512
 ###############################################################
 # AVX512
 ###############################################################
-libvnet_avx512_la_SOURCES = $(libvnet_multiversioning_files)
+libvnet_avx512_la_SOURCES = $(libvnet_multiversioning_sources)
 libvnet_avx512_la_CFLAGS =			\
 	$(AM_CFLAGS) @CPU_AVX512_FLAGS@		\
-	-DCLIB_MULTIARCH_VARIANT=avx512
+	-DCLIB_MARCH_VARIANT=avx512
 noinst_LTLIBRARIES += libvnet_avx512.la
 libvnet_la_LIBADD += libvnet_avx512.la
 endif