For SNAT, don't store the pre-fragment L2 header before actions are applied.

[sliver-openvswitch.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8634a21..84fb6e7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,7 @@ endif
 
 AM_CPPFLAGS = $(SSL_CFLAGS)
 AM_CPPFLAGS += -I $(top_srcdir)/include
+AM_CPPFLAGS += -I $(top_srcdir)/lib
 if HAVE_EXT
 AM_CPPFLAGS += -I $(top_srcdir)/ext/include
 endif
@@ -34,18 +35,23 @@ TESTS =
 TESTS_ENVIRONMENT =
 bin_PROGRAMS =
 bin_SCRIPTS =
+dist_commands_DATA =
 dist_man_MANS =
+dist_pkgdata_SCRIPTS =
+dist_sbin_SCRIPTS =
 man_MANS =
 noinst_HEADERS =
 noinst_LIBRARIES =
 noinst_PROGRAMS =
 noinst_SCRIPTS =
 
-EXTRA_DIST += README.hwtables
+EXTRA_DIST += README.hwtables subst
 
 do_subst = ($(srcdir)/subst VLOG_OPTIONS $(srcdir)/lib/vlog.man | \
-           sed -e 's,[@]PKIDIR[@],$(PKIDIR),g' \
+           sed -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+               -e 's,[@]PKIDIR[@],$(PKIDIR),g' \
                 -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
+                -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
                 -e 's,[@]PERL[@],$(PERL),g')
 ro_script = sed "`printf '1a\\' && printf '\\n\# -*- buffer-read-only: t -*-'`"
 ro_c = echo '/* -*- mode: c; buffer-read-only: t -*- */'
@@ -58,7 +64,7 @@ include lib/automake.mk
 include secchan/automake.mk
 include controller/automake.mk
 include utilities/automake.mk
-include switch/automake.mk
+include udatapath/automake.mk
 include tests/automake.mk
 include include/automake.mk
 include third-party/automake.mk