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 9e57173bef160b3d10e0f9c35b0db1c2da0a787a..abcdf217e089dd95070ecbf95a50cf8ce8d88c94 100644 (file)
--- 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 69a4957fedcc24639b9e77fcc4a7a2c5a6d9ce38..5d74fe62520787ddbdb8743e0f788369d2e6f636 100644 (file)
--- 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 aa375ebcd77a199104824c9375236e18a099c058..e20379831e6b0c82d829f2f12146e49418065eb9 100644 (file)
--- 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 841109cc7c5f4d95662e5900723e54df1e935ba1..95c23966f0e5918ff2914938cfece82ea6af8dac 100644 (file)
--- 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 514a64a4cbe15eeb27e800b96a921704ba838805..39af3581e4fb472610f500a143342e8fece13e93 100644 (file)
--- 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 f3b01993cc5f27822ff531feac44c7b0d69b5382..bae862abebbc4d60dcce8ed68ced409e8736e720 100644 (file)
--- 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 4ff64d77faa6d8cf3800e21bba771f03d6efda5e..b7c20ec4157c2c123a4f0a23c74b17c931fb2fbb 100644 (file)
--- 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,