Unconditionally set skb->dev in dp_set_origin.

[sliver-openvswitch.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4644b05..658070b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,31 @@
-AUTOMAKE_OPTIONS=foreign
-SUBDIRS = lib datapath secchan controller
-if HAVE_IF_PACKET
-SUBDIRS += switch
+# The goal of -Wno-syntax here is just to suppress the Automake warning
+# about overriding distdir, below.
+AUTOMAKE_OPTIONS=foreign -Wno-syntax
+ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = \
+       lib \
+       datapath \
+       secchan \
+       controller \
+       utilities \
+       switch \
+       tests \
+       include \
+       third-party \
+       debian
+if HAVE_EXT
+SUBDIRS += $(EXT)
+distdir = $(PACKAGE)+ext-$(VERSION)
+endif
+
+DIST_SUBDIRS = $(SUBDIRS)
+
+EXTRA_DIST = README.hwtables
+
+if HAVE_DPKG_BUILDPACKAGE
+distcheck-hook: 
+       cd $(srcdir) && dpkg-buildpackage -rfakeroot -us -uc
+       cd $(srcdir) && fakeroot ./debian/rules clean
+else
+distcheck-hook: 
 endif
-SUBDIRS += utilities tests include third-party