move ovn/lib/<lex|actions|expr>.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
ee89ea7 (json: Move from lib to
include/openvswitch.).

Signed-off-by: Aaron Rosen <aaronorosen@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

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

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

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"

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"

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"

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"

ovn/lib/actions.c

@@ -17,20 +17,20 @@
 #include <config.h>
 #include <stdarg.h>
 #include <stdbool.h>
-#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"

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 \

ovn/lib/expr.c

@@ -16,15 +16,15 @@
 
 #include <config.h>
 #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"

ovn/lib/lex.c

@@ -15,12 +15,12 @@
  */
 
 #include <config.h>
-#include "lex.h"
 #include <ctype.h>
 #include <errno.h>
 #include <stdarg.h>
 #include "openvswitch/dynamic-string.h"
 #include "openvswitch/json.h"
+#include "ovn/lex.h"
 #include "packets.h"
 #include "util.h"
 

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"

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"