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

Related to #1785.

diff --git a/lib/fdpgen/clusteredges.h b/lib/fdpgen/clusteredges.h
index 26137cd2b7636513799dfbc06c38b3ed009ae11b..1089e98ce6178a6fd5ee0dc693656b9c982f880b 100644 (file)
--- a/lib/fdpgen/clusteredges.h
+++ b/lib/fdpgen/clusteredges.h
@@ -18,8 +18,8 @@ extern "C" {
 #ifndef CLUSTEREDGES_H
 #define CLUSTEREDGES_H
 
-#include <render.h>
-#include <adjust.h>
+#include <common/render.h>
+#include <neatogen/adjust.h>
 
     extern int compoundEdges(graph_t * g, expand_t* pm, int splines);
 

diff --git a/lib/fdpgen/comp.h b/lib/fdpgen/comp.h
index b7fab7d6ba09831f39fb254cc90764d942c8aceb..fa35dd1d05e7993a4ed987e1159390776099b086 100644 (file)
--- a/lib/fdpgen/comp.h
+++ b/lib/fdpgen/comp.h
@@ -18,7 +18,7 @@ extern "C" {
 #ifndef COMP_H
 #define COMP_H
 
-#include <render.h>
+#include <common/render.h>
 
     extern graph_t **findCComp(graph_t *, int *, int *);
 

diff --git a/lib/fdpgen/dbg.h b/lib/fdpgen/dbg.h
index 8fd36f9b2752bf485b8c3712b881145bae5ec68a..9714b40205740133eda4b082988b647fade99f3a 100644 (file)
--- a/lib/fdpgen/dbg.h
+++ b/lib/fdpgen/dbg.h
@@ -20,9 +20,9 @@ extern "C" {
 
 #ifdef DEBUG
 
-#include <fdp.h>
+#include <fdpgen/fdp.h>
 #include <stdio.h>
-#include <cgraph.h>
+#include <cgraph/cgraph.h>
 
     extern double Scale;
     extern void outputGraph(Agraph_t *, FILE *, int);

diff --git a/lib/fdpgen/fdp.h b/lib/fdpgen/fdp.h
index 06f1b63cf0ac33c372dcd0db9340173a755640b4..65c22ed4eefb6b552629ab995b719dc698890736 100644 (file)
--- a/lib/fdpgen/fdp.h
+++ b/lib/fdpgen/fdp.h
@@ -14,7 +14,7 @@
 #ifndef FDP_H
 #define FDP_H
 
-#include <render.h>
+#include <common/render.h>
 
 #ifdef FDP_PRIVATE
 

diff --git a/lib/fdpgen/grid.h b/lib/fdpgen/grid.h
index 93fe56de8df48907d44305efefd91f9115b19db7..54f2ca3339d8fee24d2dc5a1f388ffa830db3398 100644 (file)
--- a/lib/fdpgen/grid.h
+++ b/lib/fdpgen/grid.h
@@ -20,8 +20,8 @@ extern "C" {
 
 #include "config.h"
 
-#include <render.h>
-#include <cdt.h>
+#include <common/render.h>
+#include <cdt/cdt.h>
 
     typedef struct _grid Grid;
 

diff --git a/lib/fdpgen/tlayout.h b/lib/fdpgen/tlayout.h
index d301bceba609d7e00afb7dddc37985882f77848b..491db00a027f2d28eb92f01a4577e39596fb1d29 100644 (file)
--- a/lib/fdpgen/tlayout.h
+++ b/lib/fdpgen/tlayout.h
@@ -18,8 +18,8 @@ extern "C" {
 #ifndef TLAYOUT_H
 #define TLAYOUT_H
 
-#include "fdp.h"
-#include "xlayout.h"
+#include <fdpgen/fdp.h>
+#include <fdpgen/xlayout.h>
 
 typedef enum {
   seed_unset, seed_val, seed_time, seed_regular

diff --git a/lib/fdpgen/xlayout.h b/lib/fdpgen/xlayout.h
index 3ebdc6cf43a0aed3fd0c548220a7d23894ec65cd..f59364472359241470fd7c1ab3f33a3fa6543c05 100644 (file)
--- a/lib/fdpgen/xlayout.h
+++ b/lib/fdpgen/xlayout.h
@@ -18,7 +18,7 @@ extern "C" {
 #ifndef XLAYOUT_H
 #define XLAYOUT_H
 
-#include <fdp.h>
+#include <fdpgen/fdp.h>
 
     typedef struct {
        int numIters;

diff --git a/lib/patchwork/patchwork.h b/lib/patchwork/patchwork.h
index ee3df7a9712e622554a9fcf9cd5e3f905b7363ff..51d84ec5a69457d71d8070bfdc3386bbc0b23738 100644 (file)
--- a/lib/patchwork/patchwork.h
+++ b/lib/patchwork/patchwork.h
@@ -15,7 +15,7 @@
 #define PATCHWORK_H
 
 #include "render.h"
-#include "fdp.h"
+#include <fdpgen/fdp.h>
 
 #ifdef __cplusplus
 extern "C" {