From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 23 Aug 2020 21:17:06 +0000 (-0700)
Subject: remove the need to have lib/expr in the include path
X-Git-Tag: 2.46.0~20^2^2~52^2~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=729650245280174035b380762b4902f19ae584e5;p=graphviz

remove the need to have lib/expr in the include path

Related to #1785.
---

diff --git a/lib/expr/exgram.h b/lib/expr/exgram.h
index 9e57173be..abcdf217e 100644
--- a/lib/expr/exgram.h
+++ b/lib/expr/exgram.h
@@ -30,7 +30,7 @@ extern "C" {
 #define _EXPARSE_H
 #endif
 
-#include "exlib.h"
+#include <expr/exlib.h>
 #include <stddef.h>
 #include <string.h>
 
diff --git a/lib/expr/exlib.h b/lib/expr/exlib.h
index 69a4957fe..5d74fe625 100644
--- a/lib/expr/exlib.h
+++ b/lib/expr/exlib.h
@@ -127,7 +127,7 @@ typedef struct Print_s			/* compiled printf arg node	*/
 	int		loopop;		/* break|continue|return op	*/ \
 	int		nesting;	/* exstatement() nesting	*/
 
-#include <expr.h>
+#include <expr/expr.h>
 #include <ctype.h>
 #include <ast/error.h>
 #include <ast/sfstr.h>
diff --git a/lib/expr/exparse.y b/lib/expr/exparse.y
index aa375ebcd..e20379831 100644
--- a/lib/expr/exparse.y
+++ b/lib/expr/exparse.y
@@ -182,7 +182,7 @@
 
 %{
 
-#include "exgram.h"
+#include <expr/exgram.h>
 
 %}
 
@@ -1329,4 +1329,4 @@ const char *exop(size_t index) {
   return NULL;
 }
 
-#include "exgram.h"
+#include <expr/exgram.h>
diff --git a/lib/expr/expr.h b/lib/expr/expr.h
index 841109cc7..95c23966f 100644
--- a/lib/expr/expr.h
+++ b/lib/expr/expr.h
@@ -37,7 +37,7 @@ extern "C" {
 #define extern		extern __IMPORT__
 #endif
 
-#include "exparse.h"
+#include <expr/exparse.h>
 
 #undef	extern
 
diff --git a/lib/gvpr/actions.h b/lib/gvpr/actions.h
index 514a64a4c..39af3581e 100644
--- a/lib/gvpr/actions.h
+++ b/lib/gvpr/actions.h
@@ -19,7 +19,7 @@ extern "C" {
 #define ACTIONS_H
 
 #include "cgraph.h"
-#include "expr.h"
+#include <expr/expr.h>
 
     extern void nodeInduce(Agraph_t * selected);
     extern Agobj_t *clone(Agraph_t * g, Agobj_t * obj);
diff --git a/lib/gvpr/compile.h b/lib/gvpr/compile.h
index f3b01993c..bae862abe 100644
--- a/lib/gvpr/compile.h
+++ b/lib/gvpr/compile.h
@@ -21,7 +21,7 @@ extern "C" {
 #include <sfio.h>
 #include <parse.h>
 #include <gprstate.h>
-#include <expr.h>
+#include <expr/expr.h>
 
     typedef struct {
 	Exnode_t *guard;
diff --git a/lib/gvpr/gprstate.h b/lib/gvpr/gprstate.h
index 4ff64d77f..b7c20ec41 100644
--- a/lib/gvpr/gprstate.h
+++ b/lib/gvpr/gprstate.h
@@ -22,7 +22,7 @@ extern "C" {
 #include "cgraph.h"
 #include <ast/ast.h>
 #include "vmalloc.h"
-#include "expr.h"
+#include <expr/expr.h>
 #include "gvpr.h"
 
     typedef enum { TV_flat, TV_ne, TV_en,