disambiguate lib/circogen/*.c #includes

Related to #1785.

diff --git a/lib/circogen/CMakeLists.txt b/lib/circogen/CMakeLists.txt
index 9f501779f92b029a5c6ff440e8878a8be28c6591..7ef899cd897f70ed7feab1cceee4d55d1ab041b2 100644 (file)
--- a/lib/circogen/CMakeLists.txt
+++ b/lib/circogen/CMakeLists.txt
@@ -1,15 +1,3 @@
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${GRAPHVIZ_LIB_DIR}/cdt
-    ${GRAPHVIZ_LIB_DIR}/cgraph
-    ${GRAPHVIZ_LIB_DIR}/common
-    ${GRAPHVIZ_LIB_DIR}/gvc
-    ${GRAPHVIZ_LIB_DIR}/neatogen
-    ${GRAPHVIZ_LIB_DIR}/pack
-    ${GRAPHVIZ_LIB_DIR}/pathplan
-    ${GRAPHVIZ_LIB_DIR}/sparse
-)
-
 add_library(circogen STATIC
     # Header files
     block.h
@@ -35,3 +23,15 @@ add_library(circogen STATIC
     nodelist.c
     nodeset.c
 )
+
+target_include_directories(circogen PRIVATE
+    ${GRAPHVIZ_LIB_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${GRAPHVIZ_LIB_DIR}/cdt
+    ${GRAPHVIZ_LIB_DIR}/cgraph
+    ${GRAPHVIZ_LIB_DIR}/common
+    ${GRAPHVIZ_LIB_DIR}/gvc
+    ${GRAPHVIZ_LIB_DIR}/neatogen
+    ${GRAPHVIZ_LIB_DIR}/pack
+    ${GRAPHVIZ_LIB_DIR}/pathplan
+    ${GRAPHVIZ_LIB_DIR}/sparse)

diff --git a/lib/circogen/Makefile.am b/lib/circogen/Makefile.am
index d89d502a9c8e120a2ca5f56fb404328f61c54c3e..32a57899cca75b51f47b476437cc953a9b34789c 100644 (file)
--- a/lib/circogen/Makefile.am
+++ b/lib/circogen/Makefile.am
@@ -4,6 +4,7 @@
 pkgconfigdir = $(libdir)/pkgconfig
 
 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/circogen/block.c b/lib/circogen/block.c
index 2df9d488e4e8b1ff13416a9e4a9c9980661f6acd..124529eb93610363680df1c52f15334f1ea92af8 100644 (file)
--- a/lib/circogen/block.c
+++ b/lib/circogen/block.c
@@ -14,8 +14,8 @@
 
 #include <assert.h>
 
-#include "circular.h"
-#include "block.h"
+#include <circogen/circular.h>
+#include <circogen/block.h>
 
 void initBlocklist(blocklist_t * bl)
 {

diff --git a/lib/circogen/blockpath.c b/lib/circogen/blockpath.c
index b5ed8889073ec21f205fdaedf264c987749efbf0..31ea8931aca429becded59a61cdc80c06eb5dba5 100644 (file)
--- a/lib/circogen/blockpath.c
+++ b/lib/circogen/blockpath.c
@@ -12,10 +12,10 @@
  *************************************************************************/
 
 
-#include       "blockpath.h"
-#include       "edgelist.h"
-#include       "nodeset.h"
-#include       "deglist.h"
+#include       <circogen/blockpath.h>
+#include       <circogen/edgelist.h>
+#include       <circogen/nodeset.h>
+#include       <circogen/deglist.h>
 
 /* The code below lays out a single block on a circle.
  */

