summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-03 19:05:24 (UTC)
committer zautrix <zautrix>2005-04-03 19:05:24 (UTC)
commit2d83daf3568bb829db2530baa917db5a4cbf0768 (patch) (side-by-side diff)
tree29e6a92865f7ebf007eb9de1453710a905afaefa
parent2ab1c2cb6c58e719c47390b2f919262b2557f2be (diff)
downloadkdepimpi-2d83daf3568bb829db2530baa917db5a4cbf0768.zip
kdepimpi-2d83daf3568bb829db2530baa917db5a4cbf0768.tar.gz
kdepimpi-2d83daf3568bb829db2530baa917db5a4cbf0768.tar.bz2
static compile fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kaddressbook/kaddressbook.pro10
-rw-r--r--kdepim-desktop.pro4
-rw-r--r--korganizer/korganizer.pro9
-rw-r--r--libkdepim/kcmconfigs/kcmkdepimconfig.cpp2
-rw-r--r--variables.pri2
5 files changed, 25 insertions, 2 deletions
diff --git a/kaddressbook/kaddressbook.pro b/kaddressbook/kaddressbook.pro
index e73de06..2534835 100644
--- a/kaddressbook/kaddressbook.pro
+++ b/kaddressbook/kaddressbook.pro
@@ -12,2 +12,11 @@ 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
@@ -17,2 +26,3 @@ LIBS += ../bin/libmicrokcal.so
#LIBS += -lldap
+}
OBJECTS_DIR = obj/unix
diff --git a/kdepim-desktop.pro b/kdepim-desktop.pro
index 20c91ef..7ade680 100644
--- a/kdepim-desktop.pro
+++ b/kdepim-desktop.pro
@@ -1,3 +1,3 @@
-
+include( ./variables.pri )
TEMPLATE = subdirs
@@ -5,4 +5,6 @@ SUBDIRS = libical libkcal kabc libkdepim microkde korganizer kaddressbook kabc/
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
@@ -17,2 +17,10 @@ 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
@@ -25,2 +33,3 @@ LIBS += ../bin/libmicrokabc.so
#LIBS += -lldap
+}
OBJECTS_DIR = obj/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
@@ -46,3 +46,3 @@ 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
@@ -5,2 +5,4 @@ unix {
CONFIG += release
+#for statically linking
+#CONFIG += staticlib
}