-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 | |||
@@ -7,17 +7,27 @@ include( ../variables.pri ) | |||
7 | 7 | ||
8 | 8 | ||
9 | INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces | 9 | INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../ interfaces |
10 | DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION | 10 | DEFINES += KAB_EMBEDDED KAB_NOSPLITTER DESKTOP_VERSION |
11 | 11 | ||
12 | unix : { | 12 | unix : { |
13 | |||
14 | staticlib: { | ||
15 | LIBS += ../bin/libmicrokdepim.a | ||
16 | LIBS += ../bin/libmicrokcal.a | ||
17 | LIBS += ../bin/libmicrokabc.a | ||
18 | LIBS += ../bin/libmicrokde.a | ||
19 | LIBS += ../libical/lib/libical.a | ||
20 | LIBS += ../libical/lib/libicalss.a | ||
21 | } else { | ||
13 | LIBS += ../bin/libmicrokdepim.so | 22 | LIBS += ../bin/libmicrokdepim.so |
14 | LIBS += ../bin/libmicrokde.so | 23 | LIBS += ../bin/libmicrokde.so |
15 | LIBS += ../bin/libmicrokabc.so | 24 | LIBS += ../bin/libmicrokabc.so |
16 | LIBS += ../bin/libmicrokcal.so | 25 | LIBS += ../bin/libmicrokcal.so |
17 | #LIBS += -lldap | 26 | #LIBS += -lldap |
27 | } | ||
18 | OBJECTS_DIR = obj/unix | 28 | OBJECTS_DIR = obj/unix |
19 | MOC_DIR = moc/unix | 29 | MOC_DIR = moc/unix |
20 | } | 30 | } |
21 | win32: { | 31 | win32: { |
22 | RC_FILE = winicons.rc | 32 | RC_FILE = winicons.rc |
23 | DEFINES += _WIN32_ | 33 | DEFINES += _WIN32_ |
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 @@ | |||
1 | 1 | ||
2 | 2 | include( ./variables.pri ) | |
3 | TEMPLATE = subdirs | 3 | TEMPLATE = subdirs |
4 | SUBDIRS = libical libkcal kabc libkdepim microkde korganizer kaddressbook kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia gammu/emb/common gammu/emb/gammu | 4 | SUBDIRS = libical libkcal kabc libkdepim microkde korganizer kaddressbook kabc/plugins/file kabc/plugins/dir kabc/plugins/qtopia gammu/emb/common gammu/emb/gammu |
5 | unix:{ | 5 | unix:{ |
6 | !staticlib: { | ||
6 | SUBDIRS += libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager | 7 | SUBDIRS += libetpan kmicromail/libmailwrapper kmicromail pwmanager/libcrypt/cipher pwmanager/libcrypt/error pwmanager/libcrypt/mpi pwmanager/libcrypt/zlib pwmanager/pwmanager |
7 | } | 8 | } |
9 | } | ||
8 | 10 | ||
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro index 546b6e5..59a1a84 100644 --- a/korganizer/korganizer.pro +++ b/korganizer/korganizer.pro | |||
@@ -12,20 +12,29 @@ INCLUDEPATH += ../microkde ../ interfaces ../microkde/kdecore ../microkde/kdeui | |||
12 | DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL | 12 | DEFINES += KORG_NOPLUGINS KORG_NOARCHIVE KORG_NOMAIL |
13 | DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER | 13 | DEFINES += KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER |
14 | #KORG_NOPRINTER KORG_NOKABC KORG_NODND | 14 | #KORG_NOPRINTER KORG_NOKABC KORG_NODND |
15 | DEFINES += KORG_NOLVALTERNATION | 15 | DEFINES += KORG_NOLVALTERNATION |
16 | DEFINES += DESKTOP_VERSION | 16 | DEFINES += DESKTOP_VERSION |
17 | unix : { | 17 | unix : { |
18 | staticlib: { | ||
19 | LIBS += ../bin/libmicrokdepim.a | ||
20 | LIBS += ../bin/libmicrokcal.a | ||
21 | LIBS += ../bin/libmicrokabc.a | ||
22 | LIBS += ../bin/libmicrokde.a | ||
23 | LIBS += ../libical/lib/libical.a | ||
24 | LIBS += ../libical/lib/libicalss.a | ||
25 | } else { | ||
18 | LIBS += ../bin/libmicrokdepim.so | 26 | LIBS += ../bin/libmicrokdepim.so |
19 | LIBS += ../bin/libmicrokcal.so | 27 | LIBS += ../bin/libmicrokcal.so |
20 | LIBS += ../bin/libmicrokde.so | 28 | LIBS += ../bin/libmicrokde.so |
21 | LIBS += ../bin/libmicrokabc.so | 29 | LIBS += ../bin/libmicrokabc.so |
22 | #LIBS += -lbluetooth | 30 | #LIBS += -lbluetooth |
23 | #LIBS += -lsdp | 31 | #LIBS += -lsdp |
24 | 32 | ||
25 | #LIBS += -lldap | 33 | #LIBS += -lldap |
34 | } | ||
26 | OBJECTS_DIR = obj/unix | 35 | OBJECTS_DIR = obj/unix |
27 | MOC_DIR = moc/unix | 36 | MOC_DIR = moc/unix |
28 | } | 37 | } |
29 | win32: { | 38 | win32: { |
30 | RC_FILE = winicons.rc | 39 | RC_FILE = winicons.rc |
31 | DEFINES += _WIN32_ | 40 | DEFINES += _WIN32_ |
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 | |||
@@ -41,13 +41,13 @@ $Id$ | |||
41 | #include "kprefs.h" | 41 | #include "kprefs.h" |
42 | #include "kpimglobalprefs.h" | 42 | #include "kpimglobalprefs.h" |
43 | 43 | ||
44 | #ifndef _WIN32_ | 44 | #ifndef _WIN32_ |
45 | extern "C" | 45 | extern "C" |
46 | { | 46 | { |
47 | KCModule *create_kabconfig(QWidget *parent, const char * ) { | 47 | KCModule *create_kdepimconfig(QWidget *parent, const char * ) { |
48 | return new KCMKdePimConfig(parent, "kcmkdepimconfig" ); | 48 | return new KCMKdePimConfig(parent, "kcmkdepimconfig" ); |
49 | } | 49 | } |
50 | } | 50 | } |
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | KCMKdePimConfig::KCMKdePimConfig(QWidget *parent, const char *name ) | 53 | KCMKdePimConfig::KCMKdePimConfig(QWidget *parent, const char *name ) |
diff --git a/variables.pri b/variables.pri index 08c2a45..244de4c 100644 --- a/variables.pri +++ b/variables.pri | |||
@@ -1,10 +1,12 @@ | |||
1 | 1 | ||
2 | # variables settings for compilation for Linux desktop and Qt 3.x.x | 2 | # variables settings for compilation for Linux desktop and Qt 3.x.x |
3 | 3 | ||
4 | unix { | 4 | unix { |
5 | CONFIG += release | 5 | CONFIG += release |
6 | #for statically linking | ||
7 | #CONFIG += staticlib | ||
6 | } | 8 | } |
7 | win32 { | 9 | win32 { |
8 | CONFIG += release | 10 | CONFIG += release |
9 | 11 | ||
10 | } \ No newline at end of file | 12 | } \ No newline at end of file |