disambiguate lib/spine/*.c #includes

Related to #1785.

diff --git a/lib/spine/CMakeLists.txt b/lib/spine/CMakeLists.txt
index 7a866abf055afa1d2d14f084839d7c42df87e739..041ed553d12d7d5e0e658028638cf00536d30559 100644 (file)
--- 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 d891782f05274f84d4b02c78d18247cca5a4ac2c..71c7a71e78573e3871737a1c45739b123b2907fd 100644 (file)
--- 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 71b6e60a922b1835fd9fd02b36ee459349f6ea68..81d6c24c6c42bde73b728753a5989431f577cc54 100644 (file)
--- 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 73ad676264f5675aebe3b5c7c2342be6272e58ea..c1b023fb494c92c34a7622f698d8e00f630cf714 100644 (file)
--- 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 28418b7aed02de4f29434e4ffb53c641ecaebb73..beabf5bd6dd58388e972a5b9ebb00896889daf9d 100644 (file)
--- 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 15b18978940d02f6efdd1a01f46335cc1de0baf4..fead121ace909d22d1a4c3523f0987221932709e 100644 (file)
--- 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 5925a7786ec74506255e22804d8207031b95012f..6078295b45f1af6ca594d4828b57a9e032b8734c 100644 (file)
--- 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;