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 4006c2ea9244b308ff912b4a84415cb1c3c64a87..77eded48e261d2db7606cff893f7fa8e46ec823e 100644 (file)
--- 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 215c8ecefea6f387d0817946a534808e51e6a7e6..287611d5c44044a1d2cd21876aca0598a448fde8 100644 (file)
--- 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 58b5fa78968a5137157d7ee113a99e1a3d3eed6c..fc46c50f67a448e1654eeb4ddc4c5b84ff459539 100644 (file)
--- 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 03fa9e101eef58943bd5ab47b0b056f545fd6283..26ac3f82d13492f3dece1bc1a4219d2b2dd2ed07 100644 (file)
--- 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 c178a5a93371abb25368adddd2e929847de687ff..534a9047cc2ead9e76038cfd1ae16cd9a86fdd75 100644 (file)
--- 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 84143a29482936ebfcd386b4b80cb66bee17301f..425adf6d8f25d37fabad4da318d87c390a1ec955 100644 (file)
--- 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 c3aaeeea9e87c18cc0b21bfa210a99893d8c543f..788fcb073940067f12ed20ca7ce5c5b7f3a43cc3 100644 (file)
--- 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 1868ccbf21dba7cf9d656b578343504b1ddc0261..f1a58e60f70d4db453a9f6ddae7bf7cc64523c81 100644 (file)
--- 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 e9ca52abf668d3bc4c3e632cd5327d6b2de0d01b..b1e3d3642c3bc4f3597e053fc9589b30502a40fe 100644 (file)
--- 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 9958ead6f3e52e7eaece21cef3c58e5d79c2fdfe..e32f3911f58c89962ec9df62d40c79d74ad048ee 100644 (file)
--- 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 e252a5337ce72e41a3e678169ff2166758bb41b6..5aa8d1a85cd62979f21c7e8f2748bfaeba557aae 100644 (file)
--- 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 fc95c0f2a5f451d461151e96bfdebdeae991bbda..4934f90a99d8eb2d318c42b40f243d68e7b2bea5 100644 (file)
--- 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 6e5067f15a983c128964d1f5f602107e93e03d25..55dd5327f8e3bff4f20315441b69a7f645453666 100644 (file)
--- 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 f75810794a74b62977c3841c5d5b807205a44ada..fd4a95d952428d1ecf36b294ec6e48b279c3fdec 100644 (file)
--- 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 0a9b528a573226c98c96ed8dcb9626474ac5ae05..52d095908d2f971dd0d4512e5c564fe2c72640c5 100644 (file)
--- 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 0657f62f736a350da56cbe6011cfc348a76416b1..35a1f67927c0eb871e5d6a4ee2d5c7b901b7b60c 100644 (file)
--- 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 5f0850c4e31e42a32a267021d3324a22c3eb97af..906fed84ab53a6a064459b335ed2ac0081dfdea2 100644 (file)
--- 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 16a43aad0cedf3ef662a0b6841aa9a30b5792b49..55210712a224b35a25b82f63c07cb2c32e3ed7bb 100644 (file)
--- 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 14e06e60c1622318f88cb03404c6b4af0bce72b7..b5e54ae7f1118b886833448b67ec78d7f8b9c077 100644 (file)
--- 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 ae282d4d8b74e41b760c03f7742164b022e64a47..65f3ae685769d8e857b2c940f5b502127a7d2ad8 100644 (file)
--- 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 e11699cfc410348247f68c2960fbd64c40a6dae0..a4e0b2bbc93d72c7072ebba4d12999f2b4fb014c 100644 (file)
--- 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 2f4c7b400f530432f56b7a2a2f6845e3ec377869..678f8a1762aa885a262f8991e8094ecdfb3610f5 100644 (file)
--- 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 2fd9d09256ef45b9f7330f367f7c584a39d89e0b..dd8737ff9e20637d9ff718ed442e7e75e5aba623 100644 (file)
--- 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