disambiguate lib/label #includes

Related to #1785.

diff --git a/lib/label/index.h b/lib/label/index.h
index 472d2e0aecbf7a96b2c55ca61d3ff5466ed17d57..ba0a3917de4a599d15b2b9c9f60a8b361d8bf4df 100644 (file)
--- a/lib/label/index.h
+++ b/lib/label/index.h
@@ -47,9 +47,9 @@ extern "C" {
 #define NODECARD 64
 typedef struct RTree RTree_t;
 
-#include <rectangle.h>
-#include <node.h>
-#include <split.q.h>
+#include <label/rectangle.h>
+#include <label/node.h>
+#include <label/split.q.h>
 
 #define CX(i)  (i)
 #define NX(i)  (i+NUMDIMS)

diff --git a/lib/label/node.h b/lib/label/node.h
index e6c76f4dc4ae34ce8c34309c7e900c78764c98f2..fd277440474b1ce6f888662c5fddee1395249847 100644 (file)
--- a/lib/label/node.h
+++ b/lib/label/node.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <index.h>
+#include <label/index.h>
 
 typedef struct Branch {
     Rect_t rect;

diff --git a/lib/label/split.q.h b/lib/label/split.q.h
index 7279bb74cc4c929035349dddba9859341f05f9a3..fd44c165830d8af597131e25e24fc24dd9bc9745 100644 (file)
--- a/lib/label/split.q.h
+++ b/lib/label/split.q.h
@@ -20,8 +20,8 @@ extern "C" {
 /*-----------------------------------------------------------------------------
 | Definitions and global variables.
 -----------------------------------------------------------------------------*/
-#include <rectangle.h>
-#include <index.h>
+#include <label/rectangle.h>
+#include <label/index.h>
 
 #ifndef METHODS
 #define METHODS 1

diff --git a/lib/label/xlabels.h b/lib/label/xlabels.h
index 63286bdc579ed36edc079e3605d9edc24a29aeaf..86b433ada32dfbf2e2c05bf00b151e5485f95a00 100644 (file)
--- a/lib/label/xlabels.h
+++ b/lib/label/xlabels.h
@@ -41,7 +41,7 @@ int placeLabels(object_t * objs, int n_objs,
                xlabel_t * lbls, int n_lbls, label_params_t * params);
 
 #ifdef XLABEL_INT
-#include <index.h>
+#include <label/index.h>
 #include <logic.h>
 #include <cdt.h>