8 files changed, 18 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index b677087..467710f 100644
--- a/Makefile
+++ b/Makefile
@@ -241,14 +241,17 @@ dist:
   ifndef BUILD_NO_MICROMAIL
         mkipks kopiemail.control
   endif
+  ifndef BUILD_NO_SHARP_PLUGIN
+        mkipks ksharpPIM-DTMaccess.control
+  endif
         mkipks korganizer-alarm.control
   ifndef BUILD_NO_GAMMU
-        mkipks phoneaccess.control
+        mkipks kmobilephoneaccess.control
   endif
   ifndef BUILD_NO_PWMANAGER
         mkipks pwmanager.control
   endif
-        mkipks pim_TAB_icon.control
+        mkipks pimTABicon.control
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
diff --git a/Makefile.Embedded b/Makefile.Embedded
index b677087..467710f 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -241,14 +241,17 @@ dist:
   ifndef BUILD_NO_MICROMAIL
         mkipks kopiemail.control
   endif
+  ifndef BUILD_NO_SHARP_PLUGIN
+        mkipks ksharpPIM-DTMaccess.control
+  endif
         mkipks korganizer-alarm.control
   ifndef BUILD_NO_GAMMU
-        mkipks phoneaccess.control
+        mkipks kmobilephoneaccess.control
   endif
   ifndef BUILD_NO_PWMANAGER
         mkipks pwmanager.control
   endif
-        mkipks pim_TAB_icon.control
+        mkipks pimTABicon.control
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
diff --git a/kabc/kabcE.pro b/kabc/kabcE.pro
index 96fe39e..1d28a4d 100644
--- a/kabc/kabcE.pro
+++ b/kabc/kabcE.pro
@@ -1,6 +1,6 @@
         TEMPLATE= lib
 CONFIG += qt warn_on 
-TARGET = kamicrokabc
+TARGET = microkabc
 
 
 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/kaddressbook.control b/kaddressbook.control
index 6a9855f..a7f87dc 100644
--- a/kaddressbook.control
+++ b/kaddressbook.control
@@ -1,12 +1,11 @@
-Files: bin/kapi  apps/Pim/kaddressbook.desktop  pics/kdepim/kaddressbook/*  lib/libkamicro*
-
+Files: bin/kapi  apps/Pim/kaddressbook.desktop  pics/kdepim/kaddressbook/*  lib/libmicrokabc_q* lib/libmicrokabc_f* lib/libmicrokabc_d*  lib/libmicrokabc.* 
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
 Version: $KDEPIM_VERSION
 License: GPL
-Depends: 
+Depends: libmicrokde
 Description: KOrganizer/Pi and Kaddressbook/Pi
  The embedded version of KOrganizer/Platform-independend, 
     the KDE calendar and scheduling program
diff --git a/kmicromail/libetpan/libetpanE.pro b/kmicromail/libetpan/libetpanE.pro
index b7a9a16..7f37948 100644
--- a/kmicromail/libetpan/libetpanE.pro
+++ b/kmicromail/libetpan/libetpanE.pro
@@ -3,7 +3,7 @@
 ######################################################################
 
 TEMPLATE = lib
-        TARGET  = kmicrolibetpan
+        TARGET  = microlibetpan
 
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
diff --git a/kmicromail/libmailwrapper/libmailwrapperE.pro b/kmicromail/libmailwrapper/libmailwrapperE.pro
index a53b022..7cc7a90 100644
--- a/kmicromail/libmailwrapper/libmailwrapperE.pro
+++ b/kmicromail/libmailwrapper/libmailwrapperE.pro
@@ -46,4 +46,4 @@ LIBS        +=   -lssl -lcrypto
 DESTDIR      = $(QPEDIR)/lib
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
-TARGET       = kmicromailwrapper
+TARGET       = micromailwrapper
diff --git a/kopiemail.control b/kopiemail.control
index 58c6d19..58d4bfa 100644
--- a/kopiemail.control
+++ b/kopiemail.control
@@ -1,4 +1,4 @@
-Files:  bin/ompi apps/Pim/kopiemail.desktop  pics/kdepim/kopiemail/*   lib/libkmicro*
+Files:  bin/ompi apps/Pim/kopiemail.desktop  pics/kdepim/kopiemail/*   lib/libmicromail* lib/libmicrolibetpan*
 
 Priority: optional
 Section: qpe/pim
@@ -6,7 +6,7 @@ Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
 Version: $KDEPIM_VERSION
 License: GPL
-Depends: 
+Depends: libmicrokde openssl
 Description: KOPieMail/Pi 
- The embedded version of KOPioeMail/Platform-independend, 
+ The embedded version of KOPieMail/Platform-independend (OM/Pi), 
      for 640x480 and 320x240 resolution on Zaurus PDA
diff --git a/ksharpPIM_DTMaccess.control b/ksharpPIM-DTMaccess.control
index f735462..f735462 100644
--- a/ksharpPIM_DTMaccess.control
+++ b/ksharpPIM-DTMaccess.control