18 files changed, 14 insertions, 24 deletions

diff --git a/gammu/emb/common/commonE.pro b/gammu/emb/common/commonE.pro
index 1512814..0133835 100644
--- a/gammu/emb/common/commonE.pro
+++ b/gammu/emb/common/commonE.pro
@@ -171,9 +171,9 @@ phone/nokia/nfunc.c \
 phone/nokia/nfuncold.c \
 phone/obex/obexgen.c \
 phone/symbian/mroutgen.c 
 
-TARGET = kammu
+TARGET = microkammu
 DESTDIR = $(QPEDIR)/lib
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
         CONFIG          =  warn_off release console
diff --git a/gammu/emb/gammu/gammuE.pro b/gammu/emb/gammu/gammuE.pro
index 5b18205..b0c610b 100644
--- a/gammu/emb/gammu/gammuE.pro
+++ b/gammu/emb/gammu/gammuE.pro
@@ -46,9 +46,9 @@ SOURCES += gammu.c \
            depend/nokia/dct3trac/wmx-util.c \
            depend/nokia/dct3trac/wmx.c
 
 LIBS += -L$(QPEDIR)/lib
-LIBS += -lkammu
+LIBS += -lmicrokammu
 #LIBS += -lbluetooth
 #LIBS += -lsdp
 LIBS += -lpthread
         CONFIG          =  warn_off release console
diff --git a/kabc/formats/binary/kabcformat_binaryE.pro b/kabc/formats/binary/kabcformat_binaryE.pro
index 6d300eb..2d9594d 100644
--- a/kabc/formats/binary/kabcformat_binaryE.pro
+++ b/kabc/formats/binary/kabcformat_binaryE.pro
@@ -7,9 +7,9 @@ TARGET = microkabcformat_binary
 INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lkamicrokabc
+LIBS += -lmicrokde -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
 DEFINES += KAB_EMBEDDED
 
 INTERFACES = \
diff --git a/kabc/plugins/dir/dirE.pro b/kabc/plugins/dir/dirE.pro
index 3c5e87f..cda4e2f 100644
--- a/kabc/plugins/dir/dirE.pro
+++ b/kabc/plugins/dir/dirE.pro
@@ -6,9 +6,9 @@ TARGET = microkabc_dir
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lkamicrokabc
+LIBS += -lmicrokde -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
diff --git a/kabc/plugins/file/fileE.pro b/kabc/plugins/file/fileE.pro
index 438076e..16707e5 100644
--- a/kabc/plugins/file/fileE.pro
+++ b/kabc/plugins/file/fileE.pro
@@ -6,9 +6,9 @@ TARGET = microkabc_file
 INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/microkde/kio/kfile $(KDEPIMDIR)/microkde/kio/kio $(KDEPIMDIR)/microkde/kresources $(KDEPIMDIR)/qtcompat
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
-LIBS += -lmicrokde -lkamicrokabc
+LIBS += -lmicrokde -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
 
 INTERFACES = \
 
diff --git a/kabc/plugins/opie/opieE.pro b/kabc/plugins/opie/opieE.pro
index c506477..b7ecbc0 100644
--- a/kabc/plugins/opie/opieE.pro
+++ b/kabc/plugins/opie/opieE.pro
@@ -9,9 +9,9 @@ INCLUDEPATH += $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kde
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
-LIBS += -lkamicrokabc
+LIBS += -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -L$(OPIEDIR)/lib
 LIBS += -lopie
 LIBS += -lqpe
