X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2FMakefile.am;h=a69734d1530dc1219a3b227ced3132cc92340a41;hb=3d5916dee601311c264a4aa1b24a6eeb9e36c58f;hp=b254d80ad48a979264c31452af3f160a1db1300b;hpb=b2ef4dde97b51b73a596093f06cbbdb84f23a824;p=vpp.git

diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index b254d80ad48..a69734d1530 100644
--- a/vnet/Makefile.am
+++ b/vnet/Makefile.am
@@ -19,6 +19,7 @@ libvnet_la_SOURCES =
 libvnetplugin_la_SOURCES =
 nobase_include_HEADERS =
 noinst_PROGRAMS =
+TESTS =
 
 ########################################
 # Generic stuff
@@ -81,7 +82,6 @@ nobase_include_HEADERS +=			\
 ########################################
 libvnet_la_SOURCES +=				\
  vnet/ethernet/arp.c				\
- vnet/ethernet/cli.c				\
  vnet/ethernet/format.c				\
  vnet/ethernet/init.c				\
  vnet/ethernet/interface.c			\
@@ -424,19 +424,80 @@ nobase_include_HEADERS +=			\
  vnet/nsh-vxlan-gpe/vxlan_gpe_packet.h		\
  vnet/nsh-vxlan-gpe/nsh_vxlan_gpe_error.def
 
+########################################
+# LISP control plane: lisp-cp
+########################################
+
+libvnet_la_SOURCES +=				\
+ vnet/lisp-cp/lisp_types.c			\
+ vnet/lisp-cp/control.c				\
+ vnet/lisp-cp/gid_dictionary.c			\
+ vnet/lisp-cp/lisp_msg_serdes.c			\
+ vnet/lisp-cp/packets.c			
+
+nobase_include_HEADERS +=			\
+ vnet/lisp-cp/lisp_types.h			\
+ vnet/lisp-cp/packets.h				\
+ vnet/lisp-cp/gid_dictionary.h			\
+ vnet/lisp-cp/lisp_cp_messages.h		\
+ vnet/lisp-cp/lisp_msg_serdes.h			\
+ vnet/lisp-cp/control.h				
+
+
+if ENABLE_TESTS
+LDS = -lvppinfra -l:libvlib.a -l:libdpdk.a -l:libvlibmemory.a \
+	-l:libvlibapi.a -l:libsvm.a -lpthread -ldl -lrt -lm -l:libvlib_unix.a
+
+TESTS += test_cp_serdes test_lisp_types
+
+test_cp_serdes_SOURCES =			\
+ test/lisp-cp/test_cp_serdes.c		\
+ vnet/lisp-cp/lisp_msg_serdes.c			\
+ vnet/lisp-cp/lisp_types.c			\
+ vnet/lisp-cp/packets.c				\
+ vnet/ip/ip_checksum.c
+
+test_lisp_types_SOURCES =			\
+ test/lisp-cp/test_lisp_types.c		\
+ vnet/lisp-cp/lisp_types.c
+
+test_cp_serdes_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+test_lisp_types_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+
+test_cp_serdes_LDADD = libvnet.la $(LDS)
+test_lisp_types_LDADD = libvnet.la $(LDS)
+
+test_cp_serdes_LDFLAGS = -static
+test_lisp_types_LDFLAGS = -static
+endif
+
 ########################################
 # Tunnel protocol: lisp-gpe
 ########################################
 
 libvnet_la_SOURCES +=				\
  vnet/lisp-gpe/lisp_gpe.c			\
- vnet/lisp-gpe/encap.c				\
- vnet/lisp-gpe/decap.c
+ vnet/lisp-gpe/interface.c			\
+ vnet/lisp-gpe/ip_forward.c			\
+ vnet/lisp-gpe/decap.c				
 
 nobase_include_HEADERS +=			\
  vnet/lisp-gpe/lisp_gpe.h			\
  vnet/lisp-gpe/lisp_gpe_packet.h		\
- vnet/lisp-gpe/lisp_gpe_error.def
+ vnet/lisp-gpe/lisp_gpe_error.def		
+
+if ENABLE_TESTS
+TESTS += test_test
+
+test_test_SOURCES = test/lisp-gpe/test.c
+
+test_test_CPPFLAGS = $(AM_CPPFLAGS) -DCLIB_DEBUG
+
+test_test_LDADD = $(LIBOBJS)
+
+noinst_PROGRAMS += $(TESTS)
+check_PROGRAMS = $(TESTS)
+endif
 
 ########################################
 # DHCP client
@@ -466,7 +527,8 @@ nobase_include_HEADERS +=			\
 
 if WITH_IPV6SR
 libvnet_la_SOURCES +=				\
- vnet/sr/sr.c
+ vnet/sr/sr.c					\
+ vnet/sr/sr_replicate.c
 endif
  
 nobase_include_HEADERS +=			\
@@ -623,6 +685,20 @@ libvnet_la_SOURCES +=				\
 nobase_include_HEADERS +=			\
   vnet/devices/af_packet/af_packet.h
 
+########################################
+# NETMAP interface
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/devices/netmap/netmap.c			\
+  vnet/devices/netmap/device.c			\
+  vnet/devices/netmap/node.c			\
+  vnet/devices/netmap/cli.c
+
+nobase_include_HEADERS +=			\
+  vnet/devices/netmap/netmap.h
+
+
 ########################################
 # Unix kernel related
 ########################################
@@ -666,3 +742,5 @@ pcap2pg_LDFLAGS = -static
 pcap2pg_LDADD = libvnet.la -l:libvppinfra.a -lpthread -lm -ldl
 
 noinst_PROGRAMS += pcap2pg
+
+