diff --git a/lib/circogen/blocktree.c b/lib/circogen/blocktree.c
index 6a14338f98099d7d1122385d66883c89d5df88fe..446fe3cb8ec988cbf790b87336fe4c3b1ff83d6b 100644 (file)
--- a/lib/circogen/blocktree.c
+++ b/lib/circogen/blocktree.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 
-#include "blocktree.h"
+#include <circogen/blocktree.h>
 
 static void addNode(block_t * bp, Agnode_t * n)
 {

diff --git a/lib/circogen/circpos.c b/lib/circogen/circpos.c
index ac1f91bddef54cfbf937a09425f92e9444383934..c545589d7f52873b903a2292a9eb71813f42d888 100644 (file)
--- a/lib/circogen/circpos.c
+++ b/lib/circogen/circpos.c
@@ -19,7 +19,7 @@
  * especially in the case where one block is the sole child of the other.
  */
 
-#include       "blockpath.h"
+#include       <circogen/blockpath.h>
 
 /* getRotation:
  * The function determines how much the block should be rotated

diff --git a/lib/circogen/circular.c b/lib/circogen/circular.c
index 22e71431e2e0ff3eb876fae733191a6c97cb1272..4f061634e9122fb4fe01711f89607150918ff3cf 100644 (file)
--- a/lib/circogen/circular.c
+++ b/lib/circogen/circular.c
@@ -12,9 +12,9 @@
  *************************************************************************/
 
 
-#include    "circular.h"
-#include    "blocktree.h"
-#include    "circpos.h"
+#include    <circogen/circular.h>
+#include    <circogen/blocktree.h>
+#include    <circogen/circpos.h>
 #include       <string.h>
 
 #define                MINDIST                 1.0

diff --git a/lib/circogen/circularinit.c b/lib/circogen/circularinit.c
index 14659443eb4af9464bcef9b696e496a9425bc24c..a132efe5e8da1154484991008ff7212056c6fe7e 100644 (file)
--- a/lib/circogen/circularinit.c
+++ b/lib/circogen/circularinit.c
@@ -25,10 +25,10 @@
  * Drawings", GD '02, LNCS 2528, pp. 12-22.
  */
 
-#include    "circular.h"
-#include    "adjust.h"
-#include    "pack.h"
-#include    "neatoprocs.h"
+#include    <circogen/circular.h>
+#include    <neatogen/adjust.h>
+#include    <pack/pack.h>
+#include    <neatogen/neatoprocs.h>
 #include    <string.h>
 
 static void circular_init_edge(edge_t * e)

diff --git a/lib/circogen/deglist.c b/lib/circogen/deglist.c
index abb86eb0d6eb77b70a0172ff6b1c9107beae87ea..e28c5ab550fa3fd0689dd90cfa9650830d5ba1f3 100644 (file)
--- a/lib/circogen/deglist.c
+++ b/lib/circogen/deglist.c
@@ -12,9 +12,9 @@
  *************************************************************************/
 
 
-#include <deglist.h>
-#include <circular.h>
-#include <blockpath.h>
+#include <circogen/deglist.h>
+#include <circogen/circular.h>
+#include <circogen/blockpath.h>
 #include <assert.h>
 
 typedef struct {

diff --git a/lib/circogen/edgelist.c b/lib/circogen/edgelist.c
index edceac409aad1f30bd0e411804c9a2a691e9ff22..74da2ee21592f61045dff6ea666f772772ec6753 100644 (file)
--- a/lib/circogen/edgelist.c
+++ b/lib/circogen/edgelist.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 
-#include       "edgelist.h"
+#include       <circogen/edgelist.h>
 #include       <assert.h>
 
 static edgelistitem *mkItem(Dt_t * d, edgelistitem * obj, Dtdisc_t * disc)

diff --git a/lib/circogen/gvcircogen.vcxproj b/lib/circogen/gvcircogen.vcxproj
index d01e190c18e99e5ae0467f8d798c6697ce46a4c0..b6f182d7a0897295896cce263d052258efb1cd6e 100644 (file)
--- a/lib/circogen/gvcircogen.vcxproj
+++ b/lib/circogen/gvcircogen.vcxproj
@@ -52,7 +52,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(ProjectDir);$(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>$(ProjectDir);$(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>
       <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>$(ProjectDir);$(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>$(ProjectDir);$(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>
       <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/circogen/nodelist.c b/lib/circogen/nodelist.c
index 2ef2bff8193c54592d52f0c8d4516505cd818773..1d97140747a795e3e509f0417334e8d10f6394b7 100644 (file)
--- a/lib/circogen/nodelist.c
+++ b/lib/circogen/nodelist.c
@@ -12,8 +12,8 @@
  *************************************************************************/
 
 
-#include       "nodelist.h"
-#include       "circular.h"
+#include       <circogen/nodelist.h>
+#include       <circogen/circular.h>
 #include       <assert.h>
 
 static nodelistitem_t *init_nodelistitem(Agnode_t * n)

diff --git a/lib/circogen/nodeset.c b/lib/circogen/nodeset.c
index c010d71ab57c3ce826d31901053a6087967d3033..1305bb23c45d720c87b154af2d37521041ab1b58 100644 (file)
--- a/lib/circogen/nodeset.c
+++ b/lib/circogen/nodeset.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 
-#include <nodeset.h>
+#include <circogen/nodeset.h>
 
 
 static nsitem_t *mkItem(Dt_t * d, nsitem_t * obj, Dtdisc_t * disc)

diff --git a/lib/circogen/stack.c b/lib/circogen/stack.c
index bfeacf0498a25891811c8f3b3cb4d7e9a715b19e..a2ca8e70005d480c45eca47423f5f0ce06fa693b 100644 (file)
--- a/lib/circogen/stack.c
+++ b/lib/circogen/stack.c
@@ -12,8 +12,8 @@
  *************************************************************************/
 
 
-#include       "stack.h"
-#include       "circular.h"
+#include       <circogen/stack.h>
+#include       <circogen/circular.h>
 #include       <assert.h>
 
 nstack_t *mkStack()