disambiguate lib/label/*.c #includes

Related to #1242 and #1785.

diff --git a/lib/label/CMakeLists.txt b/lib/label/CMakeLists.txt
index 22973dd781b2b04fe1d22be56d9a160eb712bee6..4e43a22e7d82a31b6a808ae890817e9121a1a0eb 100644 (file)
--- a/lib/label/CMakeLists.txt
+++ b/lib/label/CMakeLists.txt
@@ -1,10 +1,3 @@
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GRAPHVIZ_LIB_DIR}/cdt
-    ${GRAPHVIZ_LIB_DIR}/cgraph
-    ${GRAPHVIZ_LIB_DIR}/common
-)
-
 add_library(label STATIC
     # Header files
     index.h
@@ -20,3 +13,11 @@ add_library(label STATIC
     split.q.c
     xlabels.c
 )
+
+target_include_directories(label PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${GRAPHVIZ_LIB_DIR}/cdt
+    ${GRAPHVIZ_LIB_DIR}/cgraph
+    ${GRAPHVIZ_LIB_DIR}/common
+)

diff --git a/lib/label/Makefile.am b/lib/label/Makefile.am
index b643e16f6aa4d273664114acc70e715742375601..d2e16eebdc1df9f3aefeb0798873b3aaff14cced 100644 (file)
--- a/lib/label/Makefile.am
+++ b/lib/label/Makefile.am
@@ -2,6 +2,7 @@
 ## Process this file with automake to produce Makefile.in
 
 AM_CPPFLAGS = \
+       -I$(top_srcdir)/lib \
        -I$(top_srcdir)/lib/common \
        -I$(top_srcdir)/lib/cgraph \
     -I$(top_srcdir)/lib/cdt

diff --git a/lib/label/index.c b/lib/label/index.c
index efd0dbec9f5ea6650bf904877482d0a5160af1e4..c4ae7f4b6d70054b1cd55cd6b4918acfc6c5a367 100644 (file)
--- a/lib/label/index.c
+++ b/lib/label/index.c
@@ -12,11 +12,11 @@
 
 #include <stdlib.h>
 
-#include "index.h"
+#include <label/index.h>
 #include <stdio.h>
 #include <assert.h>
-#include "logic.h"
-#include "memory.h"
+#include <common/logic.h>
+#include <common/memory.h>
 
 LeafList_t *RTreeNewLeafList(Leaf_t * lp)
 {

diff --git a/lib/label/node.c b/lib/label/node.c
index bc756cc05f6cdeaa6f8215ae4b7b85e618eaf180..f9602c4000ea8c12ae42d23652627ea9baf8c506 100644 (file)
--- a/lib/label/node.c
+++ b/lib/label/node.c
@@ -12,10 +12,10 @@
 
 #include <stdlib.h>
 
-#include "index.h"
+#include <label/index.h>
 #include <stdio.h>
 #include <assert.h>
-#include "node.h"
+#include <label/node.h>
 
 /* Make a new node and initialize to have all branch cells empty.
 */

diff --git a/lib/label/nrtmain.c b/lib/label/nrtmain.c
index 40f43ab65e1138e93be14c16f61cb979308c04ba..a1c0a4d93965d7a23881e09fca599a929c42b11c 100644 (file)
--- a/lib/label/nrtmain.c
+++ b/lib/label/nrtmain.c
@@ -14,9 +14,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <memory.h>
-#include <gvc.h>
-#include "xlabels.h"
+#include <common/memory.h>
+#include <gvc/gvc.h>
+#include <labels/xlabels.h>
 
 #if 0
 #define POINTS_PER_INCH 72

diff --git a/lib/label/rectangle.c b/lib/label/rectangle.c
index bcb3091a78e058a1c1c386cdf00989bdab155079..0625e9afa3311ba5780425b84652c0e236a1a798 100644 (file)
--- a/lib/label/rectangle.c
+++ b/lib/label/rectangle.c
@@ -12,14 +12,14 @@
 
 #include "config.h"
 
-#include "index.h"
+#include <label/index.h>
 #include <stdio.h>
 #include <assert.h>
 #include <limits.h>
-#include "logic.h"
-#include "arith.h"
-#include "rectangle.h"
-#include <cgraph.h>
+#include <common/logic.h>
+#include <common/arith.h>
+#include <label/rectangle.h>
+#include <cgraph/cgraph.h>
 
 #define Undefined(x) ((x)->boundary[0] > (x)->boundary[NUMDIMS])
 

diff --git a/lib/label/split.q.c b/lib/label/split.q.c
index 753f5e9f8e9af3267c7da46bbc86f83ccb1f2fcf..a09a2efc3b3187109b286d29c34807f3a71222a9 100644 (file)
--- a/lib/label/split.q.c
+++ b/lib/label/split.q.c
@@ -10,11 +10,11 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "index.h"
+#include <label/index.h>
 #include <stdio.h>
 #include <assert.h>
-#include "split.q.h"
-#include "logic.h"
+#include <label/split.q.h>
+#include <common/logic.h>
 
 /* Forward declarations */
 static void MethodZero(RTree_t * rtp);

diff --git a/lib/label/xlabels.c b/lib/label/xlabels.c
index fa10bf2ba12a4a63332072004d4bb08223b59b5e..54b9baf67c3deb40275289d85f46e45fbc173eb7 100644 (file)
--- a/lib/label/xlabels.c
+++ b/lib/label/xlabels.c
@@ -18,8 +18,8 @@
 #include <stdio.h>
 #include <string.h>
 #define XLABEL_INT
-#include <xlabels.h>
-#include <memory.h>
+#include <label/xlabels.h>
+#include <common/memory.h>
 
 extern int Verbose;