From: Matthew Fernandez Date: Sat, 15 Aug 2020 21:41:17 +0000 (-0700) Subject: disambiguate lib/dotgen/*.c #includes X-Git-Tag: 2.46.0~20^2^2~90^2~47 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd8f48450f3689efb94364ec6bf7551959dc2dad;p=graphviz disambiguate lib/dotgen/*.c #includes Related to #1785. --- diff --git a/lib/dotgen/CMakeLists.txt b/lib/dotgen/CMakeLists.txt index 1cd1ae4fe..d523cad15 100644 --- 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 bd380cae8..9a90e3de4 100644 --- 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 107c8d9f7..62231b116 100644 --- 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 void reverse_edge(edge_t * e) { diff --git a/lib/dotgen/aspect.c b/lib/dotgen/aspect.c index de6fb368d..672109198 100644 --- 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 /* * Author: Mohammad T. Irfan diff --git a/lib/dotgen/class1.c b/lib/dotgen/class1.c index 721cb04e2..fec38456e 100644 --- a/lib/dotgen/class1.c +++ b/lib/dotgen/class1.c @@ -17,7 +17,7 @@ * create temporary edges. */ -#include "dot.h" +#include int nonconstraint_edge(edge_t * e) diff --git a/lib/dotgen/class2.c b/lib/dotgen/class2.c index 349c3059a..3ab49ae74 100644 --- 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 static node_t* label_vnode(graph_t * g, edge_t * orig) diff --git a/lib/dotgen/cluster.c b/lib/dotgen/cluster.c index b1f3ce63b..c711f1b76 100644 --- a/lib/dotgen/cluster.c +++ b/lib/dotgen/cluster.c @@ -12,7 +12,7 @@ *************************************************************************/ -#include "dot.h" +#include static node_t* map_interclust_node(node_t * n) diff --git a/lib/dotgen/compound.c b/lib/dotgen/compound.c index bcf2d70fc..c5b635fd6 100644 --- 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 /* pf2s: * Convert a pointf to its string representation. diff --git a/lib/dotgen/conc.c b/lib/dotgen/conc.c index 1b4f3671f..367bf6c91 100644 --- 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 #include #define UP 0 diff --git a/lib/dotgen/decomp.c b/lib/dotgen/decomp.c index 7af7233a9..306b72be6 100644 --- a/lib/dotgen/decomp.c +++ b/lib/dotgen/decomp.c @@ -20,7 +20,7 @@ * component. */ -#include "dot.h" +#include static node_t *Last_node; static char Cmark; diff --git a/lib/dotgen/dotinit.c b/lib/dotgen/dotinit.c index f56697c5e..6f028fc3b 100644 --- a/lib/dotgen/dotinit.c +++ b/lib/dotgen/dotinit.c @@ -13,9 +13,9 @@ #include -#include "dot.h" -#include "pack.h" -#include "aspect.h" +#include +#include +#include static void dot_init_subg(graph_t * g, graph_t* droot) diff --git a/lib/dotgen/dotsplines.c b/lib/dotgen/dotsplines.c index 2a6753c58..a557fafa7 100644 --- a/lib/dotgen/dotsplines.c +++ b/lib/dotgen/dotsplines.c @@ -16,11 +16,11 @@ * set edge splines. */ -#include "dot.h" +#include #include #ifdef ORTHO -#include +#include #endif #define NSUB 9 /* number of subdivisions, re-aiming splines */ diff --git a/lib/dotgen/fastgr.c b/lib/dotgen/fastgr.c index 637bd84d5..c5506a5c0 100644 --- a/lib/dotgen/fastgr.c +++ b/lib/dotgen/fastgr.c @@ -12,7 +12,7 @@ *************************************************************************/ -#include "dot.h" +#include /* diff --git a/lib/dotgen/flat.c b/lib/dotgen/flat.c index e2ed9dd35..cd47802eb 100644 --- a/lib/dotgen/flat.c +++ b/lib/dotgen/flat.c @@ -12,7 +12,7 @@ *************************************************************************/ -#include "dot.h" +#include 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 d2ae6fde4..5d2d51674 100644 --- a/lib/dotgen/gvdotgen.vcxproj +++ b/lib/dotgen/gvdotgen.vcxproj @@ -52,7 +52,7 @@ Disabled - $(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) + $(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) _DEBUG;_LIB;WIN32_DLL;_TEST_;%(PreprocessorDefinitions) true EnableFastChecks @@ -71,7 +71,7 @@ - $(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) + $(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) NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) Level4 diff --git a/lib/dotgen/mincross.c b/lib/dotgen/mincross.c index 090e491f8..99feb1a02 100644 --- a/lib/dotgen/mincross.c +++ b/lib/dotgen/mincross.c @@ -20,7 +20,7 @@ */ #include -#include "dot.h" +#include #include #include diff --git a/lib/dotgen/position.c b/lib/dotgen/position.c index cbac9e90c..11676d14c 100644 --- 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 +#include 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 e8b721d7d..13949d609 100644 --- 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 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 6c9b227e1..eb4225d29 100644 --- a/lib/dotgen/sameport.c +++ b/lib/dotgen/sameport.c @@ -17,7 +17,7 @@ */ #include -#include "dot.h" +#include #define MAXSAME 5 /* max no of same{head,tail} groups on a node */