renamed: CECExports.h => cec.h, CECExportsC.h => cecc.h, CECLoader.h => cecloader...

diff --git a/include/libcec/CECExports.h b/include/cec.h
similarity index 99%
rename from include/libcec/CECExports.h
rename to include/cec.h
index 0da18cffb5a594d09d1bcaac830731a043703c2e..7afb0651dbb247e0eb6eeb774c80f5d2be7eb5f5 100644 (file)
--- a/include/libcec/CECExports.h
+++ b/include/cec.h
@@ -34,7 +34,7 @@
 #ifndef CECEXPORTS_H_
 #define CECEXPORTS_H_
 
-#include <libcec/CECTypes.h>
+#include <cectypes.h>
 
 namespace CEC
 {

diff --git a/include/libcec/CECExportsC.h b/include/cecc.h
similarity index 99%
rename from include/libcec/CECExportsC.h
rename to include/cecc.h
index e14f814e297e40faae7473571b80099d92bb27e0..1d4c26c0c2b408110445bfcd39d8cc4497c9e199 100644 (file)
--- a/include/libcec/CECExportsC.h
+++ b/include/cecc.h
@@ -34,7 +34,7 @@
 #ifndef CECEXPORTS_C_H_
 #define CECEXPORTS_C_H_
 
-#include <libcec/CECTypes.h>
+#include <cectypes.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/include/libcec/CECLoader.h b/include/cecloader.h
similarity index 100%
rename from include/libcec/CECLoader.h
rename to include/cecloader.h

diff --git a/include/libcec/CECTypes.h b/include/cectypes.h
similarity index 100%
rename from include/libcec/CECTypes.h
rename to include/cectypes.h

diff --git a/src/lib/AdapterCommunication.h b/src/lib/AdapterCommunication.h
index 4693d97d30bbff1903e02d229f3bd746e2d09a2b..fcb2817a67b3b4d7dc431bdbdbfd4010827bad3a 100644 (file)
--- a/src/lib/AdapterCommunication.h
+++ b/src/lib/AdapterCommunication.h
@@ -31,7 +31,7 @@
  *     http://www.pulse-eight.net/
  */
 
-#include <libcec/CECExports.h>
+#include <cectypes.h>
 #include "platform/threads.h"
 #include <string>
 

diff --git a/src/lib/AdapterDetection.h b/src/lib/AdapterDetection.h
index 51154973bab253a049b1fe5c2f6c9a4a832b2895..359a515e9fcfd69024995ac7730e209ad53d925c 100644 (file)
--- a/src/lib/AdapterDetection.h
+++ b/src/lib/AdapterDetection.h
@@ -31,7 +31,7 @@
  *     http://www.pulse-eight.net/
  */
 
-#include <libcec/CECExports.h>
+#include <cectypes.h>
 
 namespace CEC
 {

diff --git a/src/lib/CECProcessor.h b/src/lib/CECProcessor.h
index c1dbfad7382dcdb8c4c749d4af5e643d6692c78b..39f1a2efc362b753db1aeb0f26902e300ec56f0c 100644 (file)
--- a/src/lib/CECProcessor.h
+++ b/src/lib/CECProcessor.h
@@ -32,7 +32,7 @@
  */
 
 #include <string>
-#include <libcec/CECExports.h>
+#include <cectypes.h>
 #include "platform/threads.h"
 #include "util/buffer.h"
 

diff --git a/src/lib/LibCEC.h b/src/lib/LibCEC.h
index a700034ff47331768c28af61008f1d3a12c119c2..2ad32dafb64eb76dafb23bbbcea30a8d7f773c7a 100644 (file)
--- a/src/lib/LibCEC.h
+++ b/src/lib/LibCEC.h
@@ -32,8 +32,7 @@
  */
 
 #include <string>
-#include <libcec/CECExports.h>
-#include <libcec/CECTypes.h>
+#include <cec.h>
 #include "util/buffer.h"
 
 namespace CEC

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

diff --git a/src/lib/LibCECDll.cpp b/src/lib/LibCECDll.cpp
index fb25d0e2c1e0807f6941c82ce243fa6db0dae645..fb0ed9ad7362c0ef585c440d018f7289ffff9086 100644 (file)
--- a/src/lib/LibCECDll.cpp
+++ b/src/lib/LibCECDll.cpp
@@ -30,10 +30,6 @@
  *     http://www.pulse-eight.net/
  */
 
-#include "CECExports.h"
-
-using namespace CEC;
-
 int WINAPI DllEntryPoint(HINSTANCE hinst, unsigned long reason, void*)
 {
   return 1;

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 5d93660b37ac56ed98d96ca6d8e30e4c5276ac11..e3354e17115f71d68559c6b72eb42a1f599762b7 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,9 +1,9 @@
 lib_LTLIBRARIES = libcec.la
 library_includedir=$(includedir)/libcec
-library_include_HEADERS = ../../include/libcec/CECExports.h \
-                          ../../include/libcec/CECExportsC.h \
-                          ../../include/libcec/CECTypes.h \
-                          ../../include/libcec/CECLoader.h
+library_include_HEADERS = ../../include/cec.h \
+                          ../../include/cecc.h \
+                          ../../include/cectypes.h \
+                          ../../include/cecloader.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libcec.pc
@@ -17,9 +17,6 @@ libcec_la_SOURCES = AdapterCommunication.cpp \
                     LibCEC.cpp \
                     LibCEC.h \
                     LibCECC.cpp \
-                    ../../include/CECExports.h \
-                    ../../include/CECExportsCpp.h \
-                    ../../include/CECExportsC.h \
                     util/StdString.h \
                     platform/timeutils.h \
                     platform/baudrate.h \

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

diff --git a/src/lib/platform/serialport.h b/src/lib/platform/serialport.h
index f912abb69b8e8c1dac439a845ec0929f460e300f..4d1be825c77d373a5eaacc2092c9f39b13b11dc9 100644 (file)
--- a/src/lib/platform/serialport.h
+++ b/src/lib/platform/serialport.h
@@ -19,7 +19,7 @@
  */
 
 #include "os-dependent.h"
-#include <libcec/CECExports.h>
+#include <cectypes.h>
 #include <string>
 #include <stdint.h>
 #include "../platform/threads.h"

diff --git a/src/testclient/main.cpp b/src/testclient/main.cpp
index dc20968dd60952bc7f3e42366a58cb770c95669f..817d26797cf7c139cf2977d611083574fadb3b7a 100644 (file)
--- a/src/testclient/main.cpp
+++ b/src/testclient/main.cpp
@@ -30,7 +30,7 @@
  *     http://www.pulse-eight.net/
  */
 
-#include <libcec/CECExports.h>
+#include <cec.h>
 
 #include <cstdio>
 #include <fcntl.h>
@@ -45,7 +45,7 @@ using namespace std;
 
 #define CEC_TEST_CLIENT_VERSION 7
 
-#include <libcec/CECLoader.h>
+#include <cecloader.h>
 
 inline bool HexStrToInt(const std::string& data, uint8_t& value)
 {