summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-08-10 16:57:13 (UTC)
committer ulf69 <ulf69>2004-08-10 16:57:13 (UTC)
commitdc9010997d770229dbee6b023f41ea74e0809027 (patch) (unidiff)
tree4f639eabed6f958d451cdae37587c9a343254b89
parent972b441aa3435f4f9df6de2a36ba2d03a7de5bbc (diff)
downloadkdepimpi-dc9010997d770229dbee6b023f41ea74e0809027.zip
kdepimpi-dc9010997d770229dbee6b023f41ea74e0809027.tar.gz
kdepimpi-dc9010997d770229dbee6b023f41ea74e0809027.tar.bz2
libkdepim references libkcal, and not kaddressbook. Therefore I moved the linker directive from kaddressbookE.pro to libkdepimE.pro
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kaddressbookE.pro6
-rw-r--r--libkdepim/libkdepim.pro2
-rw-r--r--libkdepim/libkdepimE.pro5
3 files changed, 4 insertions, 9 deletions
diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro
index 86166d8..1695a28 100644
--- a/kaddressbook/kaddressbookE.pro
+++ b/kaddressbook/kaddressbookE.pro
@@ -1,42 +1,36 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3 3
4 4
5 TARGET = kapi 5 TARGET = kapi
6OBJECTS_DIR = obj/$(PLATFORM) 6OBJECTS_DIR = obj/$(PLATFORM)
7MOC_DIR = moc/$(PLATFORM) 7MOC_DIR = moc/$(PLATFORM)
8DESTDIR=$(QPEDIR)/bin 8DESTDIR=$(QPEDIR)/bin
9 9
10#LFLAGS += -Wl,-export-dynamic
11
12
13INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include 10INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include
14DEFINES += KAB_EMBEDDED KAB_NOSPLITTER 11DEFINES += KAB_EMBEDDED KAB_NOSPLITTER
15#DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOKABC KORG_NOARCHIVE KORG_NOMAIL 12#DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOKABC KORG_NOARCHIVE KORG_NOMAIL
16#DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER 13#DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
17#DEFINES += KORG_NOLVALTERNATION 14#DEFINES += KORG_NOLVALTERNATION
18LIBS += -lmicrokdepim 15LIBS += -lmicrokdepim
19#LIBS += -lmicrokcal
20LIBS += -lmicrokde 16LIBS += -lmicrokde
21LIBS += -lmicrokcal
22LIBS += -lmicroqtcompat 17LIBS += -lmicroqtcompat
23LIBS += -lmicrokabc 18LIBS += -lmicrokabc
24LIBS += -lqpe 19LIBS += -lqpe
25LIBS += -ljpeg 20LIBS += -ljpeg
26
27LIBS += -lmicrogammu 21LIBS += -lmicrogammu
28LIBS += -lbluetooth 22LIBS += -lbluetooth
29LIBS += -lsdp 23LIBS += -lsdp
30 24
31LIBS += $(QTOPIALIB) 25LIBS += $(QTOPIALIB)
32LIBS += -L$(QPEDIR)/lib 26LIBS += -L$(QPEDIR)/lib
33LIBS += -Wl,-export-dynamic 27LIBS += -Wl,-export-dynamic
34 28
35INTERFACES = \ 29INTERFACES = \
36# filteredit_base.ui \ 30# filteredit_base.ui \
37# kofilterview_base.ui \ 31# kofilterview_base.ui \
38 32
39HEADERS = \ 33HEADERS = \
40features/mergewidget.h \ 34features/mergewidget.h \
41features/distributionlistwidget.h \ 35features/distributionlistwidget.h \
42kcmconfigs/addresseewidget.h \ 36kcmconfigs/addresseewidget.h \
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro
index e05e681..060145e 100644
--- a/libkdepim/libkdepim.pro
+++ b/libkdepim/libkdepim.pro
@@ -1,21 +1,21 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG = qt warn_on 2 CONFIG = qt warn_on
3DEFINES +=KORG_NOKABC 3DEFINES +=KORG_NOKABC
4TARGET = microkdepim 4TARGET = microkdepim
5INCLUDEPATH += ../microkde ../libkabcwrap ../microkde/kdecore ../microkde/kdeui . .. 5INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kdeui . ..
6DESTDIR=../bin 6DESTDIR=../bin
7 7
8DEFINES += DESKTOP_VERSION 8DEFINES += DESKTOP_VERSION
9include( ../variables.pri ) 9include( ../variables.pri )
10unix : { 10unix : {
11OBJECTS_DIR = obj/unix 11OBJECTS_DIR = obj/unix
12MOC_DIR = moc/unix 12MOC_DIR = moc/unix
13} 13}
14win32: { 14win32: {
15DEFINES += _WIN32_ 15DEFINES += _WIN32_
16OBJECTS_DIR = obj/win 16OBJECTS_DIR = obj/win
17MOC_DIR = moc/win 17MOC_DIR = moc/win
18} 18}
19INTERFACES = \ 19INTERFACES = \
20 20
21HEADERS = \ 21HEADERS = \
diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro
index b322bce..196044b 100644
--- a/libkdepim/libkdepimE.pro
+++ b/libkdepim/libkdepimE.pro
@@ -1,22 +1,23 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on 2 CONFIG += qt warn_on
3TARGET = microkdepim 3TARGET = microkdepim
4INCLUDEPATH += ../microkde ../qtcompat ../libkabcwrap ../microkde/kdecore ../microkde/kdeui $(QPEDIR)/include 4INCLUDEPATH += ../microkde ../qtcompat ../microkde/kdecore ../microkde/kdeui $(QPEDIR)/include
5INCLUDEPATH += . .. 5INCLUDEPATH += . ..
6LIBS += -lmicrokde 6LIBS += -lmicrokde
7LIBS += -lmicrokcal
7LIBS += -L$(QPEDIR)/lib 8LIBS += -L$(QPEDIR)/lib
8OBJECTS_DIR = obj/$(PLATFORM) 9OBJECTS_DIR = obj/$(PLATFORM)
9MOC_DIR = moc/$(PLATFORM) 10MOC_DIR = moc/$(PLATFORM)
10DESTDIR=$(QPEDIR)/lib 11DESTDIR=$(QPEDIR)/lib
11 12
12 13
13INTERFACES = \ 14INTERFACES = \
14 15
15HEADERS = \ 16HEADERS = \
16 categoryeditdialog.h \ 17 categoryeditdialog.h \
17 categoryeditdialog_base.h \ 18 categoryeditdialog_base.h \
18 categoryselectdialog.h \ 19 categoryselectdialog.h \
19 categoryselectdialog_base.h \ 20 categoryselectdialog_base.h \
20 externalapphandler.h \ 21 externalapphandler.h \
21 kdateedit.h \ 22 kdateedit.h \
22 kdatepicker.h \ 23 kdatepicker.h \