From d60d7cd9836ba0bb2950dc4ec908ee77c1adfad9 Mon Sep 17 00:00:00 2001 From: zautrix Date: Wed, 22 Sep 2004 08:06:46 +0000 Subject: changed package building and some lib names --- diff --git a/kabc/formats/binary/kabcformat_binaryE.pro b/kabc/formats/binary/kabcformat_binaryE.pro index 2d9594d..6d300eb 100644 --- a/kabc/formats/binary/kabcformat_binaryE.pro +++ b/kabc/formats/binary/kabcformat_binaryE.pro @@ -8,7 +8,7 @@ INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../qtcomp OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc DESTDIR = $(QPEDIR)/lib -LIBS += -lmicrokde -lmicrokabc +LIBS += -lmicrokde -lkamicrokabc LIBS += -L$(QPEDIR)/lib DEFINES += KAB_EMBEDDED diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro index b360e8c..0a26e0b 100644 --- a/kabc/kabcE.pro +++ b/kabc/kabcE.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt warn_on -TARGET = microkabc +TARGET = kamicrokabc INCLUDEPATH += . $(KDEPIMDIR) vcard/include vcard/include/generated $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kdeui $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(QPEDIR)/include diff --git a/kabc/plugins/dir/dirE.pro b/kabc/plugins/dir/dirE.pro index cda4e2f..3c5e87f 100644 --- a/kabc/plugins/dir/dirE.pro +++ b/kabc/plugins/dir/dirE.pro @@ -7,7 +7,7 @@ INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kde OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) DESTDIR = $(QPEDIR)/lib -LIBS += -lmicrokde -lmicrokabc +LIBS += -lmicrokde -lkamicrokabc LIBS += -L$(QPEDIR)/lib INTERFACES = \ diff --git a/kabc/plugins/file/fileE.pro b/kabc/plugins/file/fileE.pro index 16707e5..438076e 100644 --- a/kabc/plugins/file/fileE.pro +++ b/kabc/plugins/file/fileE.pro @@ -7,7 +7,7 @@ INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kde OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) DESTDIR = $(QPEDIR)/lib -LIBS += -lmicrokde -lmicrokabc +LIBS += -lmicrokde -lkamicrokabc LIBS += -L$(QPEDIR)/lib INTERFACES = \ diff --git a/kabc/plugins/opie/opieE.pro b/kabc/plugins/opie/opieE.pro index b7ecbc0..c506477 100644 --- a/kabc/plugins/opie/opieE.pro +++ b/kabc/plugins/opie/opieE.pro @@ -10,7 +10,7 @@ OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) DESTDIR = $(QPEDIR)/lib LIBS += -lmicrokde -LIBS += -lmicrokabc +LIBS += -lkamicrokabc LIBS += -L$(QPEDIR)/lib LIBS += -L$(OPIEDIR)/lib LIBS += -lopie diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro index c0aa960..a15e9ba 100644 --- a/kabc/plugins/qtopia/qtopiaE.pro +++ b/kabc/plugins/qtopia/qtopiaE.pro @@ -9,7 +9,7 @@ OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) DESTDIR = $(QPEDIR)/lib LIBS += -lmicrokde -LIBS += -lmicrokabc +LIBS += -lkamicrokabc LIBS += -L$(QPEDIR)/lib LIBS += -lqpepim LIBS += -lqpe diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro index b80a1da..46fe417 100644 --- a/kabc/plugins/sharpdtm/sharpdtmE.pro +++ b/kabc/plugins/sharpdtm/sharpdtmE.pro @@ -9,10 +9,10 @@ OBJECTS_DIR = obj/$(PLATFORM) MOC_DIR = moc/$(PLATFORM) DESTDIR = $(QPEDIR)/lib LIBS += -lmicrokde -LIBS += -lmicrokabc +LIBS += -lkamicrokabc LIBS += -lmicrokdepim LIBS += -lmicroqtcompat -LIBS += -lmicrokcal +#LIBS += -lmicrokcal LIBS += -L$(QPEDIR)/lib LIBS += -ljpeg LIBS += -lqpe diff --git a/kaddressbook.control b/kaddressbook.control index 542ce1e..6a9855f 100644 --- a/kaddressbook.control +++ b/kaddressbook.control @@ -1,4 +1,4 @@ -Files: bin/kapi apps/Pim/kaddressbook.desktop pics/kdepim/kaddressbook/* +Files: bin/kapi apps/Pim/kaddressbook.desktop pics/kdepim/kaddressbook/* lib/libkamicro* Priority: optional Section: qpe/pim diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro index 7eb85fd..7400251 100644 --- a/kaddressbook/kaddressbookE.pro +++ b/kaddressbook/kaddressbookE.pro @@ -16,7 +16,7 @@ LIBS += -lmicrokdepim #LIBS += -lmicrokcal LIBS += -lmicrokde LIBS += -lmicroqtcompat -LIBS += -lmicrokabc +LIBS += -lkamicrokabc LIBS += -lqpe LIBS += -ljpeg LIBS += $(QTOPIALIB) diff --git a/korganizer.control b/korganizer.control index f66381e..50dbdd2 100644 --- a/korganizer.control +++ b/korganizer.control @@ -1,4 +1,4 @@ -Files: bin/kopi apps/Pim/korganizer.desktop pics/kdepim/korganizer/* +Files: bin/kopi apps/Pim/korganizer.desktop pics/kdepim/korganizer/* lib/libkomicro* Priority: optional Section: qpe/pim diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro index d841193..5cf9778 100644 --- a/korganizer/korganizerE.pro +++ b/korganizer/korganizerE.pro @@ -12,15 +12,11 @@ DEFINES += KORG_NOPRINTER KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_N DEFINES += KORG_NOLVALTERNATION #KORG_NOKABC LIBS += -lmicrokdepim -LIBS += -lmicrokcal +LIBS += -lkomicrokcal LIBS += -lmicrokde LIBS += -lmicroqtcompat #LIBS += -lmicrokabc -#LIBS += $(QPEDIR)/lib/gammu -#LIBS += -lmicrogammu -#LIBS += -lbluetooth -#LIBS += -lsdp LIBS += $(GCC3EXTRALIB1) LIBS += $(GCC3EXTRALIB2) diff --git a/libkcal/libkcalE.pro b/libkcal/libkcalE.pro index 1f5ef78..e379b95 100644 --- a/libkcal/libkcalE.pro +++ b/libkcal/libkcalE.pro @@ -1,6 +1,6 @@ TEMPLATE = lib CONFIG += qt warn_on -TARGET = microkcal +TARGET = komicrokcal INCLUDEPATH += ../microkde ../qtcompat versit ../microkde/kdecore $(QPEDIR)/include INCLUDEPATH += ../libical/src/libical -- cgit v0.9.0.2