disambiguate lib/sparse/*.c #includes

Related to #1242 and #1785.

diff --git a/lib/sparse/BinaryHeap.c b/lib/sparse/BinaryHeap.c
index 0321efda60d4a452e9e1530a68915f19646bbfa6..2720ace0977a2e9206497f40ca99308f5e174d04 100644 (file)
--- 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 <sparse/BinaryHeap.h>
 
 BinaryHeap BinaryHeap_new(int (*cmp)(void*item1, void*item2)){
   BinaryHeap h;

diff --git a/lib/sparse/CMakeLists.txt b/lib/sparse/CMakeLists.txt
index 382650c60b53cbb9e6f2f112da4e3119683350fc..5eea9dc883dcec36692d967b07c33ba676fc16c4 100644 (file)
--- 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 68c9dde59c7484216ece685adc729364b1e9a227..1b1716dd4090aaac2c6158295d80246f5c10c056 100644 (file)
--- 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 <sparse/general.h>
+#include <sparse/DotIO.h>
+#include <sparse/clustering.h>
 #include <math.h>
-#include "mq.h"
-/* #include "spring_electrical.h" */
-#include "color_palette.h"
-#include "colorutil.h"
+#include <sparse/mq.h>
+#include <sparse/color_palette.h>
+#include <sparse/colorutil.h>
 
 typedef struct {
     Agrec_t h;

diff --git a/lib/sparse/IntStack.c b/lib/sparse/IntStack.c
index 8961174a9ebaa90a8e4bb5f73fdc2258f88c19a1..3b42af308fab8cdcd27bca2e5affe11d6c66d2ef 100644 (file)
--- 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 <sparse/general.h>
+#include <sparse/IntStack.h>
 
 IntStack IntStack_new(void){
   IntStack s;

diff --git a/lib/sparse/LinkedList.c b/lib/sparse/LinkedList.c
index 08a63fccbd74754d0478274a04424abfd2cfd765..7caf9f08a2cd292426dc0067783138c2dd547470 100644 (file)
--- 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 <sparse/LinkedList.h>
+#include <common/memory.h>
 #define FREE free
 
 

diff --git a/lib/sparse/Makefile.am b/lib/sparse/Makefile.am
index 2b60506b051d67fcc19c13196e05cf26c7ec9511..8421a38248234cc3b6a33480d05bdc2f00a9367f 100644 (file)
--- 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 08bd95a663a70bf6053c5853425854119aaf440e..42ad4f908597f274ccff3d3c53298e0282d9be4d 100644 (file)
--- 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 <sparse/general.h>
+#include <common/geom.h>
+#include <common/arith.h>
+#include <math.h>
+#include <sparse/LinkedList.h>
+#include <sparse/QuadTree.h>
 
 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 07565c9d0c5acbc359210f73ab5b05e895396244..8bdf9da6431f582dfbe7a349123637cca0588f45 100644 (file)
--- a/lib/sparse/SparseMatrix.c
+++ b/lib/sparse/SparseMatrix.c
@@ -15,14 +15,14 @@
 #include <string.h>
 #include <math.h>
 #include <assert.h>
-#include "logic.h"
-#include "memory.h"
-#include "arith.h"
-#include "SparseMatrix.h"
-#include "BinaryHeap.h"
+#include <common/logic.h>
+#include <common/memory.h>
+#include <common/arith.h>
+#include <sparse/SparseMatrix.h>
+#include <sparse/BinaryHeap.h>
 #if PQ
-#include "LinkedList.h"
-#include "PriorityQueue.h"
+#include <sparse/LinkedList.h>
+#include <sparse/PriorityQueue.h>
 #endif
 
 static size_t size_of_matrix_type(int type){

diff --git a/lib/sparse/clustering.c b/lib/sparse/clustering.c
index b1dbba45c49982472c9f6173864ebb00cdc17bb5..86fe04e29a2ab0457937879b22e72c41c64b509a 100644 (file)
--- 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 <sparse/general.h>
+#include <sparse/SparseMatrix.h>
+#include <sparse/clustering.h>
 
 
 

diff --git a/lib/sparse/color_palette.c b/lib/sparse/color_palette.c
index f2a5208b071d31b4b45e676116f657b4fb8254b5..9f8bf34f8a0f31493f8d18f5182f58480999e677 100644 (file)
--- 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 <sparse/color_palette.h>
+#include <string.h>
+#include <common/macros.h>
 
 int knownColorScheme (char* name)
 {

diff --git a/lib/sparse/colorutil.c b/lib/sparse/colorutil.c
index d70179fe245056e120a7934ba88681da7a441a6d..50a0c940de5419ca77e527b900ed721f9a4981f9 100644 (file)
--- 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 <sparse/general.h>
+#include <sparse/colorutil.h>
 
 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 cadfba37ab291df7aa32960004e18cbc9d068b03..a4c9fd0e3e5ffe7930077f49d547cf50497a88bb 100644 (file)
--- 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 <sparse/general.h>
 #include <errno.h>
 
 #ifdef DEBUG

diff --git a/lib/sparse/gvsparse.vcxproj b/lib/sparse/gvsparse.vcxproj
index dd7ba14016f7c0ceba75ba8e932c0ca16d59b7c2..7057b140d095839b3b7c8856f84b2c0e43dd29d6 100644 (file)
--- a/lib/sparse/gvsparse.vcxproj
+++ b/lib/sparse/gvsparse.vcxproj
@@ -61,7 +61,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <EnablePREfast>true</EnablePREfast>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib />
   </ItemDefinitionGroup>
@@ -72,7 +72,7 @@
       <WarningLevel>Level4</WarningLevel>
       <EnablePREfast>true</EnablePREfast>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-      <AdditionalIncludeDirectories>$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)lib;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\sparse;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Lib />
   </ItemDefinitionGroup>

diff --git a/lib/sparse/mq.c b/lib/sparse/mq.c
index 055628c8172a8ba455ea57a60c075ab97cd52761..5fb0658d8778808a6bfddae20c9c0c62706f5736 100644 (file)
--- 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 <sparse/general.h>
+#include <sparse/SparseMatrix.h>
+#include <sparse/mq.h>
+#include <sparse/LinkedList.h>
 #include <string.h>
 
 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 0d2d500f3ffed9751b1d23d15dbffea4ed00bc14..cd205bb23899578621d8ba8e15f4cdfde38bfd48 100644 (file)
--- 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 <sparse/general.h>
+#include <sparse/vector.h>
 
 
 /*---------------- base vector class ----------- */