diff --git a/kabc/plugins/qtopia/qtopiaE.pro b/kabc/plugins/qtopia/qtopiaE.pro
index d66c719..700057b 100644
--- a/kabc/plugins/qtopia/qtopiaE.pro
+++ b/kabc/plugins/qtopia/qtopiaE.pro
@@ -8,9 +8,9 @@ INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(KDEPIMDIR)/microkde $(KDEPIMDIR)
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
-LIBS += -lkamicrokabc
+LIBS += -lmicrokabc
 LIBS += -L$(QPEDIR)/lib
 LIBS += -lqpe
 
 INTERFACES = \
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index 46fe417..23b0b76 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -8,12 +8,11 @@ INCLUDEPATH += $(KDEPIMDIR) $(KDEPIMDIR)/kabc $(SHARPDTMSDK)/include $(KDEPIMDIR
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 LIBS += -lmicrokde 
-LIBS += -lkamicrokabc
+LIBS += -lmicrokabc
 LIBS += -lmicrokdepim
 LIBS += -lmicroqtcompat
-#LIBS += -lmicrokcal
 LIBS += -L$(QPEDIR)/lib
 LIBS += -ljpeg
 LIBS += -lqpe
 LIBS += -lqte
diff --git a/kaddressbook/kaddressbookE.pro b/kaddressbook/kaddressbookE.pro
index 7400251..64e3a4a 100644
--- a/kaddressbook/kaddressbookE.pro
+++ b/kaddressbook/kaddressbookE.pro
@@ -12,12 +12,11 @@ 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 += -lmicroqtcompat
-LIBS += -lkamicrokabc
+LIBS += -lmicrokabc
 LIBS += -lqpe
 LIBS += -ljpeg
 LIBS += $(QTOPIALIB)
 LIBS += -L$(QPEDIR)/lib
diff --git a/kmicrokdelibs.control b/kmicrokdelibs.control
index a8b3f9a..9e05623 100644
--- a/kmicrokdelibs.control
+++ b/kmicrokdelibs.control
@@ -1,6 +1,5 @@
 Files: lib/libmicroqt* lib/libmicrokde* pics/kdepim/LICENCE.TXT pics/kdepim/SyncHowto.txt pics/kdepim/WhatsNew.txt  pics/kdepim/Zaurus-KDE_syncHowTo.txt
-
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index d578a9c..07cd2d8 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -54,9 +54,9 @@ INTERFACES     = editaccountsui.ui \
                nntpgroupsui.ui
 
 
 INCLUDEPATH += . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim  $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui $(QPEDIR)/include
-LIBS        += -L$(QPEDIR)/lib -lkmicromailwrapper -lqpe -lkmicrolibetpan  -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicroqtcompat  -lmicrokdepim
+LIBS        += -L$(QPEDIR)/lib -lmicromailwrapper -lqpe -lmicrolibetpan  -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokdepim
 LIBS += $(QTOPIALIB)
 #LIBS += -lqtopia 
 #next line for Zaurus only
 #LIBS +=  -luuid
diff --git a/kmobilephoneaccess.control b/kmobilephoneaccess.control
index 07559e7..be4a4c2 100644
--- a/kmobilephoneaccess.control
+++ b/kmobilephoneaccess.control
@@ -1,11 +1,10 @@
-Files:  bin/kammu  lib/libkammu*
+Files:  bin/kammu  lib/libmicrokammu*
 
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
 Version: $KDEPIM_VERSION
 License: GPL
-Depends: 
 Description: Special version of gammu / libgammu
     for Zaurus PDA and microkde
diff --git a/kopiemail.control b/kopiemail.control
index 58d4bfa..77e0e79 100644
--- a/kopiemail.control
+++ b/kopiemail.control
@@ -1,6 +1,5 @@
 Files:  bin/ompi apps/Pim/kopiemail.desktop  pics/kdepim/kopiemail/*   lib/libmicromail* lib/libmicrolibetpan*
-
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
diff --git a/korganizer.control b/korganizer.control
index 2910ebd..0224cc3 100644
--- a/korganizer.control
+++ b/korganizer.control
@@ -1,6 +1,5 @@
 Files: bin/kopi  apps/Pim/korganizer.desktop   pics/kdepim/korganizer/* lib/libmicrokcal*
-
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index 5cf9778..e6c3f8d 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -11,12 +11,11 @@ DEFINES += KORG_NODND KORG_NOPLUGINS  KORG_NOARCHIVE KORG_NOMAIL
 DEFINES += KORG_NOPRINTER  KORG_NODCOP KORG_NOKALARMD KORG_NORESOURCEVIEW KORG_NOSPLITTER
 DEFINES += KORG_NOLVALTERNATION
 #KORG_NOKABC
 LIBS += -lmicrokdepim
-LIBS += -lkomicrokcal
+LIBS += -lmicrokcal
 LIBS += -lmicrokde
 LIBS += -lmicroqtcompat
-#LIBS += -lmicrokabc
 
 LIBS += $(GCC3EXTRALIB1)
 LIBS += $(GCC3EXTRALIB2)
 
diff --git a/ksharpPIM-DTMaccess.control b/ksharpPIM-DTMaccess.control
index f735462..545bce4 100644
--- a/ksharpPIM-DTMaccess.control
+++ b/ksharpPIM-DTMaccess.control
@@ -1,6 +1,5 @@
-Files:  bin/db2file libmicrokabc_sharp*
-
+Files:  bin/db2file lib/libmicrokabc_sharp*
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
diff --git a/pimTABicon.control b/pimTABicon.control
index 46458d1..0007c7c 100644
--- a/pimTABicon.control
+++ b/pimTABicon.control
@@ -1,11 +1,9 @@
 Files:  apps/Pim/.directory  pics/ko24ti.png
-
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
 Version: $KDEPIM_VERSION
 License: GPL
-Depends: 
 Description: Icon for Pim TAB
     for Zaurus PDA and microkde
diff --git a/pwmanager.control b/pwmanager.control
index 3ea90ce..d346544 100644
--- a/pwmanager.control
+++ b/pwmanager.control
@@ -5,9 +5,9 @@ Section: qpe/pim
 Maintainer: Ulf Schenk
 Architecture: arm
 Version: $KDEPIM_VERSION
 License: GPL
-Depends: 
+Depends: libmicrokde
 Description: PwManager/Pi
  The embedded version of PwManager/Platform-independend, 
     the KDE password management program
   optimized for 640x480 and 320x240 resolution