diff options
| author | Michael Dominic K <mdk@codethink.co.uk> | 2009-07-31 13:56:46 +0200 |
|---|---|---|
| committer | Michael Dominic K <mdk@codethink.co.uk> | 2009-07-31 13:56:46 +0200 |
| commit | 14eb39cc25737642a4a589c9ccabb265fe8659dd (patch) | |
| tree | 37489016ab38f9dec74a17c33efdac94aef436d8 | |
| parent | c7ae9f3d63264c19f647f52228e7430b74d2af56 (diff) | |
Common stuff moved to common.
| -rw-r--r-- | common/logging.cpp (renamed from contextd/src/logging.cpp) | 0 | ||||
| -rw-r--r-- | common/logging.h (renamed from contextd/src/logging.h) | 3 | ||||
| -rw-r--r-- | common/sconnect.h (renamed from contextd/src/sconnect.h) | 0 | ||||
| -rw-r--r-- | contextd/src/Makefile.am | 10 |
4 files changed, 5 insertions, 8 deletions
diff --git a/contextd/src/logging.cpp b/common/logging.cpp index 86f425ac..86f425ac 100644 --- a/contextd/src/logging.cpp +++ b/common/logging.cpp diff --git a/contextd/src/logging.h b/common/logging.h index 7b03ee0b..0d47722b 100644 --- a/contextd/src/logging.h +++ b/common/logging.h @@ -18,11 +18,10 @@ * 02110-1301 USA * */ - + #ifndef LOGGING_H #define LOGGING_H - #include <QIODevice> #include <QString> #include <QStringList> diff --git a/contextd/src/sconnect.h b/common/sconnect.h index 50c6d79e..50c6d79e 100644 --- a/contextd/src/sconnect.h +++ b/common/sconnect.h diff --git a/contextd/src/Makefile.am b/contextd/src/Makefile.am index e353c2a2..5c0a6756 100644 --- a/contextd/src/Makefile.am +++ b/contextd/src/Makefile.am @@ -1,8 +1,6 @@ bin_PROGRAMS = contextd contextd_SOURCES = contextd.cpp \ provider.h \ - logging.cpp \ - logging.h \ loggingfeatures.h \ halprovider.h \ halprovider.cpp \ @@ -10,7 +8,6 @@ contextd_SOURCES = contextd.cpp \ halmanagerinterface.cpp \ haldeviceinterface.cpp \ haldeviceinterface.h \ - sconnect.h \ lowmemprovider.cpp \ lowmemprovider.h \ boolsysfspooler.h \ @@ -20,8 +17,9 @@ AM_CXXFLAGS = $(QtCore_CFLAGS) $(QtDBus_CFLAGS) LIBS += $(QtCore_LIBS) # library dependency hack for seamless make in contextd -AM_CXXFLAGS += -I$(srcdir)/../../libcontextprovider/src \ - '-DCONTEXT_LOG_MODULE_NAME="contextd"' +AM_CXXFLAGS += -I$(srcdir)/../../common \ + -I$(srcdir)/../../libcontextprovider/src \ + '-DCONTEXT_LOG_MODULE_NAME="contextd"' contextd_LDADD = ../../libcontextprovider/src/libcontextprovider.la ../../libcontextprovider/src/libcontextprovider.la: @@ -30,5 +28,5 @@ contextd_LDADD = ../../libcontextprovider/src/libcontextprovider.la # moccing nodist_contextd_SOURCES = mocs.cpp -QT_TOMOC = $(filter %.h, $(contextd_SOURCES)) +QT_TOMOC = $(filter %.h, $(contextd_SOURCES)) ../../common/logging.cpp include $(top_srcdir)/am/qt.am |