From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 30 Aug 2020 17:18:54 +0000 (-0700)
Subject: remove the need to have lib/neatogen in the include path
X-Git-Tag: 2.46.0~20^2^2~52^2~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a56d3133ce51cc88eab32ea67a376d20262d0a2;p=graphviz

remove the need to have lib/neatogen in the include path

Related to #1785.
---

diff --git a/lib/neatogen/bfs.h b/lib/neatogen/bfs.h
index 4006c2ea9..77eded48e 100644
--- a/lib/neatogen/bfs.h
+++ b/lib/neatogen/bfs.h
@@ -18,7 +18,7 @@ extern "C" {
 #ifndef _BFS_H_
 #define _BFS_H_
 
-#include "defs.h"
+#include <neatogen/defs.h>
 
 #ifdef __cplusplus
     class Queue {
diff --git a/lib/neatogen/closest.h b/lib/neatogen/closest.h
index 215c8ecef..287611d5c 100644
--- a/lib/neatogen/closest.h
+++ b/lib/neatogen/closest.h
@@ -20,7 +20,7 @@ extern "C" {
 #ifndef CLOSEST_H
 #define CLOSEST_H
 
-#include "defs.h"
+#include <neatogen/defs.h>
 
     extern void closest_pairs2graph(double *, int, int, vtx_data **);
 
diff --git a/lib/neatogen/conjgrad.h b/lib/neatogen/conjgrad.h
index 58b5fa789..fc46c50f6 100644
--- a/lib/neatogen/conjgrad.h
+++ b/lib/neatogen/conjgrad.h
@@ -20,7 +20,7 @@ extern "C" {
 #ifndef _CG_H_
 #define _CG_H_
 
-#include "defs.h"
+#include <neatogen/defs.h>
 
 /*************************
  * C.G. method - SPARSE  *
diff --git a/lib/neatogen/defs.h b/lib/neatogen/defs.h
index 03fa9e101..26ac3f82d 100644
--- a/lib/neatogen/defs.h
+++ b/lib/neatogen/defs.h
@@ -18,9 +18,9 @@ extern "C" {
 #ifndef _DEFS_H_
 #define _DEFS_H_
 
-#include "neato.h"
+#include <neatogen/neato.h>
 
-#include "sparsegraph.h"
+#include <neatogen/sparsegraph.h>
 
 #ifdef DIGCOLA
 #ifdef IPSEPCOLA
diff --git a/lib/neatogen/delaunay.h b/lib/neatogen/delaunay.h
index c178a5a93..534a9047c 100644
--- a/lib/neatogen/delaunay.h
+++ b/lib/neatogen/delaunay.h
@@ -14,7 +14,7 @@
 #ifndef DELAUNAY_H
 #define DELAUNAY_H
 
-#include "sparsegraph.h"
+#include <neatogen/sparsegraph.h>
 
 typedef struct {
     int  nedges; /* no. of edges in triangulation */
diff --git a/lib/neatogen/digcola.h b/lib/neatogen/digcola.h
index 84143a294..425adf6d8 100644
--- a/lib/neatogen/digcola.h
+++ b/lib/neatogen/digcola.h
@@ -18,7 +18,7 @@ extern "C" {
 #ifndef DIGCOLA_H
 #define DIGCOLA_H
 
-#include <defs.h>
+#include <neatogen/defs.h>
 #ifdef DIGCOLA
 extern int compute_y_coords(vtx_data*, int, double*, int);
 extern int compute_hierarchy(vtx_data*, int, double, double, 
diff --git a/lib/neatogen/dijkstra.h b/lib/neatogen/dijkstra.h
index c3aaeeea9..788fcb073 100644
--- a/lib/neatogen/dijkstra.h
+++ b/lib/neatogen/dijkstra.h
@@ -20,8 +20,8 @@ extern "C" {
 #ifndef _DIJKSTRA_H_
 #define _DIJKSTRA_H_
 
-#include "defs.h"
-#include "sgd.h"
+#include <neatogen/defs.h>
+#include <neatogen/sgd.h>
 
 #ifdef __cplusplus
     void dijkstra(int vertex, vtx_data * graph, int n, DistType * dist);
diff --git a/lib/neatogen/edges.h b/lib/neatogen/edges.h
index 1868ccbf2..f1a58e60f 100644
--- a/lib/neatogen/edges.h
+++ b/lib/neatogen/edges.h
@@ -20,7 +20,7 @@ extern "C" {
 #ifndef EDGES_H
 #define EDGES_H
 
-#include "site.h"
+#include <neatogen/site.h>
 
     typedef struct Edge {
 	double a, b, c;		/* edge on line ax + by = c */
diff --git a/lib/neatogen/embed_graph.h b/lib/neatogen/embed_graph.h
index e9ca52abf..b1e3d3642 100644
--- a/lib/neatogen/embed_graph.h
+++ b/lib/neatogen/embed_graph.h
@@ -35,7 +35,7 @@ extern "C" {
 		      double **(&new_coords));
 
 #else
-#include <defs.h>
+#include <neatogen/defs.h>
 
     extern void embed_graph(vtx_data * graph, int n, int dim, DistType ***,
 			    int);
diff --git a/lib/neatogen/heap.h b/lib/neatogen/heap.h
index 9958ead6f..e32f3911f 100644
--- a/lib/neatogen/heap.h
+++ b/lib/neatogen/heap.h
@@ -20,7 +20,7 @@ extern "C" {
 #ifndef HEAP_H
 #define HEAP_H
 
-#include "hedges.h"
+#include <neatogen/hedges.h>
 
     extern void PQinitialize(void);
     extern void PQcleanup(void);
diff --git a/lib/neatogen/hedges.h b/lib/neatogen/hedges.h
index e252a5337..5aa8d1a85 100644
--- a/lib/neatogen/hedges.h
+++ b/lib/neatogen/hedges.h
@@ -20,8 +20,8 @@ extern "C" {
 #ifndef HEDGES_H
 #define HEDGES_H
 
-#include "site.h"
-#include "edges.h"
+#include <neatogen/site.h>
+#include <neatogen/edges.h>
 
     typedef struct Halfedge {
 	struct Halfedge *ELleft, *ELright;
diff --git a/lib/neatogen/info.h b/lib/neatogen/info.h
index fc95c0f2a..4934f90a9 100644
--- a/lib/neatogen/info.h
+++ b/lib/neatogen/info.h
@@ -19,8 +19,8 @@ extern "C" {
 #ifndef INFO_H
 #define INFO_H
 
-#include "voronoi.h"
-#include "poly.h"
+#include <neatogen/voronoi.h>
+#include <neatogen/poly.h>
 
     typedef struct ptitem {	/* Point list */
 	struct ptitem *next;
diff --git a/lib/neatogen/kkutils.h b/lib/neatogen/kkutils.h
index 6e5067f15..55dd5327f 100644
--- a/lib/neatogen/kkutils.h
+++ b/lib/neatogen/kkutils.h
@@ -20,7 +20,7 @@ extern "C" {
 #ifndef KKUTILS_H_
 #define KKUTILS_H_
 
-#include "defs.h"
+#include <neatogen/defs.h>
 
 #ifdef __cplusplus
 
diff --git a/lib/neatogen/matrix_ops.h b/lib/neatogen/matrix_ops.h
index f75810794..fd4a95d95 100644
--- a/lib/neatogen/matrix_ops.h
+++ b/lib/neatogen/matrix_ops.h
@@ -20,7 +20,7 @@ extern "C" {
 #ifndef _MATRIX_OPS_H_
 #define _MATRIX_OPS_H_
 
-#include "sparsegraph.h"
+#include <neatogen/sparsegraph.h>
 
     extern void cpvec(double *, int, int, double *);
     extern double dot(double *, int, int, double *);
diff --git a/lib/neatogen/neato.h b/lib/neatogen/neato.h
index 0a9b528a5..52d095908 100644
--- a/lib/neatogen/neato.h
+++ b/lib/neatogen/neato.h
@@ -35,7 +35,7 @@
 
 #include	"render.h"
 #include	"pathplan.h"
-#include	"neatoprocs.h"
-#include	"adjust.h"
+#include	<neatogen/neatoprocs.h>
+#include	<neatogen/adjust.h>
 
 #endif				/* NEATO_H */
diff --git a/lib/neatogen/neatoprocs.h b/lib/neatogen/neatoprocs.h
index 0657f62f7..35a1f6792 100644
--- a/lib/neatogen/neatoprocs.h
+++ b/lib/neatogen/neatoprocs.h
@@ -17,7 +17,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "adjust.h"
+#include <neatogen/adjust.h>
 
     extern void avoid_cycling(graph_t *, Agnode_t *, double *);
     extern int checkStart(graph_t * G, int nG, int);
diff --git a/lib/neatogen/pca.h b/lib/neatogen/pca.h
index 5f0850c4e..906fed84a 100644
--- a/lib/neatogen/pca.h
+++ b/lib/neatogen/pca.h
@@ -20,7 +20,7 @@ extern "C" {
 #ifndef PCA_H
 #define PCA_H
 
-#include "defs.h"
+#include <neatogen/defs.h>
 
     extern void PCA_alloc(DistType **, int, int, double **, int);
     extern boolean iterativePCA_1D(double **, int, int, double *);
diff --git a/lib/neatogen/poly.h b/lib/neatogen/poly.h
index 16a43aad0..55210712a 100644
--- a/lib/neatogen/poly.h
+++ b/lib/neatogen/poly.h
@@ -18,7 +18,7 @@ extern "C" {
 #ifndef POLY_H
 #define POLY_H
 
-#include "geometry.h"
+#include <neatogen/geometry.h>
 
     typedef struct {
 	Point origin;
diff --git a/lib/neatogen/quad_prog_vpsc.h b/lib/neatogen/quad_prog_vpsc.h
index 14e06e60c..b5e54ae7f 100644
--- a/lib/neatogen/quad_prog_vpsc.h
+++ b/lib/neatogen/quad_prog_vpsc.h
@@ -31,10 +31,10 @@ extern "C" {
 
 #ifdef DIGCOLA
 
-#include "defs.h"
-#include "digcola.h"
+#include <neatogen/defs.h>
+#include <neatogen/digcola.h>
 #ifdef MOSEK
-#include "mosek_quad_solve.h"
+#include <neatogen/mosek_quad_solve.h>
 #endif /* MOSEK */
 
 typedef struct CMajEnvVPSC {
diff --git a/lib/neatogen/site.h b/lib/neatogen/site.h
index ae282d4d8..65f3ae685 100644
--- a/lib/neatogen/site.h
+++ b/lib/neatogen/site.h
@@ -20,7 +20,7 @@ extern "C" {
 #ifndef SITE_H
 #define SITE_H
 
-#include "geometry.h"
+#include <neatogen/geometry.h>
 
     /* Sites are also used as vertices on line segments */
     typedef struct Site {
diff --git a/lib/neatogen/stress.h b/lib/neatogen/stress.h
index e11699cfc..a4e0b2bbc 100644
--- a/lib/neatogen/stress.h
+++ b/lib/neatogen/stress.h
@@ -19,7 +19,7 @@ extern "C" {
 #ifndef STRESS_H
 #define STRESS_H
 
-#include "defs.h"
+#include <neatogen/defs.h>
 
 #define tolerance_cg 1e-3
 
diff --git a/lib/neatogen/voronoi.h b/lib/neatogen/voronoi.h
index 2f4c7b400..678f8a176 100644
--- a/lib/neatogen/voronoi.h
+++ b/lib/neatogen/voronoi.h
@@ -20,7 +20,7 @@ extern "C" {
 #ifndef VORONOI_H
 #define VORONOI_H
 
-#include "site.h"
+#include <neatogen/site.h>
 
     extern void voronoi(int, Site * (*)(void));
 
diff --git a/lib/topfish/hierarchy.h b/lib/topfish/hierarchy.h
index 2fd9d0925..dd8737ff9 100644
--- a/lib/topfish/hierarchy.h
+++ b/lib/topfish/hierarchy.h
@@ -13,7 +13,7 @@
 #ifndef _HIERARCHY_H_
 #define _HIERARCHY_H_
 
-#include "sparsegraph.h"
+#include <neatogen/sparsegraph.h>
 
 typedef struct {
     int nedges;       // degree, including self-loop