From df89b63368188932d84dca4ce29a06ca5b9c4b08 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Tue, 21 Aug 2018 11:07:53 +0200
Subject: [PATCH] fix include paths

---
 fpga/include/villas/fpga/ip_node.hpp  | 2 +-
 fpga/include/villas/fpga/ips/bram.hpp | 4 ++--
 fpga/include/villas/list.h            | 2 +-
 fpga/include/villas/log.h             | 4 ++--
 fpga/include/villas/log_config.h      | 2 +-
 fpga/include/villas/utils.h           | 2 +-
 fpga/lib/ips/bram.cpp                 | 2 +-
 fpga/lib/ips/dft.c                    | 6 +++---
 fpga/lib/ips/model.c                  | 6 +++---
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/fpga/include/villas/fpga/ip_node.hpp b/fpga/include/villas/fpga/ip_node.hpp
index 9f7c35dc7..427917fc0 100644
--- a/fpga/include/villas/fpga/ip_node.hpp
+++ b/fpga/include/villas/fpga/ip_node.hpp
@@ -37,7 +37,7 @@
 
 #include <villas/fpga/ip.hpp>
 
-#include <villas/directed_graph.hpp>
+#include <villas/graph/directed.hpp>
 
 namespace villas {
 namespace fpga {
diff --git a/fpga/include/villas/fpga/ips/bram.hpp b/fpga/include/villas/fpga/ips/bram.hpp
index f19ce4bf2..58ca01cb0 100644
--- a/fpga/include/villas/fpga/ips/bram.hpp
+++ b/fpga/include/villas/fpga/ips/bram.hpp
@@ -26,8 +26,8 @@
 
 #pragma once
 
-#include "memory.hpp"
-#include "fpga/ip.hpp"
+#include <villas/memory.hpp>
+#include <villas/fpga/ip.hpp>
 
 namespace villas {
 namespace fpga {
diff --git a/fpga/include/villas/list.h b/fpga/include/villas/list.h
index effebdd9b..b206da037 100644
--- a/fpga/include/villas/list.h
+++ b/fpga/include/villas/list.h
@@ -16,7 +16,7 @@
 #include <stdbool.h>
 #include <pthread.h>
 
-#include "common.h"
+#include <villas/common.h>
 
 #define LIST_CHUNKSIZE		16
 
diff --git a/fpga/include/villas/log.h b/fpga/include/villas/log.h
index f33a6ae8d..98d266c3c 100644
--- a/fpga/include/villas/log.h
+++ b/fpga/include/villas/log.h
@@ -31,8 +31,8 @@ extern "C" {
 #include <time.h>
 #include <sys/ioctl.h>
 
-#include "common.h"
-#include "log_config.h"
+#include <villas/common.h>
+#include <villas/log_config.h>
 
 #ifdef __GNUC__
   #define INDENT	int __attribute__ ((__cleanup__(log_outdent), unused)) _old_indent = log_indent(1);
diff --git a/fpga/include/villas/log_config.h b/fpga/include/villas/log_config.h
index 4041b8737..e16bb724e 100644
--- a/fpga/include/villas/log_config.h
+++ b/fpga/include/villas/log_config.h
@@ -27,7 +27,7 @@ struct log;
 
 #include <jansson.h>
 
-#include "log.h"
+#include <villas/log.h>
 
 /** Parse logging configuration. */
 int log_parse(struct log *l, json_t *cfg);
diff --git a/fpga/include/villas/utils.h b/fpga/include/villas/utils.h
index b1c66af84..ea06b660e 100644
--- a/fpga/include/villas/utils.h
+++ b/fpga/include/villas/utils.h
@@ -30,7 +30,7 @@
 #include <signal.h>
 #include <sys/types.h>
 
-#include "log.h"
+#include <villas/log.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/fpga/lib/ips/bram.cpp b/fpga/lib/ips/bram.cpp
index a7919a279..18a5ea0e2 100644
--- a/fpga/lib/ips/bram.cpp
+++ b/fpga/lib/ips/bram.cpp
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *********************************************************************************/
 
-#include "fpga/ips/bram.hpp"
+#include <villas/fpga/ips/bram.hpp>
 
 namespace villas {
 namespace fpga {
diff --git a/fpga/lib/ips/dft.c b/fpga/lib/ips/dft.c
index e6cd688a7..d3b36182a 100644
--- a/fpga/lib/ips/dft.c
+++ b/fpga/lib/ips/dft.c
@@ -24,9 +24,9 @@
 #include "log_config.h"
 #include "plugin.h"
 
-#include "fpga/ip.h"
-#include "fpga/card.h"
-#include "fpga/ips/dft.h"
+#include <villas/fpga/ip.h>
+#include <villas/fpga/card.h>
+#include <villas/fpga/ips/dft.h>
 
 int dft_parse(struct fpga_ip *c, json_t *cfg)
 {
diff --git a/fpga/lib/ips/model.c b/fpga/lib/ips/model.c
index 4e4967115..b5fdf2ba1 100644
--- a/fpga/lib/ips/model.c
+++ b/fpga/lib/ips/model.c
@@ -30,9 +30,9 @@
 #include "log_config.h"
 #include "plugin.h"
 
-#include "fpga/ip.h"
-#include "fpga/card.h"
-#include "fpga/ips/model.h"
+#include <villas/fpga/ip.h>
+#include <villas/fpga/card.h>
+#include <villas/fpga/ips/model.h>
 
 static int model_parameter_destroy(struct model_parameter *p)
 {