X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2FMakefile.am;h=460becbfff99cae42533666597bb48895cae6ddb;hb=20a64f5f8a3dc6132c79da074adc7de1f037a154;hp=a0c20e9eb377aeae8fb478ceac9a16032a73c6b1;hpb=52372b6c8e36401721a0533301e1ecdb30109424;p=vpp.git

diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index a0c20e9eb37..460becbfff9 100644
--- a/vnet/Makefile.am
+++ b/vnet/Makefile.am
@@ -13,7 +13,7 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-AM_CFLAGS = -Wall @DPDK@ @VIRL@
+AM_CFLAGS = -Wall @DPDK@ @VIRL@ @IPSEC@ @VCGN@ @IPV6SR@
 
 libvnet_la_SOURCES =
 libvnetplugin_la_SOURCES =
@@ -59,6 +59,18 @@ nobase_include_HEADERS +=			\
   vnet/policer/police.h				\
   vnet/policer/xlate.h
 
+########################################
+# Cop - junk filter
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/cop/cop.c				\
+  vnet/cop/node1.c				\
+  vnet/cop/ip4_whitelist.c			\
+  vnet/cop/ip6_whitelist.c	
+
+nobase_include_HEADERS +=			\
+  vnet/cop/cop.h
 
 ########################################
 # Layer 2 protocols go here
@@ -102,6 +114,7 @@ libvnet_la_SOURCES +=				\
  vnet/l2/l2_output_acl.c			\
  vnet/l2/l2_output.c				\
  vnet/l2/l2_patch.c				\
+ vnet/l2/l2_rw.c                                \
  vnet/l2/l2_vtr.c				\
  vnet/l2/l2_xcrw.c
 
@@ -117,6 +130,7 @@ nobase_include_HEADERS +=			\
  vnet/l2/l2_bvi.h				\
  vnet/l2/l2_flood.h				\
  vnet/l2/l2_fib.h				\
+ vnet/l2/l2_rw.h                                \
  vnet/l2/l2_xcrw.h				\
  vnet/l2/l2_classify.h
 
@@ -191,9 +205,20 @@ libvnet_la_SOURCES +=				\
 
 nobase_include_HEADERS +=			\
   vnet/vxlan/vxlan.h				\
-  vnet/vxlan/vxlan_packet.h         \
+  vnet/vxlan/vxlan_packet.h         		\
   vnet/vxlan/vxlan_error.def
 
+########################################
+# Layer 2 / CDP
+########################################
+libvnet_la_SOURCES +=				\
+  vnet/cdp/cdp_input.c				\
+  vnet/cdp/cdp_node.c				\
+  vnet/cdp/cdp_periodic.c	
+
+nobase_include_HEADERS +=			\
+  vnet/cdp/cdp_protocol.h
+
 ########################################
 # Layer 2/3 "classify"
 ########################################
@@ -211,12 +236,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
 ########################################
@@ -269,7 +288,6 @@ nobase_include_HEADERS +=			\
  vnet/ip/ip_packet.h				\
  vnet/ip/ports.def				\
  vnet/ip/protocols.def				\
- vnet/ip/tcp.h					\
  vnet/ip/tcp_packet.h				\
  vnet/ip/udp.h					\
  vnet/ip/udp_error.def				\
@@ -278,12 +296,11 @@ 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  			\
  vnet/ipsec/ipsec_format.c			\
- vnet/ipsec/ipsec_output.c			\
  vnet/ipsec/ipsec_input.c			\
  vnet/ipsec/ipsec_if.c				\
  vnet/ipsec/ipsec_if_in.c			\
@@ -295,13 +312,16 @@ libvnet_la_SOURCES +=       			\
  vnet/ipsec/ikev2_cli.c				\
  vnet/ipsec/ikev2_payload.c			\
  vnet/ipsec/ikev2_format.c
+endif 
+
+libvnet_la_SOURCES +=       			\
+ vnet/ipsec/ipsec_output.c
 
 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
@@ -441,8 +461,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				\
@@ -452,6 +475,8 @@ nobase_include_HEADERS +=			\
 ########################################
 # CGN
 #########################################
+
+if WITH_VCGN
 libvnet_la_SOURCES +=						\
  vnet/vcgn/cnat_bulk_port.c					\
  vnet/vcgn/cnat_config.c					\
@@ -480,6 +505,7 @@ libvnet_la_SOURCES +=						\
  vnet/vcgn/index_list.c						\
  vnet/vcgn/spp_platform_trace_log.c				\
  vnet/vcgn/vcgn_classify.c
+endif
 
 ########################################
 # DHCPv6 proxy
@@ -548,6 +574,7 @@ if WITH_DPDK
 libvnet_la_SOURCES +=				\
   vnet/devices/dpdk/dpdk_priv.h		\
   vnet/devices/dpdk/device.c		\
+  vnet/devices/dpdk/format.c		\
   vnet/devices/dpdk/init.c			\
   vnet/devices/dpdk/node.c			\
   vnet/devices/dpdk/threads.c       \
@@ -581,6 +608,19 @@ libvnet_la_SOURCES +=				\
 nobase_include_HEADERS +=			\
   vnet/devices/ssvm/ssvm_eth.h
 
+########################################
+# Linux packet interface
+########################################
+
+libvnet_la_SOURCES +=				\
+  vnet/devices/af_packet/af_packet.c		\
+  vnet/devices/af_packet/device.c		\
+  vnet/devices/af_packet/node.c			\
+  vnet/devices/af_packet/cli.c
+
+nobase_include_HEADERS +=			\
+  vnet/devices/af_packet/af_packet.h
+
 ########################################
 # Unix kernel related
 ########################################
@@ -602,10 +642,10 @@ nobase_include_HEADERS +=			\
 # Plugin client library
 ########################################
 
-libvnetplugin_la_SOURCES +=			\
+libvnetplugin_la_SOURCES +=                    \
   vnet/plugin/p1.c
 
-nobase_include_HEADERS +=			\
+nobase_include_HEADERS +=                      \
   vnet/plugin/plugin.h
 
 lib_LTLIBRARIES = libvnet.la libvnetplugin.la