summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-06-27 09:54:36 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-06-27 09:54:36 (GMT)
commit53262e9d6abb856bcc0a86e2adf3e6ea33afd627 (patch)
tree25b35bbc21d816c1fb11e1c238a27ec296a5ef74
parent279fa15e5c7d6ef3ce489699711869453c3fa435 (diff)
downloadlibcalendaring-dev/ticket/860.tar.gz
Bastardize the build process (#860)dev/ticket/860
-rw-r--r--CMakeLists.txt13
-rw-r--r--kcalcore/alarm.h2
-rw-r--r--kcalcore/icalformat.h2
-rw-r--r--kcalcore/icaltimezones.h2
-rw-r--r--kcalcore/incidencebase.h2
-rw-r--r--kcalcore/period.h2
-rw-r--r--kcalcore/recurrencerule.h2
-rw-r--r--kdecore/util/kexportplugin.h1
-rw-r--r--kdecore/util/kpluginloader.h1
-rw-r--r--kimap/acl.cpp2
-rw-r--r--kimap/acljobbase.cpp4
-rw-r--r--kimap/acljobbase_p.h2
-rw-r--r--kimap/appendjob.cpp2
-rw-r--r--kimap/capabilitiesjob.cpp2
-rw-r--r--kimap/closejob.cpp2
-rw-r--r--kimap/copyjob.cpp4
-rw-r--r--kimap/createjob.cpp4
-rw-r--r--kimap/deleteacljob.cpp4
-rw-r--r--kimap/deletejob.cpp4
-rw-r--r--kimap/expungejob.cpp4
-rw-r--r--kimap/fetchjob.cpp4
-rw-r--r--kimap/getacljob.cpp4
-rw-r--r--kimap/getmetadatajob.cpp4
-rw-r--r--kimap/getquotajob.cpp4
-rw-r--r--kimap/getquotarootjob.cpp4
-rw-r--r--kimap/idlejob.cpp2
-rw-r--r--kimap/job_p.h2
-rw-r--r--kimap/listjob.cpp2
-rw-r--r--kimap/listrightsjob.cpp4
-rw-r--r--kimap/loginjob.cpp4
-rw-r--r--kimap/logoutjob.cpp2
-rw-r--r--kimap/metadatajobbase.cpp4
-rw-r--r--kimap/myrightsjob.cpp4
-rw-r--r--kimap/namespacejob.cpp4
-rw-r--r--kimap/quotajobbase.cpp4
-rw-r--r--kimap/renamejob.cpp4
-rw-r--r--kimap/searchjob.cpp4
-rw-r--r--kimap/selectjob.cpp2
-rw-r--r--kimap/session.cpp2
-rw-r--r--kimap/sessionthread.cpp2
-rw-r--r--kimap/setacljob.cpp4
-rw-r--r--kimap/setmetadatajob.cpp4
-rw-r--r--kimap/setquotajob.cpp4
-rw-r--r--kimap/storejob.cpp4
-rw-r--r--kimap/subscribejob.cpp4
-rw-r--r--kimap/unsubscribejob.cpp4
-rw-r--r--kmime/kmime_util.cpp1
47 files changed, 80 insertions, 72 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7b81e09..661b74d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,6 +4,17 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
include_directories(./)
include_directories(kdecore/localization)
+include_directories(kdecore)
+include_directories(kdecore/config)
+include_directories(kdecore/date)
+include_directories(kdecore/io)
+include_directories(kdecore/jobs)
+include_directories(kdecore/kernel)
+include_directories(kdecore/network)
+include_directories(kdecore/services)
+include_directories(kdecore/sycoca)
+include_directories(kdecore/text)
+include_directories(kdecore/util)
set(LIBRARY_TYPE SHARED)
@@ -44,4 +55,4 @@ install( FILES kdemacros.h
# target_link_libraries(calendaring ${libs})
# message("${libs}")
# include(MergeStaticLibraries)
-# MERGE_STATIC_LIBS(calendaring ${libs}) \ No newline at end of file
+# MERGE_STATIC_LIBS(calendaring ${libs})
diff --git a/kcalcore/alarm.h b/kcalcore/alarm.h
index 6edf02d..f918353 100644
--- a/kcalcore/alarm.h
+++ b/kcalcore/alarm.h
@@ -36,7 +36,7 @@
#include "duration.h"
#include "person.h"
-#include <KDE/KDateTime>
+#include <kdatetime.h>
#include <QtCore/QString>
#include <QtCore/QStringList>
diff --git a/kcalcore/icalformat.h b/kcalcore/icalformat.h
index 28347dd..89e9f3f 100644
--- a/kcalcore/icalformat.h
+++ b/kcalcore/icalformat.h
@@ -34,7 +34,7 @@
#include "calformat.h"
#include "schedulemessage.h"
-#include <KDE/KDateTime>
+#include <kdatetime.h>
namespace KCalCore {
diff --git a/kcalcore/icaltimezones.h b/kcalcore/icaltimezones.h
index fc2ad11..59b6c10 100644
--- a/kcalcore/icaltimezones.h
+++ b/kcalcore/icaltimezones.h
@@ -23,7 +23,7 @@
#include "kcalcore_export.h"
-#include <KDE/KTimeZone>
+#include <ktimezone.h>
#include <QtCore/QMap>
diff --git a/kcalcore/incidencebase.h b/kcalcore/incidencebase.h
index 9bc3661..96ecdf5 100644
--- a/kcalcore/incidencebase.h
+++ b/kcalcore/incidencebase.h
@@ -61,7 +61,7 @@
#include "duration.h"
#include "sortablelist.h"
-#include <KDE/KDateTime>
+#include <kdatetime.h>
#include <QtCore/QSet>
diff --git a/kcalcore/period.h b/kcalcore/period.h
index e8d90b6..5fd069c 100644
--- a/kcalcore/period.h
+++ b/kcalcore/period.h
@@ -34,7 +34,7 @@
#include "kcalcore_export.h"
#include "duration.h"
-#include <KDE/KDateTime>
+#include <kdatetime.h>
#include <QtCore/QDataStream>
#include <QtCore/QMetaType>
diff --git a/kcalcore/recurrencerule.h b/kcalcore/recurrencerule.h
index bb61a71..a1d2f0a 100644
--- a/kcalcore/recurrencerule.h
+++ b/kcalcore/recurrencerule.h
@@ -27,7 +27,7 @@
#include "kcalcore_export.h"
#include "sortablelist.h"
-#include <KDE/KDateTime>
+#include <kdatetime.h>
namespace KCalCore {
diff --git a/kdecore/util/kexportplugin.h b/kdecore/util/kexportplugin.h
index 8e0faab..61d8b95 100644
--- a/kdecore/util/kexportplugin.h
+++ b/kdecore/util/kexportplugin.h
@@ -19,7 +19,6 @@
#define KDECORE_KEXPORTPLUGIN_H
#include <kglobal.h>
-#include <kdeversion.h>
#include <QtCore/QPluginLoader>
#include <QtCore/QtPlugin>
diff --git a/kdecore/util/kpluginloader.h b/kdecore/util/kpluginloader.h
index 2e12fec..ffe5377 100644
--- a/kdecore/util/kpluginloader.h
+++ b/kdecore/util/kpluginloader.h
@@ -19,7 +19,6 @@
#define KDECORE_KPLUGINLOADER_H
#include <kglobal.h>
-#include <kdeversion.h>
#include <kexportplugin.h>
#include <QtCore/QPluginLoader>
diff --git a/kimap/acl.cpp b/kimap/acl.cpp
index a0d9741..980538b 100644
--- a/kimap/acl.cpp
+++ b/kimap/acl.cpp
@@ -21,7 +21,7 @@
#include <QtCore/QByteArray>
#include <QtCore/QMap>
-#include <KDE/KGlobal>
+#include <kglobal.h>
namespace KIMAP {
namespace Acl {
diff --git a/kimap/acljobbase.cpp b/kimap/acljobbase.cpp
index db5d961..9bfe29a 100644
--- a/kimap/acljobbase.cpp
+++ b/kimap/acljobbase.cpp
@@ -22,8 +22,8 @@
#include "message_p.h"
#include "session_p.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
using namespace KIMAP;
diff --git a/kimap/acljobbase_p.h b/kimap/acljobbase_p.h
index 67692bb..7550489 100644
--- a/kimap/acljobbase_p.h
+++ b/kimap/acljobbase_p.h
@@ -23,7 +23,7 @@
#include "acljobbase.h"
#include "job_p.h"
#include "session.h"
-#include <KDE/KLocale>
+#include <klocale.h>
namespace KIMAP
{
diff --git a/kimap/appendjob.cpp b/kimap/appendjob.cpp
index 7d8104c..b0e5c83 100644
--- a/kimap/appendjob.cpp
+++ b/kimap/appendjob.cpp
@@ -19,7 +19,7 @@
#include "appendjob.h"
-#include <KDE/KLocale>
+#include <klocale.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kimap/capabilitiesjob.cpp b/kimap/capabilitiesjob.cpp
index c21938c..b07e1b9 100644
--- a/kimap/capabilitiesjob.cpp
+++ b/kimap/capabilitiesjob.cpp
@@ -19,7 +19,7 @@
#include "capabilitiesjob.h"
-#include <KDE/KLocale>
+#include <klocale.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kimap/closejob.cpp b/kimap/closejob.cpp
index 18abf79..ea6416f 100644
--- a/kimap/closejob.cpp
+++ b/kimap/closejob.cpp
@@ -19,7 +19,7 @@
#include "closejob.h"
-#include <KDE/KLocale>
+#include <klocale.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kimap/copyjob.cpp b/kimap/copyjob.cpp
index de41458..05f2efb 100644
--- a/kimap/copyjob.cpp
+++ b/kimap/copyjob.cpp
@@ -19,8 +19,8 @@
#include "copyjob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kimap/createjob.cpp b/kimap/createjob.cpp
index 43a06dd..6f25e0a 100644
--- a/kimap/createjob.cpp
+++ b/kimap/createjob.cpp
@@ -19,8 +19,8 @@
#include "createjob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kimap/deleteacljob.cpp b/kimap/deleteacljob.cpp
index d19d081..b5ea9a9 100644
--- a/kimap/deleteacljob.cpp
+++ b/kimap/deleteacljob.cpp
@@ -19,8 +19,8 @@
#include "deleteacljob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "acljobbase_p.h"
#include "message_p.h"
diff --git a/kimap/deletejob.cpp b/kimap/deletejob.cpp
index 28debaf..59201ff 100644
--- a/kimap/deletejob.cpp
+++ b/kimap/deletejob.cpp
@@ -19,8 +19,8 @@
#include "deletejob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kimap/expungejob.cpp b/kimap/expungejob.cpp
index 5966f21..8da8285 100644
--- a/kimap/expungejob.cpp
+++ b/kimap/expungejob.cpp
@@ -19,8 +19,8 @@
#include "expungejob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kimap/fetchjob.cpp b/kimap/fetchjob.cpp
index f820b70..32582b2 100644
--- a/kimap/fetchjob.cpp
+++ b/kimap/fetchjob.cpp
@@ -20,8 +20,8 @@
#include "fetchjob.h"
#include <QtCore/QTimer>
-#include <KDE/KDebug>
-#include <KDE/KLocale>
+#include <kdebug.h>
+#include <klocale.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kimap/getacljob.cpp b/kimap/getacljob.cpp
index b170c09..fbe8d80 100644
--- a/kimap/getacljob.cpp
+++ b/kimap/getacljob.cpp
@@ -19,8 +19,8 @@
#include "getacljob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "acljobbase_p.h"
#include "message_p.h"
diff --git a/kimap/getmetadatajob.cpp b/kimap/getmetadatajob.cpp
index e6a800e..69be41d 100644
--- a/kimap/getmetadatajob.cpp
+++ b/kimap/getmetadatajob.cpp
@@ -19,8 +19,8 @@
#include "getmetadatajob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "metadatajobbase_p.h"
#include "message_p.h"
diff --git a/kimap/getquotajob.cpp b/kimap/getquotajob.cpp
index 52a67bd..9d1efb0 100644
--- a/kimap/getquotajob.cpp
+++ b/kimap/getquotajob.cpp
@@ -19,8 +19,8 @@
#include "getquotajob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "quotajobbase_p.h"
#include "message_p.h"
diff --git a/kimap/getquotarootjob.cpp b/kimap/getquotarootjob.cpp
index 9f7bae7..ee438a3 100644
--- a/kimap/getquotarootjob.cpp
+++ b/kimap/getquotarootjob.cpp
@@ -19,8 +19,8 @@
#include "getquotarootjob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "quotajobbase_p.h"
#include "message_p.h"
diff --git a/kimap/idlejob.cpp b/kimap/idlejob.cpp
index 39489ee..0248697 100644
--- a/kimap/idlejob.cpp
+++ b/kimap/idlejob.cpp
@@ -20,7 +20,7 @@
#include "idlejob.h"
#include <QtCore/QTimer>
-#include <KDE/KLocale>
+#include <klocale.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kimap/job_p.h b/kimap/job_p.h
index 696dd4b..b04cf9c 100644
--- a/kimap/job_p.h
+++ b/kimap/job_p.h
@@ -21,7 +21,7 @@
#define KIMAP_JOB_P_H
#include "session.h"
-#include <KDE/KLocale>
+#include <klocale.h>
namespace KIMAP {
diff --git a/kimap/listjob.cpp b/kimap/listjob.cpp
index 01d9906..60f8071 100644
--- a/kimap/listjob.cpp
+++ b/kimap/listjob.cpp
@@ -21,7 +21,7 @@
#include <boost/bind.hpp>
#include <QtCore/QTimer>
-#include <KDE/KLocale>
+#include <klocale.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kimap/listrightsjob.cpp b/kimap/listrightsjob.cpp
index c72ff8d..4e79aec 100644
--- a/kimap/listrightsjob.cpp
+++ b/kimap/listrightsjob.cpp
@@ -19,8 +19,8 @@
#include "listrightsjob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "acljobbase_p.h"
#include "message_p.h"
diff --git a/kimap/loginjob.cpp b/kimap/loginjob.cpp
index 707d0ed..3b45f79 100644
--- a/kimap/loginjob.cpp
+++ b/kimap/loginjob.cpp
@@ -21,8 +21,8 @@
#include "loginjob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include <ktcpsocket.h>
#include "job_p.h"
diff --git a/kimap/logoutjob.cpp b/kimap/logoutjob.cpp
index b291f56..9f191dd 100644
--- a/kimap/logoutjob.cpp
+++ b/kimap/logoutjob.cpp
@@ -19,7 +19,7 @@
#include "logoutjob.h"
-#include <KDE/KLocale>
+#include <klocale.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kimap/metadatajobbase.cpp b/kimap/metadatajobbase.cpp
index df04a60..fa9dc53 100644
--- a/kimap/metadatajobbase.cpp
+++ b/kimap/metadatajobbase.cpp
@@ -22,8 +22,8 @@
#include "message_p.h"
#include "session_p.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
using namespace KIMAP;
diff --git a/kimap/myrightsjob.cpp b/kimap/myrightsjob.cpp
index 49a69e1..46354ae 100644
--- a/kimap/myrightsjob.cpp
+++ b/kimap/myrightsjob.cpp
@@ -19,8 +19,8 @@
#include "myrightsjob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "acljobbase_p.h"
#include "message_p.h"
diff --git a/kimap/namespacejob.cpp b/kimap/namespacejob.cpp
index dd0c1a0..639e55d 100644
--- a/kimap/namespacejob.cpp
+++ b/kimap/namespacejob.cpp
@@ -19,8 +19,8 @@
#include "namespacejob.h"
-#include <KDE/KDebug>
-#include <KDE/KLocale>
+#include <kdebug.h>
+#include <klocale.h>
#include "job_p.h"
#include "listjob.h"
diff --git a/kimap/quotajobbase.cpp b/kimap/quotajobbase.cpp
index e85d1c3..16737ce 100644
--- a/kimap/quotajobbase.cpp
+++ b/kimap/quotajobbase.cpp
@@ -22,8 +22,8 @@
#include "message_p.h"
#include "session_p.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
using namespace KIMAP;
diff --git a/kimap/renamejob.cpp b/kimap/renamejob.cpp
index 6797a91..1ec357d 100644
--- a/kimap/renamejob.cpp
+++ b/kimap/renamejob.cpp
@@ -19,8 +19,8 @@
#include "renamejob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kimap/searchjob.cpp b/kimap/searchjob.cpp
index 09cb876..ede53a3 100644
--- a/kimap/searchjob.cpp
+++ b/kimap/searchjob.cpp
@@ -19,8 +19,8 @@
#include "searchjob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include <QtCore/QDate>
diff --git a/kimap/selectjob.cpp b/kimap/selectjob.cpp
index 7478d2f..b18130d 100644
--- a/kimap/selectjob.cpp
+++ b/kimap/selectjob.cpp
@@ -19,7 +19,7 @@
#include "selectjob.h"
-#include <KDE/KLocale>
+#include <klocale.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kimap/session.cpp b/kimap/session.cpp
index ccdba0a..031508b 100644
--- a/kimap/session.cpp
+++ b/kimap/session.cpp
@@ -27,7 +27,7 @@
#include <QtCore/QDebug>
#include <QtCore/QTimer>
-#include <KDE/KLocale>
+#include <klocale.h>
#include "job.h"
#include "loginjob.h"
diff --git a/kimap/sessionthread.cpp b/kimap/sessionthread.cpp
index cf53327..b7a1cb9 100644
--- a/kimap/sessionthread.cpp
+++ b/kimap/sessionthread.cpp
@@ -22,7 +22,7 @@
#include <QtCore/QDebug>
#include <QtCore/QTimer>
-#include <KDE/KDebug>
+#include <kdebug.h>
#include "imapstreamparser.h"
#include "message_p.h"
diff --git a/kimap/setacljob.cpp b/kimap/setacljob.cpp
index 409549d..dea3d81 100644
--- a/kimap/setacljob.cpp
+++ b/kimap/setacljob.cpp
@@ -19,8 +19,8 @@
#include "setacljob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "acljobbase_p.h"
#include "message_p.h"
diff --git a/kimap/setmetadatajob.cpp b/kimap/setmetadatajob.cpp
index 33b973e..c279812 100644
--- a/kimap/setmetadatajob.cpp
+++ b/kimap/setmetadatajob.cpp
@@ -19,8 +19,8 @@
#include "setmetadatajob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "metadatajobbase_p.h"
#include "message_p.h"
diff --git a/kimap/setquotajob.cpp b/kimap/setquotajob.cpp
index 8b84adc..9dedddd 100644
--- a/kimap/setquotajob.cpp
+++ b/kimap/setquotajob.cpp
@@ -19,8 +19,8 @@
#include "setquotajob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "quotajobbase_p.h"
#include "message_p.h"
diff --git a/kimap/storejob.cpp b/kimap/storejob.cpp
index ff7db49..cf70503 100644
--- a/kimap/storejob.cpp
+++ b/kimap/storejob.cpp
@@ -19,8 +19,8 @@
#include "storejob.h"
-#include <KDE/KDebug>
-#include <KDE/KLocale>
+#include <kdebug.h>
+#include <klocale.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kimap/subscribejob.cpp b/kimap/subscribejob.cpp
index 60371fa..880f977 100644
--- a/kimap/subscribejob.cpp
+++ b/kimap/subscribejob.cpp
@@ -19,8 +19,8 @@
#include "subscribejob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kimap/unsubscribejob.cpp b/kimap/unsubscribejob.cpp
index e0fe1f5..f570987 100644
--- a/kimap/unsubscribejob.cpp
+++ b/kimap/unsubscribejob.cpp
@@ -19,8 +19,8 @@
#include "unsubscribejob.h"
-#include <KDE/KLocale>
-#include <KDE/KDebug>
+#include <klocale.h>
+#include <kdebug.h>
#include "job_p.h"
#include "message_p.h"
diff --git a/kmime/kmime_util.cpp b/kmime/kmime_util.cpp
index 64ae748..8db99cc 100644
--- a/kmime/kmime_util.cpp
+++ b/kmime/kmime_util.cpp
@@ -31,7 +31,6 @@
#include "kmime_warning.h"
#include <config-kmime.h>
-#include <kdefakes.h> // for strcasestr
#include <kglobal.h>
#include <klocale.h>
#include <kcharsets.h>