Remove vestigal TCP implementation

[vpp.git] / vnet / Makefile.am

diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index ee01bff..decd3f5 100644 (file)
--- a/vnet/Makefile.am
+++ b/vnet/Makefile.am
@@ -13,11 +13,12 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CFLAGS = -Wall @DPDK@ @VIRL@
+AM_CFLAGS = -Wall @DPDK@ @VIRL@ @IPSEC@ @VCGN@ @IPV6SR@
 
 libvnet_la_SOURCES =
 libvnetplugin_la_SOURCES =
 nobase_include_HEADERS =
+noinst_PROGRAMS =
 
 ########################################
 # Generic stuff
@@ -210,12 +211,6 @@ nobase_include_HEADERS +=                  \
 # Layer 3 protocols go here
 ########################################
 
-# vnet/ip/tcp.c                                        \
-# vnet/ip/tcp_format.c                         \
-# vnet/ip/tcp_init.c                           \
-# vnet/ip/tcp_pg.c                             
-
-
 ########################################
 # Layer 3 protocol: IP v4/v6
 ########################################
@@ -251,6 +246,7 @@ libvnet_la_SOURCES +=                               \
 nobase_include_HEADERS +=                      \
  vnet/ip/format.h                              \
  vnet/ip/icmp46_packet.h                       \
+ vnet/ip/icmp4.h                               \
  vnet/ip/icmp6.h                               \
  vnet/ip/igmp_packet.h                         \
  vnet/ip/ip.h                                  \
@@ -276,7 +272,7 @@ nobase_include_HEADERS +=                   \
 ########################################
 # Layer 3 protocol: IPSec
 ########################################
-if WITH_DPDK
+if WITH_IPSEC
 libvnet_la_SOURCES +=                          \
  vnet/ipsec/ipsec.c                            \
  vnet/ipsec/ipsec_cli.c                        \
@@ -293,13 +289,13 @@ libvnet_la_SOURCES +=                             \
  vnet/ipsec/ikev2_cli.c                                \
  vnet/ipsec/ikev2_payload.c                    \
  vnet/ipsec/ikev2_format.c
+endif 
 
 nobase_include_HEADERS +=                      \
  vnet/ipsec/ipsec.h                             \
  vnet/ipsec/esp.h                              \
  vnet/ipsec/ikev2.h                             \
  vnet/ipsec/ikev2_priv.h
-endif 
 
 ########################################
 # Layer 3 protocol: osi
@@ -439,8 +435,11 @@ nobase_include_HEADERS +=                  \
 ########################################
 # ipv6 segment routing
 ########################################
+
+if WITH_IPV6SR
 libvnet_la_SOURCES +=                          \
  vnet/sr/sr.c
+endif
  
 nobase_include_HEADERS +=                      \
  vnet/sr/sr_packet.h                           \
@@ -450,6 +449,8 @@ nobase_include_HEADERS +=                   \
 ########################################
 # CGN
 #########################################
+
+if WITH_VCGN
 libvnet_la_SOURCES +=                                          \
  vnet/vcgn/cnat_bulk_port.c                                    \
  vnet/vcgn/cnat_config.c                                       \
@@ -478,6 +479,7 @@ libvnet_la_SOURCES +=                                               \
  vnet/vcgn/index_list.c                                                \
  vnet/vcgn/spp_platform_trace_log.c                            \
  vnet/vcgn/vcgn_classify.c
+endif
 
 ########################################
 # DHCPv6 proxy
@@ -608,20 +610,12 @@ nobase_include_HEADERS +=                 \
 
 lib_LTLIBRARIES = libvnet.la libvnetplugin.la
 
-noinst_PROGRAMS = vnet_unix
-
-vnet_unix_SOURCES =                            \
-  example/main_stub.c
-
-vnet_unix_LDFLAGS = -static
 dpdk_libs = 
 
 if WITH_DPDK
 dpdk_libs += -l:libdpdk.a
 endif
 
-vnet_unix_LDADD = libvnet.la -l:libvlib_unix.a -l:libvlib.a -l:libvppinfra.a -lpthread -lvlibapi -lvlibmemory -lsvm -lm -ldl $(dpdk_libs) -lrt
-
 pcap2pg_SOURCES =                              \
   vnet/unix/pcap2pg.c                          \
   vnet/unix/pcap.h