switched to absolute include dirs, formatting

src/lib/ebus/Makefile.am

@@ -1,4 +1,5 @@
-AM_CXXFLAGS = -Wconversion -Wno-unused-parameter
+AM_CXXFLAGS = -I$(top_srcdir)/src \
+	      -Wconversion -Wno-unused-parameter
 
 noinst_LIBRARIES = libebus.a
 

src/lib/ebus/contrib/Makefile.am

@@ -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
 

src/lib/ebus/contrib/contrib.cpp

@@ -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 {
 

src/lib/ebus/contrib/tem.cpp

@@ -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 {
 

src/lib/ebus/contrib/tem.h

@@ -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.

src/lib/ebus/contrib/test/Makefile.am

@@ -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
 

src/lib/ebus/contrib/test/test_tem.cpp

@@ -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;
 

src/lib/ebus/data.cpp

@@ -20,7 +20,7 @@
 #  include <config.h>
 #endif
 
-#include "data.h"
+#include "lib/ebus/data.h"
 #include <math.h>
 #include <iostream>
 #include <sstream>

src/lib/ebus/data.h

@@ -25,10 +25,10 @@
 #include <fstream>
 #include <vector>
 #include <map>
-#include "symbol.h"
-#include "result.h"
-#include "filereader.h"
-#include "datatype.h"
+#include "lib/ebus/symbol.h"
+#include "lib/ebus/result.h"
+#include "lib/ebus/filereader.h"
+#include "lib/ebus/datatype.h"
 
 /** @file data.h
  * Classes related to defining fields based on data types in symbols on the

src/lib/ebus/datatype.cpp

@@ -20,7 +20,7 @@
 #  include <config.h>
 #endif
 
-#include "datatype.h"
+#include "lib/ebus/datatype.h"
 #include <math.h>
 #include <iostream>
 #include <sstream>
@@ -28,7 +28,7 @@
 #include <vector>
 #include <cstring>
 #ifdef HAVE_CONTRIB
-#  include "contrib/contrib.h"
+#  include "lib/ebus/contrib/contrib.h"
 #endif
 
 namespace ebusd {

src/lib/ebus/datatype.h

@@ -27,9 +27,9 @@
 #include <vector>
 #include <list>
 #include <map>
-#include "symbol.h"
-#include "result.h"
-#include "filereader.h"
+#include "lib/ebus/symbol.h"
+#include "lib/ebus/result.h"
+#include "lib/ebus/filereader.h"
 
 /** @file datatype.h
  * Classes, functions, and constants related to decoding/encoding of symbols
@@ -271,7 +271,7 @@ class DataType {
   const uint16_t m_flags;
 
   /** the replacement value (fill-up value for @a StringDataType, no replacement if equal to
-   * @a NumberDataType#minValue). */
+   * @a NumberDataType#m_minValue). */
   const unsigned int m_replacement;
 };
 

src/lib/ebus/device.cpp

@@ -20,7 +20,7 @@
 #  include <config.h>
 #endif
 
-#include "device.h"
+#include "lib/ebus/device.h"
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
@@ -34,7 +34,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
-#include "data.h"
+#include "lib/ebus/data.h"
 
 namespace ebusd {
 

src/lib/ebus/device.h

@@ -25,7 +25,7 @@
 #include <netdb.h>
 #include <iostream>
 #include <fstream>
-#include "result.h"
+#include "lib/ebus/result.h"
 
 /** @file device.h
  * Classes providing access to the eBUS.

src/lib/ebus/filereader.h

@@ -26,8 +26,8 @@
 #include <fstream>
 #include <algorithm>
 #include <vector>
-#include "symbol.h"
-#include "result.h"
+#include "lib/ebus/symbol.h"
+#include "lib/ebus/result.h"
 
 /** @file filereader.h
  * Helper class and constants for reading configuration files.

src/lib/ebus/message.cpp

@@ -16,16 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "message.h"
+#include "lib/ebus/message.h"
 #include <string>
 #include <vector>
 #include <cstring>
 #include <locale>
 #include <iomanip>
 #include <climits>
-#include "data.h"
-#include "result.h"
-#include "symbol.h"
+#include "lib/ebus/data.h"
+#include "lib/ebus/result.h"
+#include "lib/ebus/symbol.h"
 
 namespace ebusd {
 
@@ -659,7 +659,8 @@ result_t Message::storeLastData(SymbolString& master, SymbolString& slave) {
 
 result_t Message::storeLastData(const PartType partType, SymbolString& data, unsigned char index) {
   if (data.size() > 0
-  && (m_isWrite || this->m_dstAddress == BROADCAST || partType == pt_slaveData || (partType == pt_masterData && isMaster(this->m_dstAddress)))) {
+      && (m_isWrite || this->m_dstAddress == BROADCAST || partType == pt_slaveData
+      || (partType == pt_masterData && isMaster(this->m_dstAddress)))) {
     time(&m_lastUpdateTime);
   }
   if (partType == pt_masterData) {

src/lib/ebus/message.h

@@ -26,9 +26,9 @@
 #include <map>
 #include <queue>
 #include <functional>
-#include "data.h"
-#include "result.h"
-#include "symbol.h"
+#include "lib/ebus/data.h"
+#include "lib/ebus/result.h"
+#include "lib/ebus/symbol.h"
 
 /** @file message.h
  * Classes and functions for decoding and encoding of complete messages on the

src/lib/ebus/result.cpp

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "result.h"
+#include "lib/ebus/result.h"
 #include <iostream>
 
 namespace ebusd {

src/lib/ebus/symbol.cpp

@@ -16,12 +16,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "symbol.h"
+#include "lib/ebus/symbol.h"
 #include <iostream>
 #include <iomanip>
 #include <string>
 #include <vector>
-#include "result.h"
+#include "lib/ebus/result.h"
 
 namespace ebusd {
 

src/lib/ebus/symbol.h

@@ -25,7 +25,7 @@
 #include <queue>
 #include <string>
 #include <vector>
-#include "result.h"
+#include "lib/ebus/result.h"
 
 /** @file symbol.h
  * Classes, functions, and constants related to symbols on the eBUS.

src/lib/ebus/test/Makefile.am

@@ -1,4 +1,4 @@
-AM_CXXFLAGS = -isystem$(top_srcdir)/src/lib/ebus
+AM_CXXFLAGS = -I$(top_srcdir)/src
 
 noinst_PROGRAMS = test_filereader \
 		  test_device \

src/lib/ebus/test/test_data.cpp

@@ -20,7 +20,7 @@
 #include <iomanip>
 #include <string>
 #include <vector>
-#include "data.h"
+#include "lib/ebus/data.h"
 
 using namespace ebusd;
 

src/lib/ebus/test/test_device.cpp

@@ -18,7 +18,7 @@
 
 #include <iostream>
 #include <iomanip>
-#include "device.h"
+#include "lib/ebus/device.h"
 
 using namespace std;
 using namespace ebusd;

src/lib/ebus/test/test_filereader.cpp

@@ -20,7 +20,7 @@
 #include <iomanip>
 #include <string>
 #include <vector>
-#include "filereader.h"
+#include "lib/ebus/filereader.h"
 
 using namespace std;
 using namespace ebusd;

src/lib/ebus/test/test_message.cpp

@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 #include <map>
-#include "message.h"
+#include "lib/ebus/message.h"
 
 using namespace ebusd;
 

src/lib/ebus/test/test_symbol.cpp

@@ -19,7 +19,7 @@
 #include <iostream>
 #include <iomanip>
 #include <string>
-#include "symbol.h"
+#include "lib/ebus/symbol.h"
 
 using namespace std;
 using namespace ebusd;