disambiguate lib/twopigen/*.c #includes

Related to #1785.

diff --git a/lib/twopigen/CMakeLists.txt b/lib/twopigen/CMakeLists.txt
index a6f58c40b382c2164ffae1e84fa96c06c340f35c..5b6e5917ff204eadb50cef3b556784fca712e3a9 100644 (file)
--- a/lib/twopigen/CMakeLists.txt
+++ b/lib/twopigen/CMakeLists.txt
@@ -1,4 +1,14 @@
-include_directories(
+add_library(twopigen STATIC
+    # Header files
+    circle.h
+
+    # Source files
+    circle.c
+    twopiinit.c
+)
+
+target_include_directories(twopigen PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${GRAPHVIZ_LIB_DIR}/cdt
     ${GRAPHVIZ_LIB_DIR}/cgraph
@@ -9,12 +19,3 @@ include_directories(
     ${GRAPHVIZ_LIB_DIR}/pathplan
     ${GRAPHVIZ_LIB_DIR}/sparse
 )
-
-add_library(twopigen STATIC
-    # Header files
-    circle.h
-
-    # Source files
-    circle.c
-    twopiinit.c
-)

diff --git a/lib/twopigen/Makefile.am b/lib/twopigen/Makefile.am
index 2bfc3496eaeea8edfa7da245b44dae209a2bf80a..192128f1ad9112f1b7b204738830ea38f20c5fa3 100644 (file)
--- a/lib/twopigen/Makefile.am
+++ b/lib/twopigen/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/gvc \
        -I$(top_srcdir)/lib/neatogen \

diff --git a/lib/twopigen/circle.c b/lib/twopigen/circle.c
index 9117908d8955c77fadc90696d07cdd67ffe102b4..126715462f6bccc5e36fe61314068cee9548e8f1 100644 (file)
--- a/lib/twopigen/circle.c
+++ b/lib/twopigen/circle.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 
-#include    "circle.h"
+#include    <twopigen/circle.h>
 #include    <ctype.h>
 #include    <stdlib.h>
 #define DEF_RANKSEP 1.00

diff --git a/lib/twopigen/gvtwopigen.vcxproj b/lib/twopigen/gvtwopigen.vcxproj
index 54ae6724f16c9b623cb8e62448d4fc4ce1ed20d1..830c697b40c473fc5f43b147cf1caa3c2cbe66d4 100644 (file)
--- a/lib/twopigen/gvtwopigen.vcxproj
+++ b/lib/twopigen/gvtwopigen.vcxproj
@@ -52,7 +52,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -67,7 +67,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\neatogen;$(SolutionDir)lib\pack;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/twopigen/twopiinit.c b/lib/twopigen/twopiinit.c
index 341d140856279f8c1dd6ce38a639375f60fcf4b5..f5b1777279c4c5ab4755394c9d46794142749c59 100644 (file)
--- a/lib/twopigen/twopiinit.c
+++ b/lib/twopigen/twopiinit.c
@@ -17,10 +17,10 @@
  * Derived from Graham Wills' algorithm described in GD'97.
  */
 
-#include    "circle.h"
-#include    "adjust.h"
-#include    "pack.h"
-#include    "neatoprocs.h"
+#include    <twopigen/circle.h>
+#include    <neatogen/adjust.h>
+#include    <pack/pack.h>
+#include    <neatogen/neatoprocs.h>
 
 static void twopi_init_edge(edge_t * e)
 {