author | ulf69 <ulf69> | 2004-08-10 16:57:13 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-08-10 16:57:13 (UTC) |
commit | dc9010997d770229dbee6b023f41ea74e0809027 (patch) (unidiff) | |
tree | 4f639eabed6f958d451cdae37587c9a343254b89 | |
parent | 972b441aa3435f4f9df6de2a36ba2d03a7de5bbc (diff) | |
download | kdepimpi-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
-rw-r--r-- | kaddressbook/kaddressbookE.pro | 6 | ||||
-rw-r--r-- | libkdepim/libkdepim.pro | 2 | ||||
-rw-r--r-- | libkdepim/libkdepimE.pro | 5 |
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,38 +1,32 @@ | |||
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 |
6 | OBJECTS_DIR = obj/$(PLATFORM) | 6 | OBJECTS_DIR = obj/$(PLATFORM) |
7 | MOC_DIR = moc/$(PLATFORM) | 7 | MOC_DIR = moc/$(PLATFORM) |
8 | DESTDIR=$(QPEDIR)/bin | 8 | DESTDIR=$(QPEDIR)/bin |
9 | 9 | ||
10 | #LFLAGS += -Wl,-export-dynamic | ||
11 | |||
12 | |||
13 | INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include | 10 | INCLUDEPATH += . ./details ./features ./xxport ../libkdepim ../microkde ../microkde/kdecore ../microkde/kutils ../microkde/kio/kfile ../microkde/kio/kio ../microkde/kdeui ../microkde/kresources ../kabc ../qtcompat ../ interfaces $(QPEDIR)/include |
14 | DEFINES += KAB_EMBEDDED KAB_NOSPLITTER | 11 | DEFINES += 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 |
18 | LIBS += -lmicrokdepim | 15 | LIBS += -lmicrokdepim |
19 | #LIBS += -lmicrokcal | ||
20 | LIBS += -lmicrokde | 16 | LIBS += -lmicrokde |
21 | LIBS += -lmicrokcal | ||
22 | LIBS += -lmicroqtcompat | 17 | LIBS += -lmicroqtcompat |
23 | LIBS += -lmicrokabc | 18 | LIBS += -lmicrokabc |
24 | LIBS += -lqpe | 19 | LIBS += -lqpe |
25 | LIBS += -ljpeg | 20 | LIBS += -ljpeg |
26 | |||
27 | LIBS += -lmicrogammu | 21 | LIBS += -lmicrogammu |
28 | LIBS += -lbluetooth | 22 | LIBS += -lbluetooth |
29 | LIBS += -lsdp | 23 | LIBS += -lsdp |
30 | 24 | ||
31 | LIBS += $(QTOPIALIB) | 25 | LIBS += $(QTOPIALIB) |
32 | LIBS += -L$(QPEDIR)/lib | 26 | LIBS += -L$(QPEDIR)/lib |
33 | LIBS += -Wl,-export-dynamic | 27 | LIBS += -Wl,-export-dynamic |
34 | 28 | ||
35 | INTERFACES = \ | 29 | INTERFACES = \ |
36 | # filteredit_base.ui \ | 30 | # filteredit_base.ui \ |
37 | # kofilterview_base.ui \ | 31 | # kofilterview_base.ui \ |
38 | 32 | ||
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro index e05e681..060145e 100644 --- a/libkdepim/libkdepim.pro +++ b/libkdepim/libkdepim.pro | |||
@@ -1,17 +1,17 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG = qt warn_on | 2 | CONFIG = qt warn_on |
3 | DEFINES +=KORG_NOKABC | 3 | DEFINES +=KORG_NOKABC |
4 | TARGET = microkdepim | 4 | TARGET = microkdepim |
5 | INCLUDEPATH += ../microkde ../libkabcwrap ../microkde/kdecore ../microkde/kdeui . .. | 5 | INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kdeui . .. |
6 | DESTDIR=../bin | 6 | DESTDIR=../bin |
7 | 7 | ||
8 | DEFINES += DESKTOP_VERSION | 8 | DEFINES += DESKTOP_VERSION |
9 | include( ../variables.pri ) | 9 | include( ../variables.pri ) |
10 | unix : { | 10 | unix : { |
11 | OBJECTS_DIR = obj/unix | 11 | OBJECTS_DIR = obj/unix |
12 | MOC_DIR = moc/unix | 12 | MOC_DIR = moc/unix |
13 | } | 13 | } |
14 | win32: { | 14 | win32: { |
15 | DEFINES += _WIN32_ | 15 | DEFINES += _WIN32_ |
16 | OBJECTS_DIR = obj/win | 16 | OBJECTS_DIR = obj/win |
17 | MOC_DIR = moc/win | 17 | MOC_DIR = moc/win |
diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro index b322bce..196044b 100644 --- a/libkdepim/libkdepimE.pro +++ b/libkdepim/libkdepimE.pro | |||
@@ -1,18 +1,19 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | TARGET = microkdepim | 3 | TARGET = microkdepim |
4 | INCLUDEPATH += ../microkde ../qtcompat ../libkabcwrap ../microkde/kdecore ../microkde/kdeui $(QPEDIR)/include | 4 | INCLUDEPATH += ../microkde ../qtcompat ../microkde/kdecore ../microkde/kdeui $(QPEDIR)/include |
5 | INCLUDEPATH += . .. | 5 | INCLUDEPATH += . .. |
6 | LIBS += -lmicrokde | 6 | LIBS += -lmicrokde |
7 | LIBS += -lmicrokcal | ||
7 | LIBS += -L$(QPEDIR)/lib | 8 | LIBS += -L$(QPEDIR)/lib |
8 | OBJECTS_DIR = obj/$(PLATFORM) | 9 | OBJECTS_DIR = obj/$(PLATFORM) |
9 | MOC_DIR = moc/$(PLATFORM) | 10 | MOC_DIR = moc/$(PLATFORM) |
10 | DESTDIR=$(QPEDIR)/lib | 11 | DESTDIR=$(QPEDIR)/lib |
11 | 12 | ||
12 | 13 | ||
13 | INTERFACES = \ | 14 | INTERFACES = \ |
14 | 15 | ||
15 | HEADERS = \ | 16 | HEADERS = \ |
16 | categoryeditdialog.h \ | 17 | categoryeditdialog.h \ |
17 | categoryeditdialog_base.h \ | 18 | categoryeditdialog_base.h \ |
18 | categoryselectdialog.h \ | 19 | categoryselectdialog.h \ |