From 396ced461465f6832fe82199563cf5376f8bcc0d Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sat, 29 Aug 2020 17:34:29 -0700
Subject: [PATCH] remove the need to have lib/fdpgen in the include path

Related to #1785.
---
 lib/fdpgen/clusteredges.h | 4 ++--
 lib/fdpgen/comp.h         | 2 +-
 lib/fdpgen/dbg.h          | 4 ++--
 lib/fdpgen/fdp.h          | 2 +-
 lib/fdpgen/grid.h         | 4 ++--
 lib/fdpgen/tlayout.h      | 4 ++--
 lib/fdpgen/xlayout.h      | 2 +-
 lib/patchwork/patchwork.h | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/fdpgen/clusteredges.h b/lib/fdpgen/clusteredges.h
index 26137cd2b..1089e98ce 100644
--- 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 b7fab7d6b..fa35dd1d0 100644
--- 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 8fd36f9b2..9714b4020 100644
--- 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 06f1b63cf..65c22ed4e 100644
--- 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 93fe56de8..54f2ca333 100644
--- 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 d301bceba..491db00a0 100644
--- 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 3ebdc6cf4..f59364472 100644
--- 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 ee3df7a97..51d84ec5a 100644
--- 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" {
-- 
2.40.0