Remove secchan dependence on Netlink for connecting to the datapath.

[openvswitch] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d78bc2c8bb736b8f38090e168b54044919c916b6..658070b3ebc1c75f0317332625f3ac0a8c65dae8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,31 @@
-AUTOMAKE_OPTIONS=foreign
+# 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
-if HAVE_IF_PACKET
-SUBDIRS += switch
-endif
-SUBDIRS += utilities tests include third-party
+SUBDIRS = \
+       lib \
+       datapath \
+       secchan \
+       controller \
+       utilities \
+       switch \
+       tests \
+       include \
+       third-party \
+       debian
 if HAVE_EXT
-SUBDIRS += 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