disambiguate lib/dotgen/*.c #includes

Related to #1785.

diff --git a/lib/dotgen/CMakeLists.txt b/lib/dotgen/CMakeLists.txt
index 1cd1ae4fe8e59fabb59d1682d3e909be737ceb71..d523cad15dfd8a9b8ac0aded85a91dad4cea2320 100644 (file)
--- a/lib/dotgen/CMakeLists.txt
+++ b/lib/dotgen/CMakeLists.txt
@@ -1,14 +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}/ortho
-    ${GRAPHVIZ_LIB_DIR}/pack
-    ${GRAPHVIZ_LIB_DIR}/pathplan
-)
-
 add_library(dotgen STATIC
     # Header files
     aspect.h
@@ -33,3 +22,15 @@ add_library(dotgen STATIC
     rank.c
     sameport.c
 )
+
+target_include_directories(dotgen 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}/ortho
+    ${GRAPHVIZ_LIB_DIR}/pack
+    ${GRAPHVIZ_LIB_DIR}/pathplan
+)

diff --git a/lib/dotgen/Makefile.am b/lib/dotgen/Makefile.am
index bd380cae84942ce099e27f619f62f5b236cc1bfc..9a90e3de4c25fe3982b73692bf4222be92d9bdd9 100644 (file)
--- a/lib/dotgen/Makefile.am
+++ b/lib/dotgen/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/pack \
         -I$(top_srcdir)/lib/gvc \

diff --git a/lib/dotgen/acyclic.c b/lib/dotgen/acyclic.c
index 107c8d9f7224101622bc65c312f9c212ece3aedd..62231b116866fd23acfb856450faddb6a9e1c8cd 100644 (file)
--- a/lib/dotgen/acyclic.c
+++ b/lib/dotgen/acyclic.c
@@ -16,7 +16,7 @@
  * Break cycles in a directed graph by depth-first search.
  */
 
