L2 over LISP and GRE (VPP-457)

Change-Id: I0d7f9c7f41a9f9e0acb0950adedb90d45df08c2a
Signed-off-by: Neale Ranns <nranns@cisco.com>
diff --git a/vnet/Makefile.am b/vnet/Makefile.am
index bcc7faf..6aa4254 100644
--- a/vnet/Makefile.am
+++ b/vnet/Makefile.am
@@ -521,12 +521,15 @@
  vnet/lisp-gpe/lisp_gpe_sub_interface.c         \
  vnet/lisp-gpe/lisp_gpe_adjacency.c             \
  vnet/lisp-gpe/lisp_gpe_tunnel.c                \
+ vnet/lisp-gpe/lisp_gpe_fwd_entry.c		\
+ vnet/lisp-gpe/lisp_gpe_tenant.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_fwd_entry.h		\
+ vnet/lisp-gpe/lisp_gpe_tenant.h		\
  vnet/lisp-gpe/lisp_gpe_packet.h		\
  vnet/lisp-gpe/lisp_gpe_error.def		
 
@@ -779,6 +782,7 @@
   vnet/adj/adj_rewrite.c			\
   vnet/adj/adj_glean.c   			\
   vnet/adj/adj_midchain.c   			\
+  vnet/adj/adj_l2.c      			\
   vnet/adj/adj.c                            
 
 nobase_include_HEADERS +=			\