From: Matthew Fernandez Date: Sat, 22 Aug 2020 17:45:33 +0000 (-0700) Subject: disambiguate lib/sparse/*.c #includes X-Git-Tag: 2.46.0~20^2^2~90^2~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eecf8e52a70840cbde4608c1294d98196abadb3e;p=graphviz disambiguate lib/sparse/*.c #includes Related to #1242 and #1785. --- diff --git a/lib/sparse/BinaryHeap.c b/lib/sparse/BinaryHeap.c index 0321efda6..2720ace09 100644 --- a/lib/sparse/BinaryHeap.c +++ b/lib/sparse/BinaryHeap.c @@ -11,7 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#include "BinaryHeap.h" +#include BinaryHeap BinaryHeap_new(int (*cmp)(void*item1, void*item2)){ BinaryHeap h; diff --git a/lib/sparse/CMakeLists.txt b/lib/sparse/CMakeLists.txt index 382650c60..5eea9dc88 100644 --- a/lib/sparse/CMakeLists.txt +++ b/lib/sparse/CMakeLists.txt @@ -1,11 +1,3 @@ -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${GRAPHVIZ_LIB_DIR}/cdt - ${GRAPHVIZ_LIB_DIR}/cgraph - ${GRAPHVIZ_LIB_DIR}/common - ${GRAPHVIZ_LIB_DIR}/sfdpgen -) - add_library(sparse STATIC # Header files BinaryHeap.h @@ -35,3 +27,12 @@ add_library(sparse STATIC SparseMatrix.c vector.c ) + +target_include_directories(sparse PRIVATE + ${GRAPHVIZ_LIB_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${GRAPHVIZ_LIB_DIR}/cdt + ${GRAPHVIZ_LIB_DIR}/cgraph + ${GRAPHVIZ_LIB_DIR}/common + ${GRAPHVIZ_LIB_DIR}/sfdpgen +) diff --git a/lib/sparse/DotIO.c b/lib/sparse/DotIO.c index 68c9dde59..1b1716dd4 100644 --- a/lib/sparse/DotIO.c +++ b/lib/sparse/DotIO.c @@ -12,14 +12,13 @@ *************************************************************************/ #define STANDALONE -#include "general.h" -#include "DotIO.h" -#include "clustering.h" +#include +#include +#include #include -#include "mq.h" -/* #include "spring_electrical.h" */ -#include "color_palette.h" -#include "colorutil.h" +#include +#include +#include typedef struct { Agrec_t h; diff --git a/lib/sparse/IntStack.c b/lib/sparse/IntStack.c index 8961174a9..3b42af308 100644 --- a/lib/sparse/IntStack.c +++ b/lib/sparse/IntStack.c @@ -11,8 +11,8 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#include "general.h" -#include "IntStack.h" +#include +#include IntStack IntStack_new(void){ IntStack s; diff --git a/lib/sparse/LinkedList.c b/lib/sparse/LinkedList.c index 08a63fccb..7caf9f08a 100644 --- a/lib/sparse/LinkedList.c +++ b/lib/sparse/LinkedList.c @@ -11,8 +11,8 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#include "LinkedList.h" -#include "memory.h" +#include +#include #define FREE free diff --git a/lib/sparse/Makefile.am b/lib/sparse/Makefile.am index 2b60506b0..8421a3824 100644 --- a/lib/sparse/Makefile.am +++ b/lib/sparse/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/sfdpgen \ -I$(top_srcdir)/lib/common \ -I$(top_srcdir)/lib/cgraph \ diff --git a/lib/sparse/QuadTree.c b/lib/sparse/QuadTree.c index 08bd95a66..42ad4f908 100644 --- a/lib/sparse/QuadTree.c +++ b/lib/sparse/QuadTree.c @@ -11,12 +11,12 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#include "general.h" -#include "geom.h" -#include "arith.h" -#include "math.h" -#include "LinkedList.h" -#include "QuadTree.h" +#include +#include +#include +#include +#include +#include extern real distance_cropped(real *x, int dim, int i, int j); diff --git a/lib/sparse/SparseMatrix.c b/lib/sparse/SparseMatrix.c index 07565c9d0..8bdf9da64 100644 --- a/lib/sparse/SparseMatrix.c +++ b/lib/sparse/SparseMatrix.c @@ -15,14 +15,14 @@ #include #include #include -#include "logic.h" -#include "memory.h" -#include "arith.h" -#include "SparseMatrix.h" -#include "BinaryHeap.h" +#include +#include +#include +#include +#include #if PQ -#include "LinkedList.h" -#include "PriorityQueue.h" +#include +#include #endif static size_t size_of_matrix_type(int type){ diff --git a/lib/sparse/clustering.c b/lib/sparse/clustering.c index b1dbba45c..86fe04e29 100644 --- a/lib/sparse/clustering.c +++ b/lib/sparse/clustering.c @@ -12,9 +12,9 @@ *************************************************************************/ #define STANDALONE -#include "general.h" -#include "SparseMatrix.h" -#include "clustering.h" +#include +#include +#include diff --git a/lib/sparse/color_palette.c b/lib/sparse/color_palette.c index f2a5208b0..9f8bf34f8 100644 --- a/lib/sparse/color_palette.c +++ b/lib/sparse/color_palette.c @@ -9,9 +9,9 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#include "color_palette.h" -#include "string.h" -#include "macros.h" +#include +#include +#include int knownColorScheme (char* name) { diff --git a/lib/sparse/colorutil.c b/lib/sparse/colorutil.c index d70179fe2..50a0c940d 100644 --- a/lib/sparse/colorutil.c +++ b/lib/sparse/colorutil.c @@ -11,8 +11,8 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#include "general.h" -#include "colorutil.h" +#include +#include static void r2hex(float r, char *h){ /* convert a number in [0,1] to 0 to 255 then to a hex */ diff --git a/lib/sparse/general.c b/lib/sparse/general.c index cadfba37a..a4c9fd0e3 100644 --- a/lib/sparse/general.c +++ b/lib/sparse/general.c @@ -11,7 +11,7 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#include "general.h" +#include #include #ifdef DEBUG diff --git a/lib/sparse/gvsparse.vcxproj b/lib/sparse/gvsparse.vcxproj index dd7ba1401..7057b140d 100644 --- a/lib/sparse/gvsparse.vcxproj +++ b/lib/sparse/gvsparse.vcxproj @@ -61,7 +61,7 @@ EditAndContinue true 4996 - $(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) @@ -72,7 +72,7 @@ Level4 true 4996 - $(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) + $(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories) diff --git a/lib/sparse/mq.c b/lib/sparse/mq.c index 055628c81..5fb0658d8 100644 --- a/lib/sparse/mq.c +++ b/lib/sparse/mq.c @@ -59,10 +59,10 @@ */ #define STANDALONE -#include "general.h" -#include "SparseMatrix.h" -#include "mq.h" -#include "LinkedList.h" +#include +#include +#include +#include #include static real get_mq(SparseMatrix A, int *assignment, int *ncluster0, real *mq_in0, real *mq_out0, real **dout0){ diff --git a/lib/sparse/vector.c b/lib/sparse/vector.c index 0d2d500f3..cd205bb23 100644 --- a/lib/sparse/vector.c +++ b/lib/sparse/vector.c @@ -10,8 +10,8 @@ * Contributors: See CVS logs. Details at http://www.graphviz.org/ *************************************************************************/ -#include "general.h" -#include "vector.h" +#include +#include /*---------------- base vector class ----------- */