MAP: Move MAP-E/T to a plugin.

[vpp.git] / src / vnet.am

diff --git a/src/vnet.am b/src/vnet.am
index 86f3ad0..78eb481 100644 (file)
--- a/src/vnet.am
+++ b/src/vnet.am
@@ -451,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                      \
@@ -489,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
 ########################################
@@ -783,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
-
-API_FILES += vnet/dhcp/dhcp.api
+ 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                            \
+ vnet/dhcp/dhcp6_pd_client_cp.api              \
+ vnet/dhcp/dhcp6_ia_na_client_cp.api
 
 ########################################
 # DHCP proxy