From 0895cac1b9eae5c8701ba416eda1f43aa0016921 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Thu, 4 May 2017 14:24:33 +0200
Subject: Follow the moving binding and configuration files.

Change include statement to refer the correct new path to the files.
Also change CMakeLists.txt.

Change-Id: I66a0bccab02e9fce10072a275a6580d61b4ddfbe
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
 .../low-can-binding/binding/configuration-generated.cpp    |  2 +-
 CAN-binder/low-can-binding/binding/configuration.cpp       |  4 ++--
 CAN-binder/low-can-binding/binding/configuration.hpp       |  8 ++++----
 CAN-binder/low-can-binding/binding/low-can-binding.cpp     | 14 +++++++-------
 4 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'CAN-binder/low-can-binding/binding')

diff --git a/CAN-binder/low-can-binding/binding/configuration-generated.cpp b/CAN-binder/low-can-binding/binding/configuration-generated.cpp
index c3cecc5..c96a103 100644
--- a/CAN-binder/low-can-binding/binding/configuration-generated.cpp
+++ b/CAN-binder/low-can-binding/binding/configuration-generated.cpp
@@ -1,5 +1,5 @@
 #include "configuration.hpp"
-#include "can/can-decoder.hpp"
+#include "../can/can-decoder.hpp"
 
 configuration_t::configuration_t()
 	:can_bus_manager_{utils::config_parser_t{"/etc/dev-mapping.conf"}}
diff --git a/CAN-binder/low-can-binding/binding/configuration.cpp b/CAN-binder/low-can-binding/binding/configuration.cpp
index 05d3696..40d6c11 100644
--- a/CAN-binder/low-can-binding/binding/configuration.cpp
+++ b/CAN-binder/low-can-binding/binding/configuration.cpp
@@ -17,8 +17,8 @@
 
 #include "configuration.hpp"
 
-#include "utils/signals.hpp"
-#include "utils/openxc-utils.hpp"
+#include "../utils/signals.hpp"
+#include "../utils/openxc-utils.hpp"
 
 /// @brief Return singleton instance of configuration object.
 configuration_t& configuration_t::instance()
diff --git a/CAN-binder/low-can-binding/binding/configuration.hpp b/CAN-binder/low-can-binding/binding/configuration.hpp
index a3ab8ca..ab799e8 100644
--- a/CAN-binder/low-can-binding/binding/configuration.hpp
+++ b/CAN-binder/low-can-binding/binding/configuration.hpp
@@ -22,10 +22,10 @@
 #include <string>
 #include <fcntl.h>
 
-#include "can/can-bus.hpp"
-#include "can/can-signals.hpp"
-#include "can/can-message.hpp"
-#include "diagnostic/diagnostic-manager.hpp"
+#include "../can/can-bus.hpp"
+#include "../can/can-signals.hpp"
+#include "../can/can-message.hpp"
+#include "../diagnostic/diagnostic-manager.hpp"
 
 #include "low-can-binding.hpp"
 
diff --git a/CAN-binder/low-can-binding/binding/low-can-binding.cpp b/CAN-binder/low-can-binding/binding/low-can-binding.cpp
index 484bb5c..99d1471 100644
--- a/CAN-binder/low-can-binding/binding/low-can-binding.cpp
+++ b/CAN-binder/low-can-binding/binding/low-can-binding.cpp
@@ -29,13 +29,13 @@
 
 #include "openxc.pb.h"
 #include "configuration.hpp"
-#include "can/can-bus.hpp"
-#include "can/can-signals.hpp"
-#include "can/can-message.hpp"
-#include "utils/timer.hpp"
-#include "utils/signals.hpp"
-#include "diagnostic/diagnostic-message.hpp"
-#include "utils/openxc-utils.hpp"
+#include "../can/can-bus.hpp"
+#include "../can/can-signals.hpp"
+#include "../can/can-message.hpp"
+#include "../utils/timer.hpp"
+#include "../utils/signals.hpp"
+#include "../diagnostic/diagnostic-message.hpp"
+#include "../utils/openxc-utils.hpp"
 
 extern "C"
 {
-- 
cgit 1.2.3-korg