| -rw-r--r-- | kaddressbook/kaddressbook.pro | 10 | ||||
| -rw-r--r-- | kdepim-desktop.pro | 6 | ||||
| -rw-r--r-- | korganizer/korganizer.pro | 9 | ||||
| -rw-r--r-- | libkdepim/kcmconfigs/kcmkdepimconfig.cpp | 2 | ||||
| -rw-r--r-- | variables.pri | 2 |
5 files changed, 26 insertions, 3 deletions
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro index e73de06..2534835 100644 --- a/kaddressbook/kaddressbook.pro +++ b/kaddressbook/kaddressbook.pro @@ -10,11 +10,21 @@ INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../mic DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION unix : { + +staticlib: { +LIBS += ../bin/libmicrokdepim.a +LIBS += ../bin/libmicrokcal.a +LIBS += ../bin/libmicrokabc.a +LIBS += ../bin/libmicrokde.a +LIBS += ../libical/lib/libical.a +LIBS += ../libical/lib/libicalss.a +} else { LIBS += ../bin/libmicrokdepim.so LIBS += ../bin/libmicrokde.so LIBS += ../bin/libmicrokabc.so LIBS += ../bin/libmicrokcal.so #LIBS += -lldap +} OBJECTS_DIR = obj/unix MOC_DIR = moc/unix } diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro index 20c91ef..7ade680 100644 --- a/kdepim-desktop.pro +++ b/kdepim-desktop.pro @@ -1,8 +1,10 @@ - +include( ./variables.pri ) TEMPLATE = subdirs SUBDIRS = libical libkcal kabc libkdepim microkde korganizer kaddressbook kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia gammu/emb/common gammu/emb/gammu -unix:{ +unix:{ +!staticlib: { SUBDIRS += libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager } +} diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index 546b6e5..59a1a84 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro @@ -15,6 +15,14 @@ DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER DEFINES += KORG_NOLVALTERNATION DEFINES += DESKTOP_VERSION unix : { +staticlib: { +LIBS += ../bin/libmicrokdepim.a +LIBS += ../bin/libmicrokcal.a +LIBS += ../bin/libmicrokabc.a +LIBS += ../bin/libmicrokde.a +LIBS += ../libical/lib/libical.a +LIBS += ../libical/lib/libicalss.a +} else { LIBS += ../bin/libmicrokdepim.so LIBS += ../bin/libmicrokcal.so LIBS += ../bin/libmicrokde.so @@ -23,6 +31,7 @@ LIBS += ../bin/libmicrokabc.so #LIBS += -lsdp #LIBS += -lldap +} OBJECTS_DIR = obj/unix MOC_DIR = moc/unix } diff --git a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp index e77c5ab..5094830 100644 --- a/libkdepim/kcmconfigs/kcmkdepimconfig.cpp +++ b/libkdepim/kcmconfigs/kcmkdepimconfig.cpp @@ -44,7 +44,7 @@ $Id$ #ifndef _WIN32_ extern "C" { - KCModule *create_kabconfig(QWidget *parent, const char * ) { + KCModule *create_kdepimconfig(QWidget *parent, const char * ) { return new KCMKdePimConfig(parent, "kcmkdepimconfig" ); } } diff --git a/variables.pri b/variables.pri index 08c2a45..244de4c 100644 --- a/variables.pri +++ b/variables.pri @@ -3,6 +3,8 @@ unix { CONFIG += release +#for statically linking +#CONFIG += staticlib } win32 { CONFIG += release |