From 8b2ed684a4b5c9d2ef7e1efa04cb2382c14af3f7 Mon Sep 17 00:00:00 2001 From: Aaron Rosen Date: Mon, 25 Jul 2016 15:04:32 -0700 Subject: [PATCH] move ovn/lib/.h to include/ovn This patch is done to enable in tree building of the ovn-utils python wrapper. This is similar to what was done in commit ee89ea7b477bb4fd05137de03b2e8443807ed9f4 (json: Move from lib to include/openvswitch.). Signed-off-by: Aaron Rosen Signed-off-by: Ben Pfaff --- include/automake.mk | 1 + {ovn/lib => include/ovn}/actions.h | 0 include/ovn/automake.mk | 5 +++++ {ovn/lib => include/ovn}/expr.h | 0 {ovn/lib => include/ovn}/lex.h | 0 ovn/controller/lflow.c | 4 ++-- ovn/controller/ofctrl.c | 2 +- ovn/controller/ovn-controller.c | 2 +- ovn/controller/pinctrl.c | 2 +- ovn/lib/actions.c | 6 +++--- ovn/lib/automake.mk | 3 --- ovn/lib/expr.c | 4 ++-- ovn/lib/lex.c | 2 +- ovn/northd/ovn-northd.c | 2 +- tests/test-ovn.c | 6 +++--- 15 files changed, 21 insertions(+), 18 deletions(-) rename {ovn/lib => include/ovn}/actions.h (100%) create mode 100644 include/ovn/automake.mk rename {ovn/lib => include/ovn}/expr.h (100%) rename {ovn/lib => include/ovn}/lex.h (100%) diff --git a/include/automake.mk b/include/automake.mk index 6a4cf86a0d7..37903fdc3e6 100644 --- a/include/automake.mk +++ b/include/automake.mk @@ -6,6 +6,7 @@ include/odp-netlink.h: datapath/linux/compat/include/linux/openvswitch.h \ EXTRA_DIST += build-aux/extract-odp-netlink-h CLEANFILES += include/odp-netlink.h +include include/ovn/automake.mk include include/openflow/automake.mk include include/openvswitch/automake.mk include include/sparse/automake.mk diff --git a/ovn/lib/actions.h b/include/ovn/actions.h similarity index 100% rename from ovn/lib/actions.h rename to include/ovn/actions.h diff --git a/include/ovn/automake.mk b/include/ovn/automake.mk new file mode 100644 index 00000000000..d2924c2f6a9 --- /dev/null +++ b/include/ovn/automake.mk @@ -0,0 +1,5 @@ +ovnincludedir = $(includedir)/ovn +ovninclude_HEADERS = \ + include/ovn/actions.h \ + include/ovn/expr.h \ + include/ovn/lex.h diff --git a/ovn/lib/expr.h b/include/ovn/expr.h similarity index 100% rename from ovn/lib/expr.h rename to include/ovn/expr.h diff --git a/ovn/lib/lex.h b/include/ovn/lex.h similarity index 100% rename from ovn/lib/lex.h rename to include/ovn/lex.h diff --git a/ovn/controller/lflow.c b/ovn/controller/lflow.c index 42c9055c03a..a4f33227a32 100644 --- a/ovn/controller/lflow.c +++ b/ovn/controller/lflow.c @@ -22,8 +22,8 @@ #include "openvswitch/ofpbuf.h" #include "openvswitch/vlog.h" #include "ovn-controller.h" -#include "ovn/lib/actions.h" -#include "ovn/lib/expr.h" +#include "ovn/actions.h" +#include "ovn/expr.h" #include "ovn/lib/ovn-dhcp.h" #include "ovn/lib/ovn-sb-idl.h" #include "packets.h" diff --git a/ovn/controller/ofctrl.c b/ovn/controller/ofctrl.c index 95f84d18abb..dd9f5ece1ac 100644 --- a/ovn/controller/ofctrl.c +++ b/ovn/controller/ofctrl.c @@ -34,7 +34,7 @@ #include "openvswitch/ofpbuf.h" #include "openvswitch/vlog.h" #include "ovn-controller.h" -#include "ovn/lib/actions.h" +#include "ovn/actions.h" #include "poll-loop.h" #include "physical.h" #include "rconn.h" diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c index ecf13063f66..5c741866712 100644 --- a/ovn/controller/ovn-controller.c +++ b/ovn/controller/ovn-controller.c @@ -39,7 +39,7 @@ #include "ofctrl.h" #include "openvswitch/vconn.h" #include "openvswitch/vlog.h" -#include "ovn/lib/actions.h" +#include "ovn/actions.h" #include "ovn/lib/ovn-sb-idl.h" #include "ovn/lib/ovn-util.h" #include "patch.h" diff --git a/ovn/controller/pinctrl.c b/ovn/controller/pinctrl.c index 0ae6501ec25..416dad6300f 100644 --- a/ovn/controller/pinctrl.c +++ b/ovn/controller/pinctrl.c @@ -35,7 +35,7 @@ #include "lib/dhcp.h" #include "ovn-controller.h" -#include "ovn/lib/actions.h" +#include "ovn/actions.h" #include "ovn/lib/logical-fields.h" #include "ovn/lib/ovn-util.h" #include "poll-loop.h" diff --git a/ovn/lib/actions.c b/ovn/lib/actions.c index 6e2bf933537..fd5a8673b33 100644 --- a/ovn/lib/actions.c +++ b/ovn/lib/actions.c @@ -17,20 +17,20 @@ #include #include #include -#include "actions.h" #include "bitmap.h" #include "byte-order.h" #include "compiler.h" #include "ovn-dhcp.h" -#include "expr.h" #include "hash.h" #include "openvswitch/hmap.h" -#include "lex.h" #include "logical-fields.h" #include "nx-match.h" #include "openvswitch/dynamic-string.h" #include "openvswitch/ofp-actions.h" #include "openvswitch/ofpbuf.h" +#include "ovn/actions.h" +#include "ovn/expr.h" +#include "ovn/lex.h" #include "packets.h" #include "openvswitch/shash.h" #include "simap.h" diff --git a/ovn/lib/automake.mk b/ovn/lib/automake.mk index 4f8cd05b7a5..4e9daf553ec 100644 --- a/ovn/lib/automake.mk +++ b/ovn/lib/automake.mk @@ -5,11 +5,8 @@ ovn_lib_libovn_la_LDFLAGS = \ $(AM_LDFLAGS) ovn_lib_libovn_la_SOURCES = \ ovn/lib/actions.c \ - ovn/lib/actions.h \ ovn/lib/expr.c \ - ovn/lib/expr.h \ ovn/lib/lex.c \ - ovn/lib/lex.h \ ovn/lib/ovn-dhcp.h \ ovn/lib/ovn-util.c \ ovn/lib/ovn-util.h \ diff --git a/ovn/lib/expr.c b/ovn/lib/expr.c index 1c38b993000..288aae2e091 100644 --- a/ovn/lib/expr.c +++ b/ovn/lib/expr.c @@ -16,15 +16,15 @@ #include #include "byte-order.h" -#include "expr.h" #include "openvswitch/json.h" -#include "lex.h" #include "logical-fields.h" #include "openvswitch/dynamic-string.h" #include "openvswitch/match.h" #include "openvswitch/ofp-actions.h" #include "openvswitch/vlog.h" #include "openvswitch/shash.h" +#include "ovn/expr.h" +#include "ovn/lex.h" #include "simap.h" #include "sset.h" #include "util.h" diff --git a/ovn/lib/lex.c b/ovn/lib/lex.c index 79aa2211513..95edeaf2201 100644 --- a/ovn/lib/lex.c +++ b/ovn/lib/lex.c @@ -15,12 +15,12 @@ */ #include -#include "lex.h" #include #include #include #include "openvswitch/dynamic-string.h" #include "openvswitch/json.h" +#include "ovn/lex.h" #include "packets.h" #include "util.h" diff --git a/ovn/northd/ovn-northd.c b/ovn/northd/ovn-northd.c index a8368819204..716f1232f0c 100644 --- a/ovn/northd/ovn-northd.c +++ b/ovn/northd/ovn-northd.c @@ -26,7 +26,7 @@ #include "hash.h" #include "openvswitch/hmap.h" #include "openvswitch/json.h" -#include "ovn/lib/lex.h" +#include "ovn/lex.h" #include "ovn/lib/ovn-dhcp.h" #include "ovn/lib/ovn-nb-idl.h" #include "ovn/lib/ovn-sb-idl.h" diff --git a/tests/test-ovn.c b/tests/test-ovn.c index 26055bb0361..ffb4e50c001 100644 --- a/tests/test-ovn.c +++ b/tests/test-ovn.c @@ -26,9 +26,9 @@ #include "openvswitch/ofp-actions.h" #include "openvswitch/ofpbuf.h" #include "openvswitch/vlog.h" -#include "ovn/lib/actions.h" -#include "ovn/lib/expr.h" -#include "ovn/lib/lex.h" +#include "ovn/actions.h" +#include "ovn/expr.h" +#include "ovn/lex.h" #include "ovn/lib/ovn-dhcp.h" #include "ovs-thread.h" #include "ovstest.h"