Reset mac header in flow_extract(), because it might initially be null.

[sliver-openvswitch.git] / datapath / Makefile.am

diff --git a/datapath/Makefile.am b/datapath/Makefile.am
index 64c5077..88e66c7 100644 (file)
--- a/datapath/Makefile.am
+++ b/datapath/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = tests
+SUBDIRS = 
 if L26_ENABLED
 SUBDIRS += linux-2.6
 endif
@@ -6,27 +6,12 @@ if L24_ENABLED
 SUBDIRS += linux-2.4
 endif
 
-EXTRA_DIST = linux-2.6 linux-2.4\
-                       datapath.c snap.h chain.c  crc32.c  crc_t.c\
-                       flow.h forward.h table-hash.c\
-            unit.c unit.h datapath.h  chain.h  crc32.h\
-            flow.c  forward.c  forward_t.c table.h\
-            table-linear.c  table_t.c    unit-exports.c\
-                       datapath_t.c datapath_t.h compat.h\
-                       dp_dev.c
+EXTRA_DIST = $(dist_headers) $(dist_sources)
+EXTRA_DIST += hwtable_dummy/Modules.mk hwtable_dummy/hwtable_dummy.c
 
-# Do not include header and source files from the top of the linux-*
-# directories, as these are just symbolic links to the files in
-# "datapath".
-dist-hook:
-       rm -rf `find $(distdir)/linux-* -name Module.symvers`
-       rm -rf `find $(distdir)/linux-* -name .*.cmd`
-       rm -rf `find $(distdir)/linux-* -name .*.swp`
-       rm -rf `find $(distdir)/linux-* -name .*.d`
-       rm -rf `find $(distdir)/linux-* -name .tmp_versions`
-       rm -rf `find $(distdir)/linux-* -name *.o`
-       rm -rf `find $(distdir)/linux-* -name *.ko`
-       rm -rf `find $(distdir)/linux-* -name Makefile`
-       rm -rf `find $(distdir)/linux-* -name .gitignore`
-       rm -f $(distdir)/linux-*/*.h
-       rm -f $(distdir)/linux-*/*.c
+# Suppress warnings about GNU extensions in Modules.mk files.
+AUTOMAKE_OPTIONS = -Wno-portability
+
+include Modules.mk
+include linux-2.4/Modules.mk
+include linux-2.6/Modules.mk