summaryrefslogtreecommitdiff
path: root/include/automake.mk
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2014-08-04 11:11:40 -0700
committerBen Pfaff <blp@nicira.com>2014-08-04 11:11:40 -0700
commit837eefc76b3c79bb790a4c4c2d0a314d81b71a28 (patch)
treea1f69472e0cf641513506ac54eae1815e0ff0aa5 /include/automake.mk
parentfa6395df71913c749f104978a736f238fb20bc08 (diff)
downloadopenvswitch-837eefc76b3c79bb790a4c4c2d0a314d81b71a28.tar.gz
Do not seemingly #include Linux-specific headers on other platforms.
Until now, the OVS source tree has had a whole maze of header files that make "#include <linux/openvswitch.h>" work OK regardless of platform, but this confuses everyone new to the tree, at first glance, and is difficult to understand at second glance too. This commit renames include/linux/openvswitch.h to datapath/linux/compat/include/linux/openvswitch.h without other change, then modifies the userspace build to generate a header that makes sense in portable Open vSwitch userspace from that header. It then removes all the remaining include/linux/* files since they are now unused. Signed-off-by: Ben Pfaff <blp@nicira.com> Acked-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'include/automake.mk')
-rw-r--r--include/automake.mk9
1 files changed, 8 insertions, 1 deletions
diff --git a/include/automake.mk b/include/automake.mk
index 37a6f77af..55cb353ac 100644
--- a/include/automake.mk
+++ b/include/automake.mk
@@ -1,4 +1,11 @@
-include include/linux/automake.mk
+BUILT_SOURCES += include/odp-netlink.h
+
+include/odp-netlink.h: datapath/linux/compat/include/linux/openvswitch.h \
+ build-aux/extract-odp-netlink-h
+ sed -f $(srcdir)/build-aux/extract-odp-netlink-h < $< > $@
+EXTRA_DIST += build-aux/extract-odp-netlink-h
+CLEANFILES += include/odp-netlink.h
+
include include/openflow/automake.mk
include include/openvswitch/automake.mk
include include/sparse/automake.mk