-#include "dot.h"
+#include <dotgen/dot.h>
 
 void reverse_edge(edge_t * e)
 {

diff --git a/lib/dotgen/aspect.c b/lib/dotgen/aspect.c
index de6fb368dfa449cd58dee5111be067bb61d2c631..672109198ed25a808fa38c6d2a889b853b6af1bb 100644 (file)
--- a/lib/dotgen/aspect.c
+++ b/lib/dotgen/aspect.c
@@ -11,7 +11,7 @@
  * Contributors: See CVS logs. Details at http://www.graphviz.org/
  *************************************************************************/
 
-#include "dot.h"
+#include <dotgen/dot.h>
 
 /*
  * Author: Mohammad T. Irfan

diff --git a/lib/dotgen/class1.c b/lib/dotgen/class1.c
index 721cb04e2d1632534838c85c5d0f9a54ea28cd84..fec38456ee736688cc260d667e0f0230f6f50c3a 100644 (file)
--- a/lib/dotgen/class1.c
+++ b/lib/dotgen/class1.c
@@ -17,7 +17,7 @@
  * create temporary edges.
  */
 
-#include "dot.h"
+#include <dotgen/dot.h>
 
 
 int nonconstraint_edge(edge_t * e)

diff --git a/lib/dotgen/class2.c b/lib/dotgen/class2.c
index 349c3059a9cb09c4c3d4593fe1e5d07d642ba268..3ab49ae743ff566e3dec51064de332ba9c798054 100644 (file)
--- a/lib/dotgen/class2.c
+++ b/lib/dotgen/class2.c
@@ -14,7 +14,7 @@
 
 /* classify edges for mincross/nodepos/splines, using given ranks */
 
-#include "dot.h"
+#include <dotgen/dot.h>
 
 static node_t*
 label_vnode(graph_t * g, edge_t * orig)

diff --git a/lib/dotgen/cluster.c b/lib/dotgen/cluster.c
index b1f3ce63b024119ea5efbe350079067534f05222..c711f1b760e8e034f94455f7fefaf1f59989cd71 100644 (file)
--- a/lib/dotgen/cluster.c
+++ b/lib/dotgen/cluster.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 
-#include "dot.h"
+#include <dotgen/dot.h>
 
 static node_t*
 map_interclust_node(node_t * n)

diff --git a/lib/dotgen/compound.c b/lib/dotgen/compound.c
index bcf2d70fc2d0c619d8a3162c9cd0a397647e7ed9..c5b635fd61d313bb7b165e40ace4abcd7ef3b24e 100644 (file)
--- a/lib/dotgen/compound.c
+++ b/lib/dotgen/compound.c
@@ -15,7 +15,7 @@
 /* Module for clipping splines to cluster boxes.
  */
 
-#include       "dot.h"
+#include       <dotgen/dot.h>
 
 /* pf2s:
  * Convert a pointf to its string representation.

diff --git a/lib/dotgen/conc.c b/lib/dotgen/conc.c
index 1b4f3671f87a128193335f5e7ca59db13eef406e..367bf6c91020e4cf88bd70969bdab84454dfbb6b 100644 (file)
--- a/lib/dotgen/conc.c
+++ b/lib/dotgen/conc.c
@@ -16,7 +16,7 @@
  *     build edge_t concentrators for parallel edges with a common endpoint
  */
 
-#include       "dot.h"
+#include       <dotgen/dot.h>
 #include       <setjmp.h>
 
 #define                UP              0

diff --git a/lib/dotgen/decomp.c b/lib/dotgen/decomp.c
index 7af7233a969191f0a2e3ef23653fd5311fb7e83c..306b72be6b921b8a6ed1ba077a78a290b1e3cc3a 100644 (file)
--- a/lib/dotgen/decomp.c
+++ b/lib/dotgen/decomp.c
@@ -20,7 +20,7 @@
  * component.
  */
 
-#include "dot.h"
+#include <dotgen/dot.h>
 
 static node_t *Last_node;
 static char Cmark;

diff --git a/lib/dotgen/dotinit.c b/lib/dotgen/dotinit.c
index f56697c5e73e0224668d58ae942f407025b53bdc..6f028fc3b367bc13fe891f639f6e61431ef77ee7 100644 (file)
--- a/lib/dotgen/dotinit.c
+++ b/lib/dotgen/dotinit.c
@@ -13,9 +13,9 @@
 
 
 #include <time.h>
-#include "dot.h"
-#include "pack.h"
-#include "aspect.h"
+#include <dotgen/dot.h>
+#include <pack/pack.h>
+#include <dotgen/aspect.h>
 
 static void
 dot_init_subg(graph_t * g, graph_t* droot)

diff --git a/lib/dotgen/dotsplines.c b/lib/dotgen/dotsplines.c
index 2a6753c589baa3c09039b5273a310c08e39e7a97..a557fafa7d550244fabed61731039e2a850d9823 100644 (file)
--- a/lib/dotgen/dotsplines.c
+++ b/lib/dotgen/dotsplines.c
@@ -16,11 +16,11 @@
  * set edge splines.
  */
 
-#include "dot.h"
+#include <dotgen/dot.h>
 #include <math.h>
 
 #ifdef ORTHO
-#include <ortho.h>
+#include <ortho/ortho.h>
 #endif
 
 #define        NSUB    9               /* number of subdivisions, re-aiming splines */

diff --git a/lib/dotgen/fastgr.c b/lib/dotgen/fastgr.c
index 637bd84d590ca2817170f16c8ab618e401a4f114..c5506a5c0f3fef066ceed449416453d30db1d1e6 100644 (file)
--- a/lib/dotgen/fastgr.c
+++ b/lib/dotgen/fastgr.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 
-#include "dot.h"
+#include <dotgen/dot.h>
 
 
 /*

diff --git a/lib/dotgen/flat.c b/lib/dotgen/flat.c
index e2ed9dd35cf813f593724547d2ef6ea10e332294..cd47802eb6961968fc6b182e329c8348f1c89190 100644 (file)
--- a/lib/dotgen/flat.c
+++ b/lib/dotgen/flat.c
@@ -12,7 +12,7 @@
  *************************************************************************/
 
 
-#include       "dot.h"
+#include       <dotgen/dot.h>
 
 
 static node_t *make_vn_slot(graph_t * g, int r, int pos)

diff --git a/lib/dotgen/gvdotgen.vcxproj b/lib/dotgen/gvdotgen.vcxproj
index d2ae6fde4d5b8145b58e85333cfb0e60691c23cd..5d2d51674daf98dab15c197531e90fd5b56a371a 100644 (file)
--- a/lib/dotgen/gvdotgen.vcxproj
+++ b/lib/dotgen/gvdotgen.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\ortho;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\pack;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\ortho;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\pack;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;_LIB;WIN32_DLL;_TEST_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -71,7 +71,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\ortho;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\pack;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\gvc;$(SolutionDir)lib\ortho;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\pack;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader />
       <WarningLevel>Level4</WarningLevel>

diff --git a/lib/dotgen/mincross.c b/lib/dotgen/mincross.c
index 090e491f8ef605cfb06f1a209a81b7260fc9ab4c..99feb1a022e6cb2ee91892306df799f2381eabfa 100644 (file)
--- a/lib/dotgen/mincross.c
+++ b/lib/dotgen/mincross.c
@@ -20,7 +20,7 @@
  */
 
 #include <assert.h>
-#include "dot.h"
+#include <dotgen/dot.h>
 #include <limits.h>
 #include <stdlib.h>
 

diff --git a/lib/dotgen/position.c b/lib/dotgen/position.c
index cbac9e90c492d6448fac6228fde7e8d2ba421cab..11676d14cbb429dc98b5fe010e9f88fa7f364794 100644 (file)
--- a/lib/dotgen/position.c
+++ b/lib/dotgen/position.c
@@ -20,8 +20,8 @@
  * created and correctly separated.
  */
 
-#include "dot.h"
-#include "aspect.h"
+#include <dotgen/dot.h>
+#include <dotgen/aspect.h>
 
 static int nsiter2(graph_t * g);
 static void create_aux_edges(graph_t * g);

diff --git a/lib/dotgen/rank.c b/lib/dotgen/rank.c
index e8b721d7d52ed822f52db4dcc50a4cbc5a6472ba..13949d6090bb565bd3aeb13a491d39d6b132a372 100644 (file)
--- a/lib/dotgen/rank.c
+++ b/lib/dotgen/rank.c
@@ -26,7 +26,7 @@
  *  watch out for interactions between leaves and clusters.
  */
 
-#include       "dot.h"
+#include       <dotgen/dot.h>
 
 static void dot1_rank(graph_t * g, aspect_t* asp);
 static void dot2_rank(graph_t * g, aspect_t* asp);

diff --git a/lib/dotgen/sameport.c b/lib/dotgen/sameport.c
index 6c9b227e148e08d308814bd1312da4736447e1ad..eb4225d29e7b7b05b226232bbeeaf8f56d2c067f 100644 (file)
--- a/lib/dotgen/sameport.c
+++ b/lib/dotgen/sameport.c
@@ -17,7 +17,7 @@
  */
 
 #include <math.h>
-#include       "dot.h"
+#include       <dotgen/dot.h>
 
 
 #define MAXSAME 5              /* max no of same{head,tail} groups on a node */