From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Tue, 18 Aug 2020 03:38:55 +0000 (-0700)
Subject: disambiguate lib/label/*.c #includes
X-Git-Tag: 2.46.0~20^2^2~90^2~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba038c67c1e06d9642878f2ea0898175565b754c;p=graphviz

disambiguate lib/label/*.c #includes

Related to #1242 and #1785.
---

diff --git a/lib/label/CMakeLists.txt b/lib/label/CMakeLists.txt
index 22973dd78..4e43a22e7 100644
--- 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 b643e16f6..d2e16eebd 100644
--- 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 efd0dbec9..c4ae7f4b6 100644
--- 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 bc756cc05..f9602c400 100644
--- 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 40f43ab65..a1c0a4d93 100644
--- 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 bcb3091a7..0625e9afa 100644
--- 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 753f5e9f8..a09a2efc3 100644
--- 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 fa10bf2ba..54b9baf67 100644
--- 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;