switched to absolute include dirs, formatting

2017-02-04 19:28:31 +01:00
parent cc21321ad8
commit bbc29bdb2f
48 changed files with 143 additions and 133 deletions
@@ -1,5 +1,5 @@
-AM_CXXFLAGS = -Wno-unused-parameter \
-	-isystem$(top_srcdir)/src/lib/ebus
+AM_CXXFLAGS = -I$(top_srcdir)/src \
+	-Wno-unused-parameter

 noinst_LIBRARIES = libebuscontrib.a

@@ -16,8 +16,8 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

-#include "contrib.h"
-#include "tem.h"
+#include "lib/ebus/contrib/contrib.h"
+#include "lib/ebus/contrib/tem.h"

 namespace ebusd {

@@ -20,14 +20,14 @@
 #  include <config.h>
 #endif

-#include "tem.h"
+#include "lib/ebus/contrib/tem.h"
 #include <math.h>
 #include <iostream>
 #include <sstream>
 #include <iomanip>
 #include <vector>
 #include <cstring>
-#include "datatype.h"
+#include "lib/ebus/datatype.h"

 namespace ebusd {

@@ -26,9 +26,9 @@
 #include <vector>
 #include <list>
 #include <map>
-#include "symbol.h"
-#include "result.h"
-#include "datatype.h"
+#include "lib/ebus/symbol.h"
+#include "lib/ebus/result.h"
+#include "lib/ebus/datatype.h"

 /** @file tem.h
 * Contributed data types for TEM devices not part of regular releases.
@@ -1,5 +1,5 @@
-AM_CXXFLAGS = -Wno-unused-parameter \
-	-isystem$(top_srcdir)/src/lib/ebus -isystem../
+AM_CXXFLAGS = -I$(top_srcdir)/src \
+	-Wno-unused-parameter

 noinst_PROGRAMS = test_contrib

@@ -20,8 +20,8 @@
 #include <iomanip>
 #include <string>
 #include <vector>
-#include "tem.h"
-#include "data.h"
+#include "lib/ebus/contrib/tem.h"
+#include "lib/ebus/data.h"

 using namespace ebusd;