From dc9010997d770229dbee6b023f41ea74e0809027 Mon Sep 17 00:00:00 2001 From: ulf69 Date: Tue, 10 Aug 2004 16:57:13 +0000 Subject: libkdepim references libkcal, and not kaddressbook. Therefore I moved the linker directive from kaddressbookE.pro to libkdepimE.pro --- diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro index 86166d8..1695a28 100644 --- a/kaddressbook/kaddressbookE.pro +++ b/kaddressbook/kaddressbookE.pro @@ -7,23 +7,17 @@ OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) DESTDIR=$(QPEDIR)/bin -#LFLAGS += -Wl,-export-dynamic - - 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 DEFINES += KAB_EMBEDDED KAB_NOSPLITTER #DEFINES += KORG_NODND KORG_NOPLUGINS KORG_NOKABC KORG_NOARCHIVE KORG_NOMAIL #DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER #DEFINES += KORG_NOLVALTERNATION LIBS += -lmicrokdepim -#LIBS += -lmicrokcal LIBS += -lmicrokde -LIBS += -lmicrokcal LIBS += -lmicroqtcompat LIBS += -lmicrokabc LIBS += -lqpe LIBS += -ljpeg - LIBS += -lmicrogammu LIBS += -lbluetooth LIBS += -lsdp diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro index e05e681..060145e 100644 --- a/libkdepim/libkdepim.pro +++ b/libkdepim/libkdepim.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG = qt warn_on DEFINES +=KORG_NOKABC TARGET = microkdepim -INCLUDEPATH += ../microkde ../libkabcwrap ../microkde/kdecore ../microkde/kdeui . .. +INCLUDEPATH += ../microkde ../microkde/kdecore ../microkde/kdeui . .. DESTDIR=../bin DEFINES += DESKTOP_VERSION diff --git a/libkdepim/libkdepimE.pro b/libkdepim/libkdepimE.pro index b322bce..196044b 100644 --- a/libkdepim/libkdepimE.pro +++ b/libkdepim/libkdepimE.pro @@ -1,9 +1,10 @@ TEMPLATE = lib CONFIG += qt warn_on TARGET = microkdepim -INCLUDEPATH += ../microkde ../qtcompat ../libkabcwrap ../microkde/kdecore ../microkde/kdeui $(QPEDIR)/include +INCLUDEPATH += ../microkde ../qtcompat ../microkde/kdecore ../microkde/kdeui $(QPEDIR)/include INCLUDEPATH += . .. -LIBS += -lmicrokde +LIBS += -lmicrokde +LIBS += -lmicrokcal LIBS += -L$(QPEDIR)/lib OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) -- cgit v0.9.0.2