From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 22 Aug 2020 18:24:43 +0000 (-0700)
Subject: disambiguate lib/spine/*.c #includes
X-Git-Tag: 2.46.0~20^2^2~90^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1b98baaea478858db6eb9f39cf928e4d912008d;p=graphviz

disambiguate lib/spine/*.c #includes

Related to #1785.
---

diff --git a/lib/spine/CMakeLists.txt b/lib/spine/CMakeLists.txt
index 7a866abf0..041ed553d 100644
--- a/lib/spine/CMakeLists.txt
+++ b/lib/spine/CMakeLists.txt
@@ -1,9 +1,3 @@
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GRAPHVIZ_LIB_DIR}/cdt
-    ${GRAPHVIZ_LIB_DIR}/cgraph
-)
-
 add_library(spine STATIC
     # Header files
     quad.h
@@ -18,3 +12,10 @@ add_library(spine STATIC
     subset.c
     union_find.c
 )
+
+target_include_directories(spine PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${GRAPHVIZ_LIB_DIR}/cdt
+    ${GRAPHVIZ_LIB_DIR}/cgraph
+)
diff --git a/lib/spine/Makefile.am b/lib/spine/Makefile.am
index d891782f0..71c7a71e7 100644
--- a/lib/spine/Makefile.am
+++ b/lib/spine/Makefile.am
@@ -5,6 +5,7 @@
 #pkgconfigdir = $(libdir)/pkgconfig
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/cgraph \
 	-I$(top_srcdir)/lib/cdt
 
diff --git a/lib/spine/quad.c b/lib/spine/quad.c
index 71b6e60a9..81d6c24c6 100644
--- a/lib/spine/quad.c
+++ b/lib/spine/quad.c
@@ -3,9 +3,9 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "spinehdr.h"
-#include "quad.h"
-#include "subset.h"
+#include <spine/spinehdr.h>
+#include <spine/quad.h>
+#include <spine/subset.h>
 
 static int cmpdeg(const void *v0, const void *v1)
 {
diff --git a/lib/spine/spine.c b/lib/spine/spine.c
index 73ad67626..c1b023fb4 100644
--- a/lib/spine/spine.c
+++ b/lib/spine/spine.c
@@ -1,16 +1,16 @@
 /* vim:set shiftwidth=4 ts=4: */
 
-#include <spinehdr.h>
-#include <subset.h>
-#include <quad.h>
-#include "union_find.h"
-#include "assert.h"
+#include <spine/spinehdr.h>
+#include <spine/subset.h>
+#include <spine/quad.h>
+#include <spine/union_find.h>
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #ifdef MAIN
 #include <getopt.h>
-#include "ingraphs.h"
+#include <ingraphs/ingraphs.h>
 
 typedef struct {
 	FILE *outfp;
diff --git a/lib/spine/spine.vcxproj b/lib/spine/spine.vcxproj
index 28418b7ae..beabf5bd6 100644
--- a/lib/spine/spine.vcxproj
+++ b/lib/spine/spine.vcxproj
@@ -88,7 +88,7 @@
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
@@ -106,7 +106,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
diff --git a/lib/spine/subset.c b/lib/spine/subset.c
index 15b189789..fead121ac 100644
--- a/lib/spine/subset.c
+++ b/lib/spine/subset.c
@@ -1,8 +1,8 @@
 /* vim:set shiftwidth=4 ts=4 */
 
-#include <spinehdr.h>
+#include <spine/spinehdr.h>
 #include <stdlib.h>
-#include <subset.h>
+#include <spine/subset.h>
 
 static void *mkPtrItem(Dt_t * d, ptritem * obj, Dtdisc_t * disc)
 {
diff --git a/lib/spine/union_find.c b/lib/spine/union_find.c
index 5925a7786..6078295b4 100644
--- a/lib/spine/union_find.c
+++ b/lib/spine/union_find.c
@@ -1,7 +1,7 @@
 /* vim:set shiftwidth=4 ts=4: */
 
-#include <spinehdr.h>
-#include <union_find.h>
+#include <spine/spinehdr.h>
+#include <spine/union_find.h>
 #include <assert.h>
 
 typedef Agnode_t node_t;