From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 30 Aug 2020 23:21:22 +0000 (-0700)
Subject: remove the need for lib/sparse to be in the include path
X-Git-Tag: 2.46.0~20^2^2~52^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77252b78185f9afe84507ec7c8ef4fb9ae030d41;p=graphviz

remove the need for lib/sparse to be in the include path

Related to #1785.
---

diff --git a/lib/mingle/edge_bundling.h b/lib/mingle/edge_bundling.h
index 7d6018d91..0efafb36f 100644
--- a/lib/mingle/edge_bundling.h
+++ b/lib/mingle/edge_bundling.h
@@ -10,7 +10,7 @@
 #ifndef EDGE_BUNDLING_H
 #define EDGE_BUNDLING_H
 
-#include <SparseMatrix.h>
+#include <sparse/SparseMatrix.h>
 
 struct pedge_struct {
   real wgt; /* weight, telling how many original edges this edge represent. If this edge consists of multiple sections of different weights then this is a lower bound. This only applied for agglomerative bundling */
diff --git a/lib/neatogen/adjust.h b/lib/neatogen/adjust.h
index 603d9cfb8..0b41da871 100644
--- a/lib/neatogen/adjust.h
+++ b/lib/neatogen/adjust.h
@@ -21,7 +21,7 @@ extern "C" {
 #endif
 
 #include "geom.h"
-#include "SparseMatrix.h"
+#include <sparse/SparseMatrix.h>
 
 #define DFLT_MARGIN     4   /* 4 points */
 
diff --git a/lib/patchwork/tree_map.h b/lib/patchwork/tree_map.h
index 12bc90416..9e1310779 100644
--- a/lib/patchwork/tree_map.h
+++ b/lib/patchwork/tree_map.h
@@ -14,7 +14,7 @@
 #ifndef TREE_MAP_H
 #define TREE_MAP_H
 
-#include <SparseMatrix.h>
+#include <sparse/SparseMatrix.h>
 
 typedef struct rectangle_struct {
   real x[2];/* center */
diff --git a/lib/sfdpgen/Multilevel.h b/lib/sfdpgen/Multilevel.h
index 1f981dce3..205b5ebf9 100644
--- a/lib/sfdpgen/Multilevel.h
+++ b/lib/sfdpgen/Multilevel.h
@@ -14,7 +14,7 @@
 #ifndef MULTILEVEL_H
 #define MULTILEVEL_H
 
-#include "SparseMatrix.h"
+#include <sparse/SparseMatrix.h>
 
 typedef struct Multilevel_struct *Multilevel;
 
diff --git a/lib/sfdpgen/PriorityQueue.h b/lib/sfdpgen/PriorityQueue.h
index 4481e82e3..c43734021 100644
--- a/lib/sfdpgen/PriorityQueue.h
+++ b/lib/sfdpgen/PriorityQueue.h
@@ -1,6 +1,6 @@
 #ifndef PRIORITY_QUEUE_H
 #define PRIORITY_QUEUE_H
-#include "LinkedList.h"
+#include <sparse/LinkedList.h>
 struct PriorityQueue_struct {
   /* a simple priority queue structure: entries are all integers, gains are all integers in [0, gainmax], total n elements */
   int count;/* how many entries are in?*/
diff --git a/lib/sfdpgen/sparse_solve.h b/lib/sfdpgen/sparse_solve.h
index 53617fb7e..845941b5d 100644
--- a/lib/sfdpgen/sparse_solve.h
+++ b/lib/sfdpgen/sparse_solve.h
@@ -15,7 +15,7 @@
 #ifndef SPARSE_SOLVER_H
 #define SPARSE_SOLVER_H
 
-#include "SparseMatrix.h"
+#include <sparse/SparseMatrix.h>
 
 enum {SOLVE_METHOD_CG, SOLVE_METHOD_JACOBI};
 
diff --git a/lib/sfdpgen/spring_electrical.h b/lib/sfdpgen/spring_electrical.h
index 429789025..ff1bebabb 100644
--- a/lib/sfdpgen/spring_electrical.h
+++ b/lib/sfdpgen/spring_electrical.h
@@ -14,7 +14,7 @@
 #ifndef SPRING_ELECTRICAL_H
 #define SPRING_ELECTRICAL_H
 
-#include <SparseMatrix.h>
+#include <sparse/SparseMatrix.h>
 
 enum {ERROR_NOT_SQUARE_MATRIX = -100};
 
diff --git a/lib/sparse/BinaryHeap.h b/lib/sparse/BinaryHeap.h
index 946442511..d74ece8aa 100644
--- a/lib/sparse/BinaryHeap.h
+++ b/lib/sparse/BinaryHeap.h
@@ -14,8 +14,8 @@
 #ifndef BinaryHeap_H
 #define  BinaryHeap_H
 
-#include "general.h"
-#include "IntStack.h"
+#include <sparse/general.h>
+#include <sparse/IntStack.h>
 
 /* binary heap code. 
    Caution: items inserted should be kept untouched, e.g., the value of the item should be kepted unchanged while the heap is still in use! 
diff --git a/lib/sparse/DotIO.h b/lib/sparse/DotIO.h
index f5fc1fe33..07f8ee01a 100644
--- a/lib/sparse/DotIO.h
+++ b/lib/sparse/DotIO.h
@@ -15,7 +15,7 @@
 #define DOTIO_H
 
 #include <cgraph.h>
-#include "SparseMatrix.h"
+#include <sparse/SparseMatrix.h>
 
 enum {COLOR_SCHEME_NONE, COLOR_SCHEME_PASTEL = 1, COLOR_SCHEME_BLUE_YELLOW, COLOR_SCHEME_WHITE_RED, COLOR_SCHEME_GREY_RED, COLOR_SCHEME_PRIMARY, COLOR_SCHEME_SEQUENTIAL_SINGLEHUE_RED, COLOR_SCHEME_ADAM, COLOR_SCHEME_ADAM_BLEND, COLOR_SCHEME_SEQUENTIAL_SINGLEHUE_RED_LIGHTER, COLOR_SCHEME_GREY};
 extern void initDotIO (Agraph_t *g);
diff --git a/lib/sparse/QuadTree.h b/lib/sparse/QuadTree.h
index d0b51f43e..846cdf89e 100644
--- a/lib/sparse/QuadTree.h
+++ b/lib/sparse/QuadTree.h
@@ -14,7 +14,7 @@
 #ifndef QUAD_TREE_H
 #define QUAD_TREE_H
 
-#include "LinkedList.h"
+#include <sparse/LinkedList.h>
 #include <stdio.h>
 
 typedef struct QuadTree_struct *QuadTree;
diff --git a/lib/sparse/SparseMatrix.h b/lib/sparse/SparseMatrix.h
index 0a6dacb44..25171219a 100644
--- a/lib/sparse/SparseMatrix.h
+++ b/lib/sparse/SparseMatrix.h
@@ -13,7 +13,7 @@
 #ifndef SPARSEMATRIX_H
 #define  SPARSEMATRIX_H
 
-#include <general.h>
+#include <sparse/general.h>
 #include <stdio.h>
 
 #define SYMMETRY_EPSILON 0.0000001