cec: changed to use dlopen instead of static linkage. shuffled headers a bit. bumped...

[deb_libcec.git] / src / lib / Makefile.am

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 586e1b12f7019dba4369d5bb06f2a2209931d15e..19f944aa535245c3282a443b476760dde911e0ee 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,33 +1,35 @@
 lib_LTLIBRARIES = libcec.la
 library_includedir=$(includedir)/libcec
-library_include_HEADERS = ../../include/CECExports.h \
-                          ../../include/CECExportsCpp.h \
-                          ../../include/CECExportsC.h
+library_include_HEADERS = ../../include/libcec/CECExports.h \
+                          ../../include/libcec/CECExportsC.h \
+                          ../../include/libcec/CECTypes.h \
+                          ../../include/libcec/CECLoader.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libcec.pc
 
 
-libcec_la_SOURCES = CECParser.cpp \
-                    CECParser.h \
-                    CECParserC.cpp \
-                    CECDetect.cpp \
-                    CECDetect.h \
-                    Communication.cpp \
-                    Communication.h \
+libcec_la_SOURCES = AdapterCommunication.cpp \
+                    AdapterCommunication.h \
+                    AdapterDetection.cpp \
+                    AdapterDetection.h \
+                    CECProcessor.cpp \
+                    CECProcessor.h \
+                    LibCEC.cpp \
+                    LibCEC.h \
+                    LibCECC.cpp \
                     ../../include/CECExports.h \
                     ../../include/CECExportsCpp.h \
                     ../../include/CECExportsC.h \
-                    util/misc.h \
-                    util/misc.cpp \
                     util/StdString.h \
-                    util/threads.cpp \
-                    util/threads.h \
-                    util/timeutils.h \
-                    libPlatform/baudrate.h \
-                    libPlatform/os-dependent.h \
-                    libPlatform/linux/os_posix.h \
-                    libPlatform/linux/serialport.cpp \
-                    libPlatform/serialport.h
+                    platform/timeutils.h \
+                    platform/baudrate.h \
+                    platform/os-dependent.h \
+                    platform/linux/os_posix.h \
+                    platform/linux/serialport.cpp \
+                    platform/serialport.h \
+                    platform/threads.cpp \
+                    platform/threads.h
 
-libcec_la_LDFLAGS = -lrt -lpthread -ludev -version-info @VERSION@
+libcec_la_LDFLAGS = @LIBS@ -version-info @VERSION@
+libcec_la_CPPFLAGS = -I../../include