From: Matthew Fernandez Date: Sat, 15 Aug 2020 18:29:10 +0000 (-0700) Subject: disambiguate lib/circogen/*.c #includes X-Git-Tag: 2.46.0~20^2^2~90^2~51 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=28cf22fdb5039a478758b2ddc21d0f411029d3ad;p=graphviz disambiguate lib/circogen/*.c #includes Related to #1785. --- diff --git a/lib/circogen/CMakeLists.txt b/lib/circogen/CMakeLists.txt index 9f501779f..7ef899cd8 100644 --- 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 d89d502a9..32a57899c 100644 --- 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 2df9d488e..124529eb9 100644 --- a/lib/circogen/block.c +++ b/lib/circogen/block.c @@ -14,8 +14,8 @@ #include -#include "circular.h" -#include "block.h" +#include +#include void initBlocklist(blocklist_t * bl) { diff --git a/lib/circogen/blockpath.c b/lib/circogen/blockpath.c index b5ed88890..31ea8931a 100644 --- 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 +#include +#include +#include /* The code below lays out a single block on a circle. */ diff --git a/lib/circogen/blocktree.c b/lib/circogen/blocktree.c index 6a14338f9..446fe3cb8 100644 --- a/lib/circogen/blocktree.c +++ b/lib/circogen/blocktree.c @@ -12,7 +12,7 @@ *************************************************************************/ -#include "blocktree.h" +#include static void addNode(block_t * bp, Agnode_t * n) { diff --git a/lib/circogen/circpos.c b/lib/circogen/circpos.c index ac1f91bdd..c545589d7 100644 --- 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 /* getRotation: * The function determines how much the block should be rotated diff --git a/lib/circogen/circular.c b/lib/circogen/circular.c index 22e71431e..4f061634e 100644 --- a/lib/circogen/circular.c +++ b/lib/circogen/circular.c @@ -12,9 +12,9 @@ *************************************************************************/ -#include "circular.h" -#include "blocktree.h" -#include "circpos.h" +#include +#include +#include #include #define MINDIST 1.0 diff --git a/lib/circogen/circularinit.c b/lib/circogen/circularinit.c index 14659443e..a132efe5e 100644 --- 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 +#include +#include +#include #include static void circular_init_edge(edge_t * e) diff --git a/lib/circogen/deglist.c b/lib/circogen/deglist.c index abb86eb0d..e28c5ab55 100644 --- a/lib/circogen/deglist.c +++ b/lib/circogen/deglist.c @@ -12,9 +12,9 @@ *************************************************************************/ -#include -#include -#include +#include +#include +#include #include typedef struct { diff --git a/lib/circogen/edgelist.c b/lib/circogen/edgelist.c index edceac409..74da2ee21 100644 --- a/lib/circogen/edgelist.c +++ b/lib/circogen/edgelist.c @@ -12,7 +12,7 @@ *************************************************************************/ -#include "edgelist.h" +#include #include static edgelistitem *mkItem(Dt_t * d, edgelistitem * obj, Dtdisc_t * disc) diff --git a/lib/circogen/gvcircogen.vcxproj b/lib/circogen/gvcircogen.vcxproj index d01e190c1..b6f182d7a 100644 --- a/lib/circogen/gvcircogen.vcxproj +++ b/lib/circogen/gvcircogen.vcxproj @@ -52,7 +52,7 @@ Disabled - $(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 + $(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 _DEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -67,7 +67,7 @@ - $(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 + $(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 NDEBUG;_LIB;WIN32_DLL;%(PreprocessorDefinitions) Level4 diff --git a/lib/circogen/nodelist.c b/lib/circogen/nodelist.c index 2ef2bff81..1d9714074 100644 --- a/lib/circogen/nodelist.c +++ b/lib/circogen/nodelist.c @@ -12,8 +12,8 @@ *************************************************************************/ -#include "nodelist.h" -#include "circular.h" +#include +#include #include static nodelistitem_t *init_nodelistitem(Agnode_t * n) diff --git a/lib/circogen/nodeset.c b/lib/circogen/nodeset.c index c010d71ab..1305bb23c 100644 --- a/lib/circogen/nodeset.c +++ b/lib/circogen/nodeset.c @@ -12,7 +12,7 @@ *************************************************************************/ -#include +#include 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 bfeacf049..a2ca8e700 100644 --- a/lib/circogen/stack.c +++ b/lib/circogen/stack.c @@ -12,8 +12,8 @@ *************************************************************************/ -#include "stack.h" -#include "circular.h" +#include +#include #include nstack_t *mkStack()