cec: use the local cec.h/cectypes.h instead of system wide when compiling libCEC...

diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h
index c21110d29568080039a5942c14c18147d973ccdb..f0dbda41cb1f57df0c75604cf7f5a16330d500cc 100644 (file)
--- a/src/lib/CECProcessor.h
+++ b/src/lib/CECProcessor.h
@@ -32,7 +32,7 @@
  */
 
 #include <string>
-#include <cectypes.h>
+#include "../../include/cectypes.h"
 #include "platform/threads/threads.h"
 #include "platform/util/buffer.h"
 #include "adapter/AdapterCommunication.h"

diff --git a/src/lib/LibCEC.h b/src/lib/LibCEC.h
index b5cf2bfd46fa0bc22e6cd5f25c1113c66c974f34..ad2eca97571deafe022bbd564f02ca2c242324ce 100644 (file)
--- a/src/lib/LibCEC.h
+++ b/src/lib/LibCEC.h
@@ -32,7 +32,7 @@
  */
 
 #include <string>
-#include <cec.h>
+#include "../../include/cec.h"
 #include "platform/util/buffer.h"
 
 namespace CEC

diff --git a/src/lib/LibCECC.cpp b/src/lib/LibCECC.cpp
index e2ae7f5d21b4fc4e544bc9ffd4059fd528249ba8..1a7b0454bc21ca22693d59ccdc60052df63853c4 100644 (file)
--- a/src/lib/LibCECC.cpp
+++ b/src/lib/LibCECC.cpp
@@ -30,8 +30,8 @@
  *     http://www.pulse-eight.net/
  */
 
-#include <cec.h>
-#include <cecc.h>
+#include "../../include/cec.h"
+#include "../../include/cecc.h"
 
 using namespace CEC;
 using namespace std;

diff --git a/src/lib/adapter/USBCECAdapterCommunication.h b/src/lib/adapter/USBCECAdapterCommunication.h
index f4fab4b4771dd6c16469727288c7c5c0543a03df..081568206f175946872809029f6f09ca0b64d44e 100644 (file)
--- a/src/lib/adapter/USBCECAdapterCommunication.h
+++ b/src/lib/adapter/USBCECAdapterCommunication.h
@@ -31,7 +31,7 @@
  *     http://www.pulse-eight.net/
  */
 
-#include <cectypes.h>
+#include "../../../include/cectypes.h"
 #include "../platform/threads/threads.h"
 #include "../platform/util/buffer.h"
 #include "AdapterCommunication.h"

diff --git a/src/lib/adapter/USBCECAdapterDetection.h b/src/lib/adapter/USBCECAdapterDetection.h
index 45b641b476a47593938bec590e0097243bd7ff63..9be3a579346dda4ef177203070591358c9352a9f 100644 (file)
--- a/src/lib/adapter/USBCECAdapterDetection.h
+++ b/src/lib/adapter/USBCECAdapterDetection.h
@@ -31,7 +31,7 @@
  *     http://www.pulse-eight.net/
  */
 
-#include <cectypes.h>
+#include "../../../include/cectypes.h"
 
 namespace CEC
 {

diff --git a/src/lib/devices/CECBusDevice.h b/src/lib/devices/CECBusDevice.h
index 79ae987b654b1a72399cd0a2dd08b521bea8b3ce..94810fbc8e5b8af874ce7cca898fd23798eecc9c 100644 (file)
--- a/src/lib/devices/CECBusDevice.h
+++ b/src/lib/devices/CECBusDevice.h
@@ -31,7 +31,7 @@
  *     http://www.pulse-eight.net/
  */
 
-#include <cectypes.h>
+#include "../../../include/cectypes.h"
 #include <set>
 #include "../platform/threads/mutex.h"
 #include "../platform/util/StdString.h"

diff --git a/src/lib/implementations/CECCommandHandler.h b/src/lib/implementations/CECCommandHandler.h
index e26530214617e4d90165fe86202ac1d20de72edc..be553a9cc61136bb0a72f147e758f860164ec992 100644 (file)
--- a/src/lib/implementations/CECCommandHandler.h
+++ b/src/lib/implementations/CECCommandHandler.h
@@ -31,7 +31,7 @@
  *     http://www.pulse-eight.net/
  */
 
-#include <cectypes.h>
+#include "../../../include/cectypes.h"
 #include <vector>
 #include "../platform/threads/mutex.h"
 #include "../platform/util/StdString.h"

diff --git a/src/lib/libcec.pc.in b/src/lib/libcec.pc.in
index 381477007901d6cf8c44a72dc68d1815af8631fb..9dd31cbe8933064f67ca37945df0070210a71567 100644 (file)
--- a/src/lib/libcec.pc.in
+++ b/src/lib/libcec.pc.in
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-includedir=@includedir@/libcec
+includedir=@includedir@
 
 Name: libcec
 Description: Pulse-Eight CEC adapter library
@@ -9,4 +9,4 @@ URL: http://www.pulse-eight.com/
 Version: @VERSION@
 Requires: @REQUIRES@
 Libs: -L${libdir} -lcec
-Cflags: -I${includedir}
+Cflags: -I${includedir} -I${includedir}/libcec

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index b987ff9ac37d7e3b8994d5107dac0087b6ba2bd0..b0492866449751f28d4a456a0c49fd344c74c67f 100644 (file)
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -30,7 +30,7 @@
  *     http://www.pulse-eight.net/
  */
 
-#include <cec.h>
+#include "../../include/cec.h"
 
 #include <cstdio>
 #include <fcntl.h>