X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2FMakefile.am;h=84ee79e91782529627945151bb1026fe3acf3f4c;hb=e7a40e86b1f7f2325ebcff1d2506ef6a81536955;hp=a69734d1530dc1219a3b227ced3132cc92340a41;hpb=52fc44d61bcebb898dc19ab818ff60e617055694;p=vpp.git

diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index a69734d1530..84ee79e9178 100644
--- a/vnet/Makefile.am
+++ b/vnet/Makefile.am
@@ -58,6 +58,8 @@ libvnet_la_SOURCES +=				\
 
 nobase_include_HEADERS +=			\
   vnet/policer/police.h				\
+  vnet/policer/policer.h			\
+  vnet/policer/fix_types.h			\
   vnet/policer/xlate.h
 
 ########################################
@@ -397,32 +399,18 @@ nobase_include_HEADERS +=			\
 
 
 ########################################
-# Tunnel protocol: nsh-gre
+# Tunnel protocol: vxlan-gpe
 ########################################
 
 libvnet_la_SOURCES +=				\
- vnet/nsh-gre/nsh_gre.c				\
- vnet/nsh-gre/encap.c				\
- vnet/nsh-gre/decap.c
+ vnet/vxlan-gpe/vxlan_gpe.c			\
+ vnet/vxlan-gpe/encap.c	        		\
+ vnet/vxlan-gpe/decap.c
 
 nobase_include_HEADERS +=			\
- vnet/nsh-gre/nsh_gre.h				\
- vnet/nsh-gre/nsh_gre_packet.h			\
- vnet/nsh-gre/nsh_gre_error.def
-
-########################################
-# Tunnel protocol: nsh-vxlan-gpe
-########################################
-
-libvnet_la_SOURCES +=				\
- vnet/nsh-vxlan-gpe/nsh_vxlan_gpe.c		\
- vnet/nsh-vxlan-gpe/encap.c			\
- vnet/nsh-vxlan-gpe/decap.c
-
-nobase_include_HEADERS +=			\
- vnet/nsh-vxlan-gpe/nsh_vxlan_gpe.h		\
- vnet/nsh-vxlan-gpe/vxlan_gpe_packet.h		\
- vnet/nsh-vxlan-gpe/nsh_vxlan_gpe_error.def
+ vnet/vxlan-gpe/vxlan_gpe.h			\
+ vnet/vxlan-gpe/vxlan_gpe_packet.h		\
+ vnet/vxlan-gpe/vxlan_gpe_error.def
 
 ########################################
 # LISP control plane: lisp-cp
@@ -726,6 +714,16 @@ libvnetplugin_la_SOURCES +=                    \
 nobase_include_HEADERS +=                      \
   vnet/plugin/plugin.h
 
+########################################
+# Service Chain verification util
+########################################
+libvnet_la_SOURCES +=       \
+ vnet/lib-scv/scv_util.c
+
+nobase_include_HEADERS +=                       \
+ vnet/lib-scv/scv_util.h                        \
+ vnet/lib-scv/math64.h
+
 lib_LTLIBRARIES = libvnet.la libvnetplugin.la
 
 dpdk_libs =