mayn fixes

6 files changed, 379 insertions, 295 deletions

diff --git a/Makefile b/Makefile
index f80c6d4..467710f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,291 +1,368 @@
-#############################################################################
-# Makefile for building: kdepim-desktop
-# Generated by qmake (1.07a) (Qt 3.3.3) on: Sat Jan  8 00:36:06 2005
-# Project:  kdepim-desktop.pro
-# Template: subdirs
-# Command: $(QMAKE) -o Makefile kdepim-desktop.pro
-#############################################################################
-
-MAKEFILE =	Makefile
-QMAKE    =	qmake
-DEL_FILE =    rm -f
-CHK_DIR_EXISTS= test -d
-MKDIR    = mkdir -p
-INSTALL_FILE= 
-INSTALL_DIR = 
-SUBTARGETS =	 \
-		sub-libical \
-		sub-libkcal \
-		sub-kabc \
-		sub-libkdepim \
-		sub-microkde \
-		sub-korganizer \
-		sub-kaddressbook \
-		sub-kabc-plugins-file \
-		sub-kabc-plugins-dir \
-		sub-kabc-plugins-file \
-		sub-kabc-plugins-qtopia \
-		sub-gammu-emb-common \
-		sub-gammu-emb-gammu \
-		sub-kmicromail-libetpan \
-		sub-kmicromail-libmailwrapper \
-		sub-kmicromail \
-		sub-pwmanager-libcrypt-cipher \
-		sub-pwmanager-libcrypt-error \
-		sub-pwmanager-libcrypt-mpi \
-		sub-pwmanager-libcrypt-zlib \
-		sub-pwmanager-pwmanager
-
-first: all
-
-all: Makefile $(SUBTARGETS)
-
-libical/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
-	cd libical && $(QMAKE) libical.pro -o $(MAKEFILE)
-sub-libical: libical/$(MAKEFILE) FORCE
-	cd libical && $(MAKE) -f $(MAKEFILE)
-
-libkcal/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
-	cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE)
-sub-libkcal: libkcal/$(MAKEFILE) FORCE
-	cd libkcal && $(MAKE) -f $(MAKEFILE)
-
-kabc/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
-	cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE)
-sub-kabc: kabc/$(MAKEFILE) FORCE
-	cd kabc && $(MAKE) -f $(MAKEFILE)
-
-libkdepim/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
-	cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE)
-sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
-	cd libkdepim && $(MAKE) -f $(MAKEFILE)
-
-microkde/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
-	cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE)
-sub-microkde: microkde/$(MAKEFILE) FORCE
-	cd microkde && $(MAKE) -f $(MAKEFILE)
-
-korganizer/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
-	cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE)
-sub-korganizer: korganizer/$(MAKEFILE) FORCE
-	cd korganizer && $(MAKE) -f $(MAKEFILE)
-
-kaddressbook/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
-	cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE)
-sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
-	cd kaddressbook && $(MAKE) -f $(MAKEFILE)
-
-kabc/plugins/file/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
-	cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
-sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
-	cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
-
-kabc/plugins/dir/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
-	cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE)
-sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
-	cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
-
-kabc/plugins/file/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
-	cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
-sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
-	cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
-
-kabc/plugins/qtopia/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kabc/plugins/qtopia" || $(MKDIR) "kabc/plugins/qtopia"
-	cd kabc/plugins/qtopia && $(QMAKE) qtopia.pro -o $(MAKEFILE)
-sub-kabc-plugins-qtopia: kabc/plugins/qtopia/$(MAKEFILE) FORCE
-	cd kabc/plugins/qtopia && $(MAKE) -f $(MAKEFILE)
-
-gammu/emb/common/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
-	cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE)
-sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
-	cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
-
-gammu/emb/gammu/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu"
-	cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE)
-sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
-	cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
-
-kmicromail/libetpan/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kmicromail/libetpan" || $(MKDIR) "kmicromail/libetpan"
-	cd kmicromail/libetpan && $(QMAKE) libetpan.pro -o $(MAKEFILE)
-sub-kmicromail-libetpan: kmicromail/libetpan/$(MAKEFILE) FORCE
-	cd kmicromail/libetpan && $(MAKE) -f $(MAKEFILE)
-
-kmicromail/libmailwrapper/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kmicromail/libmailwrapper" || $(MKDIR) "kmicromail/libmailwrapper"
-	cd kmicromail/libmailwrapper && $(QMAKE) libmailwrapper.pro -o $(MAKEFILE)
-sub-kmicromail-libmailwrapper: kmicromail/libmailwrapper/$(MAKEFILE) FORCE
-	cd kmicromail/libmailwrapper && $(MAKE) -f $(MAKEFILE)
-
-kmicromail/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "kmicromail" || $(MKDIR) "kmicromail"
-	cd kmicromail && $(QMAKE) kmicromail.pro -o $(MAKEFILE)
-sub-kmicromail: kmicromail/$(MAKEFILE) FORCE
-	cd kmicromail && $(MAKE) -f $(MAKEFILE)
-
-pwmanager/libcrypt/cipher/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "pwmanager/libcrypt/cipher" || $(MKDIR) "pwmanager/libcrypt/cipher"
-	cd pwmanager/libcrypt/cipher && $(QMAKE) cipher.pro -o $(MAKEFILE)
-sub-pwmanager-libcrypt-cipher: pwmanager/libcrypt/cipher/$(MAKEFILE) FORCE
-	cd pwmanager/libcrypt/cipher && $(MAKE) -f $(MAKEFILE)
-
-pwmanager/libcrypt/error/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "pwmanager/libcrypt/error" || $(MKDIR) "pwmanager/libcrypt/error"
-	cd pwmanager/libcrypt/error && $(QMAKE) error.pro -o $(MAKEFILE)
-sub-pwmanager-libcrypt-error: pwmanager/libcrypt/error/$(MAKEFILE) FORCE
-	cd pwmanager/libcrypt/error && $(MAKE) -f $(MAKEFILE)
-
-pwmanager/libcrypt/mpi/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "pwmanager/libcrypt/mpi" || $(MKDIR) "pwmanager/libcrypt/mpi"
-	cd pwmanager/libcrypt/mpi && $(QMAKE) mpi.pro -o $(MAKEFILE)
-sub-pwmanager-libcrypt-mpi: pwmanager/libcrypt/mpi/$(MAKEFILE) FORCE
-	cd pwmanager/libcrypt/mpi && $(MAKE) -f $(MAKEFILE)
-
-pwmanager/libcrypt/zlib/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "pwmanager/libcrypt/zlib" || $(MKDIR) "pwmanager/libcrypt/zlib"
-	cd pwmanager/libcrypt/zlib && $(QMAKE) zlib.pro -o $(MAKEFILE)
-sub-pwmanager-libcrypt-zlib: pwmanager/libcrypt/zlib/$(MAKEFILE) FORCE
-	cd pwmanager/libcrypt/zlib && $(MAKE) -f $(MAKEFILE)
-
-pwmanager/pwmanager/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "pwmanager/pwmanager" || $(MKDIR) "pwmanager/pwmanager"
-	cd pwmanager/pwmanager && $(QMAKE) pwmanager.pro -o $(MAKEFILE)
-sub-pwmanager-pwmanager: pwmanager/pwmanager/$(MAKEFILE) FORCE
-	cd pwmanager/pwmanager && $(MAKE) -f $(MAKEFILE)
-
-Makefile: kdepim-desktop.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-	$(QMAKE) -o Makefile kdepim-desktop.pro
-qmake: qmake_all
-	@$(QMAKE) -o Makefile kdepim-desktop.pro
-
-all: $(SUBTARGETS)
-qmake_all: libical/$(MAKEFILE) libkcal/$(MAKEFILE) kabc/$(MAKEFILE) libkdepim/$(MAKEFILE) microkde/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/qtopia/$(MAKEFILE) gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) kmicromail/libetpan/$(MAKEFILE) kmicromail/libmailwrapper/$(MAKEFILE) kmicromail/$(MAKEFILE) pwmanager/libcrypt/cipher/$(MAKEFILE) pwmanager/libcrypt/error/$(MAKEFILE) pwmanager/libcrypt/mpi/$(MAKEFILE) pwmanager/libcrypt/zlib/$(MAKEFILE) pwmanager/pwmanager/$(MAKEFILE)
-	 ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d kmicromail/libetpan ] && cd kmicromail/libetpan ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d kmicromail ] && cd kmicromail ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
-	 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kmicromail/libetpan ] && cd kmicromail/libetpan ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-uninstall_subdirs: qmake_all FORCE
-	 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kmicromail/libetpan ] && cd kmicromail/libetpan ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-install_subdirs: qmake_all FORCE
-	 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d kmicromail/libetpan ] && cd kmicromail/libetpan ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) install; ) || true
-distclean: qmake_all FORCE
-	 ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kmicromail/libetpan ] && cd kmicromail/libetpan ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kmicromail/libmailwrapper ] && cd kmicromail/libmailwrapper ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d kmicromail ] && cd kmicromail ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-
-install:  install_subdirs
-
-uninstall:  uninstall_subdirs
-
-FORCE:
+export KDEPIMDIR = $(shell pwd)
+
+export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version)
+
+ifeq ($(PLATFORM) , zaurus)
+  BUILD_NO_LDAP_PLUGIN=1
+endif
+
+ifneq ($(PLATFORM) , zaurus)
+  BUILD_NO_SHARP_PLUGIN=1
+endif
+
+#opie plugin is deprecated. The qtopia plugin handles the task from now on.
+BUILD_NO_OPIE_PLUGIN=1
+
+SUBDIRS_MICROKDE = \
+   libical/src/libical \
+   libical/src/libicalss \
+   qtcompat \
+   microkde \
+   libkcal \
+   libkdepim \
+   kabc \
+   kabc/formats/binary \
+   kabc/plugins/file \
+   kabc/plugins/dir \
+   korganizer \
+   kalarmd \
+   kaddressbook
+
+SUBDIRS_QTOPIA_PLUGIN = \
+   kabc/plugins/qtopia
+
+SUBDIRS_OPIE_PLUGIN = \
+   kabc/plugins/opie
+
+SUBDIRS_SHARP_PLUGIN = \
+   kabc/plugins/sharpdtm
+
+SUBDIRS_LDAP_PLUGIN = \
+   kabc/plugins/ldap
+
+SUBDIRS_MICROMAIL = \
+   kmicromail/libetpan \
+   kmicromail/libmailwrapper \
+   kmicromail
+
+SUBDIRS_GAMMU = \
+   gammu/emb/common \
+   gammu/emb/gammu
+
+SUBDIRS_PWMANAGER = \
+   pwmanager/libcrypt/mpi  \
+   pwmanager/libcrypt/error  \
+   pwmanager/libcrypt/cipher  \
+   pwmanager/libcrypt/zlib \
+   pwmanager/pwmanager
+
+SUBDIRS = \
+   $(SUBDIRS_MICROKDE) \
+   $(SUBDIRS_QTOPIA_PLUGIN) \
+   $(SUBDIRS_OPIE_PLUGIN) \
+   $(SUBDIRS_SHARP_PLUGIN) \
+   $(SUBDIRS_LDAP_PLUGIN) \
+   $(SUBDIRS_MICROMAIL) \
+   $(SUBDIRS_GAMMU) \
+   $(SUBDIRS_PWMANAGER) 
+
+
+all: build_microkde \
+     build_qtopia_plugin \
+     build_opie_plugin \
+     build_sharp_plugin \
+     build_ldap_plugin \
+     build_micromail \
+     build_gammu \
+     build_pwmanager
+
+
+build_microkde: variable_test tmake
+	for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+
+build_qtopia_plugin: build_microkde
+  ifdef BUILD_NO_QTOPIA_PLUGIN
+	@echo == qtopia plugin not build.
+  else
+	for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
+build_opie_plugin: build_microkde
+  ifdef BUILD_NO_OPIE_PLUGIN
+	@echo == opie plugin not build.
+  else
+	for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
+build_sharp_plugin: build_microkde
+  ifdef BUILD_NO_SHARP_PLUGIN
+	@echo == ldap plugin not build.
+  else
+	for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+  
+build_ldap_plugin: build_microkde
+  ifdef BUILD_NO_LDAP_PLUGIN
+	@echo == ldap plugin not build.
+  else
+	  for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
+            make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
+
+build_micromail: build_microkde
+  ifdef BUILD_NO_MICROMAIL
+	@echo == kmicromail not build.
+  else
+	for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
+build_gammu: variable_test tmake
+  ifdef BUILD_NO_GAMMU
+	@echo == gammu not build.
+  else
+	for i in $(SUBDIRS_GAMMU); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
+build_pwmanager: build_microkde
+  ifdef BUILD_NO_PWMANAGER
+	@echo == pwmanager not build.
+  else
+	for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \
+          make -f Makefile$(PLATFORM) || exit 1; popd; \
+          done
+  endif
+
+
+variable_info:
+	@echo --------------------------------------
+	@echo KDEPIM buildsystem, variableinfo...
+	@echo KDEPIMDIR=$(KDEPIMDIR)
+	@echo QTDIR=$(QTDIR)
+	@echo QPEDIR=$(QPEDIR)
+	@echo OPIEDIR=$(OPIEDIR)
+	@echo PLATFORM=$(PLATFORM)
+	@echo RELEASE_DEBUG=$(RELEASE_DEBUG)
+	@echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
+	@echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
+	@echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
+	@echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
+	@echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
+        ifndef BUILD_NO_SHARP_PLUGIN
+	@echo SHARPDTMSDK=$(SHARPDTMSDK)
+        endif
+	@echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
+	@echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
+	@echo --------------------------------------
+
+variable_test: variable_info
+	@echo KDEPIM buildsystem, variablecheck...
+  ifndef KDEPIMDIR
+	@echo KDEPIMDIR is not defined.
+	$(error KDEPIMDIR is not defined)
+  endif
+  ifndef PLATFORM
+	@echo PLATFORM is not defined.
+	$(error PLATFORM is not defined)
+  endif
+  ifdef BUILD_NO_LDAP_PLUGIN
+	@echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
+  endif
+  ifdef BUILD_NO_OPIE_PLUGIN
+	@echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
+  endif
+  ifdef BUILD_NO_QTOPIA_PLUGIN
+	@echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
+  endif
+  ifdef BUILD_NO_MICROMAIL
+	@echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
+  endif
+  ifdef BUILD_NO_SHARP_PLUGIN
+	@echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
+  else
+  ifndef SHARPDTMSDK
+	@echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
+	$(error SHARPDTMSDK is not defined)
+  endif
+  endif
+  ifdef BUILD_NO_GAMMU
+	@echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
+  endif
+  ifdef BUILD_NO_PWMANAGER
+	@echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
+  endif
+	@echo --------------------------------------
+
+
+objects:
+	for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
+	for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
+	mkdir -p libical/lib/$(PLATFORM)
+	mkdir -p pwmanager/libcrypt/$(PLATFORM)
+
+clean:
+	rm -rf libical/lib/$(PLATFORM)/*;
+	rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
+	for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
+          rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
+          done 
+
+install:
+
+	cd bin/kdepim; make install
+	cp -r Pim $(QPEDIR)/apps
+	cp db2file/db2file $(QPEDIR)/bin/db2file
+	cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
+	cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
+	cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
+	cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
+    
+dist: 
+	@echo Dont forget to do "make install" before "make dist"
+	rm -f *arm.ipk
+	rm -f *~
+	cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
+	mkipks kmicrokdelibs.control
+	mkipks korganizer.control
+	mkipks kaddressbook.control
+  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 kmobilephoneaccess.control
+  endif
+  ifndef BUILD_NO_PWMANAGER
+	mkipks pwmanager.control
+  endif
+	mkipks pimTABicon.control
+
+tmake: objects \
+       qtcompat/Makefile$(PLATFORM) \
+       microkde/Makefile$(PLATFORM) \
+       libkcal/Makefile$(PLATFORM) \
+       libkdepim/Makefile$(PLATFORM) \
+       korganizer/Makefile$(PLATFORM) \
+       kalarmd/Makefile$(PLATFORM) \
+       libical/src/libical/Makefile$(PLATFORM) \
+       libical/src/libicalss/Makefile$(PLATFORM) \
+       kabc/Makefile$(PLATFORM) \
+       kabc/formats/binary/Makefile$(PLATFORM) \
+       kabc/plugins/file/Makefile$(PLATFORM) \
+       kabc/plugins/dir/Makefile$(PLATFORM) \
+       kabc/plugins/ldap/Makefile$(PLATFORM) \
+       kabc/plugins/opie/Makefile$(PLATFORM) \
+       kabc/plugins/qtopia/Makefile$(PLATFORM) \
+       kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
+       kaddressbook/Makefile$(PLATFORM) \
+       kmicromail/Makefile$(PLATFORM) \
+       kmicromail/libetpan/Makefile$(PLATFORM) \
+       kmicromail/libmailwrapper/Makefile$(PLATFORM) \
+       gammu/emb/common/Makefile$(PLATFORM) \
+       gammu/emb/gammu/Makefile$(PLATFORM) \
+       pwmanager/pwmanager/Makefile$(PLATFORM) \
+       pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
+       pwmanager/libcrypt/error/Makefile$(PLATFORM) \
+       pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
+       pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
+
+qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
+	cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
+
+microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
+	cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
+
+libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
+	cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
+
+
+libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
+	cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
+
+kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
+	cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
+
+korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
+	cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
+
+libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
+	cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
+
+libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
+	cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
+
+kabc/Makefile$(PLATFORM): kabc/kabcE.pro
+	cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
+
+kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
+	cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
+
+kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
+	cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
+
+kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
+	cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
+
+kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
+	cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
+
+kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
+	cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
+
+kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
+	cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
+
+kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
+	cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
+
+kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
+	cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
+
+kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
+	cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
+
+kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
+	cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
+
+kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
+	cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
+
+gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
+	cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
+
+gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
+	cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
+
+pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
+	cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
+
+
+pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro
+	cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM)
+
+pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro
+	cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM)
+
+pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro
+	cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM)
+
+pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro
+	cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM)
+
 
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index c90f58e..a7d1b90 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,216 +1,225 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 1.9.16 ************
 
 KO/Pi:
 Fixed search dialog size on Z 6000 (480x640 display).
 Added setting to hide/show time in agenda items.
 Added setting to hide not running todos in todo view.
 Added columns for start date/time in todo view.
 Replaced the solid half-hour lines in agenda view by dot lines.
 Added possibility of printing the What's Next View on the desktop
 (i.e. Windows and Linux).
+Fixed a crash in KO/Pi when starting KO/Pi with What's Next view.
 
 Fixed a strange problem in KO/Pi alarm applet.
 Did not find the actual problem, 
 such that now Qtopia reboots again if deinstalling the alarm applet.
 But the alarm applet should work again.
 
 KA/Pi:
 Fixed the problem, that internal pictures were not saved.
 
+Fixed a problem in the pi-sync mode by increasing the timeout for data transfer from 20 seconds to 5 minutes.
 
 Fixed some minor problems. (Like word wrap in help text windows).
 
+Fixed a compiling problem in microkde/kresources.
+
+KO/Pi is using zdbat (renamed to db2file) for syncing with Sharp DTM.
+This version now includes zdbat 1.0.0 (old version was zdbat 0.2.9)
+such that now syncing KO/Pi with Sharp DTM should work on the 
+Zaurus C 3000 model.
+
 ********** VERSION 1.9.15 ************
 
 Usebilty enhancements in KO/Pi:
 When clicking on the date in a month view cell, the day view is shown.
 Old behaviour was, that the "new event" dialog popped up.
 
 Added a one step "undo delete" in KO/Pi (Accessable in the "Action" menu). 
 That means, you can restore the latest
 event/todo/journal you have deleted.
 A journal is deleted, if you clear all the text of the journal.
 
 Fixed the bug of the editor dialogs in KO/Pi of version 1.9.14.
 
 KA/Pi  starting in 480x640 resolution:
 Hide the filter action in toolbar
 and added icons for undo/delete/redo in toolbar.
 
 Change in OM/Pi ViewMail dialog:
 When clicking on the "delete" icon the mail is deleted after confirmation as usual. 
 But the edit dialog is not closed as before, now the next mail in the folder is shown automatically (if there is any).
 
 Fixed a crash when deleting mail-accounts in OM/Pi.
 
 
 ********** VERSION 1.9.14 ************
 
 Fixed some problems with the dialog sizes when switching 
 portrait/landscape mode on 640x480 PDA display.
 
 Fixed some other small bugs in KA/Pi KO/Pi and OM/Pi and PwM/Pi.
 
 Fixed an ugly bug in KOpieMail: 
 KOpieMail was not able to write files (mails) to MSDOS file system, 
 like on an usual preformatted SD card. That should work now.
 To save your mail data on the Sd card do the following:
 Create a dir on the SD card:
 mkdir /mnt/card/localmail
 Go to your home dir:
 cd
 Go to kopiemail data storage dir:
 cd kdepim/apps/kopiemail
 Create a symlink to the SD card:
 ls -s /mnt/card/localmail
 Now KOpieMail will store all mails on the SD card.
 
 KO/Pi Monthview:
 Now "Go to Today" selects the current month from day 1-end,
 not the current date + some days.
 I.e. "Go to Today" shows now always
 the current month with first day of month in the first row. 
 
 Added missing German translation.
 
 Fixed icons of executeable on Wintendo.
 
 Added a "Show next Mail" button to the OM/Pi 
 mail viewer such that the mail below the current mail
 in the mail list view of the current folder
 can be read with a single click.
 
 
 ********** VERSION 1.9.13 ************
 
 Fixed nasty PwM/Pi file reading bug, when
 the used hash algo of file is different then the global 
 hash algo.
 
 Added KA/Pi support for opie mailit mailapplication.
 
 Fixed some bugs in OM/Pi.
 Now character conversion tables are available for the Zaurus
 to make OM/Pi working properly.
 To get the character conversion in OM/Pi working, please download
 at the sourceforge project site the package
 sr-character-conversion_SharpROM_arm.ipk.zip
 (or oz-character-conversion_OZ-gcc3xx_arm.ipk.zip for OZ roms)
 from the section "general files for KDE/Pim"
 Instructions how to install this package are in a ReadMe in this file.
 
 
 Fixed the orientation change problem in KA/Pi when switching
 portrait/landscape mode.
 
 French translation available for KA/Pi and OM/Pi.
 
 Fixed some problems with categories in KO/Pi in DTM sync.
 
 Added selection dialog for export to phone in KA/Pi.
 
 If in KO/Pi is an attendee selected to add to a meeting and this
 attendee is already in the list of attendees, this person is not added
 again.
 
 Some menu cleanup in KA/Pi.
 
 ********** VERSION 1.9.12 ************
 
 Fix for the bug in KO/Pi What's Next view of version 1.9.11.
 
 Bugfix: Licence file is now shown again.
 
 OM/Pi now supports Unicode (utf8 charset).
 Fixed some bugs in OM/Pi.
 
 KA/Pi has more German translation.
 
 
 ********** VERSION 1.9.11 ************
 
 Fixed several problems in PWM/Pi, like
 asking the user, if unsaved changed are pending
 when closing the app.
 And PwM/Pi handles now different texts for the
 fields Description, Username, Password, configurable per category.
 
 Fixed a crash in KO/Pi , when importing/loading vcs files
 which have an entry with an attendee with state:
 NEEDS ACTION
 
 Fixed some problems in the German translation of OM/Pi,
 which makes some dialogs not fitting on the screen
 of the Z 5500.
 
 Fixed Qtopia crash, when disabling/deinstalling
 KO/Pi alarm applet.
 
 Implemented direct KDE<->KA/Pi sync for KA/Pi running 
 on Linux desktop.
 
 Added feature "remove sync info" to sync menu.
 
 Tweaked the KO/Pi What's next view a bit, added
 setting to hide events that are done.
 
 Disabled "beam receive enabled" on startup to 
 avoid problems if Fastload is enabled.
 Please set "beam receive enabled",
 if you want to receive data via IR.
 
 Fixed bug in  direct KDE<->KO/Pi sync for KO/Pi running 
 on Linux desktop.
 
 Made in KA/Pi scrolling possible, if details view is selected.
 (The keyboard focus is set automatically to the search line)
 
 Fixed a bug in DMT sync, that a new entry in DTM was added 
 on every sync to Kx/Pi.
 
 Fixed missing writing of KA/Pi categories to DMT entries when syncing.
 
 Fixed a bug in DMT sync with todos created in KO/Pi containing
 non-latin1 characters.
 
 Rearranged package contents of Sharp-ipks and made all
 packages installable on SD again.
 
 Fixed the writing of addressbook data in DTM sync.
 Empty fields in KA/Pi were not removed. 
 
 Added better category handling in KA/Pi:
 Added item 
 Edit Categories and
 Manage new categories
 to the settings menu.
 Possible to configure a view to display categories.
 
 Added detailed "KDE Sync Howto" and "Multi Sync Howto" to Help menu.
 
 Fixed displaying of "free" days and time in KO Monthview and Agendaview.
 
 ... and many other bugfixes.
 
 ********** VERSION 1.9.10 ************
 
 Many internal small bugfixes.
 And fix of the "big" bug in KO/Pi, 
 that after Syncing the appointments had an offset by several hours.
 That was a problem with the internal timezone setting,
 introduced by the changed timezone configuration settings.
 
 German translation for OM/Pi is now available.
 
 
 ********** VERSION 1.9.9 ************
 
 KDE-Pim/Pi has a new Member!
 It is called PWM/Pi (Passwordmanager/platform-independent) 
 and it is available for the Zaurus.
 It is planned, that it will be available later for Windows.
 (And for Linux, of course).
 It is a port of the Passwordmanager of KDE.
 It will need the MicroKDElibs to run.
diff --git a/db2file/db2file b/db2file/db2file
index 6185930..c857319 100644
--- a/db2file/db2file
+++ b/db2file/db2file
diff --git a/db2file/zdbat_1.0.0-1_arm.ipk b/db2file/zdbat_1.0.0-1_arm.ipk
new file mode 100644
index 0000000..0dd61e1
--- a/dev/null
+++ b/db2file/zdbat_1.0.0-1_arm.ipk
diff --git a/db2file/zdbat_1.0.0_src.tar.gz b/db2file/zdbat_1.0.0_src.tar.gz
new file mode 100644
index 0000000..e722115
--- a/dev/null
+++ b/db2file/zdbat_1.0.0_src.tar.gz
diff --git a/microkde/kresources/manager.h b/microkde/kresources/manager.h
index 0e6f838..69062da 100644
--- a/microkde/kresources/manager.h
+++ b/microkde/kresources/manager.h
@@ -54,287 +54,285 @@ class ManagerListener
 // TODO:
 // The resource manager should provide some signals
 // to warn applications that resources have been added,
 // removed or modified.
 //
 // The manager should also keep track of which (or at least
 // how many) applications hve opened a resource, so that it
 // is only closed if none of them is using it any more
 
 template<class T>
 class Manager : private ManagerImplListener
 {
   public:
     class Iterator
     {
         friend class Manager;
       public:
         Iterator() {};
         Iterator( const Iterator &it ) { mIt = it.mIt; }
 
         T *operator*() { return static_cast<T *>( *mIt ); }
         Iterator &operator++() { mIt++; return *this; }
         Iterator &operator++(int) { mIt++; return *this; }
         Iterator &operator--() { mIt--; return *this; }
         Iterator &operator--(int) { mIt--; return *this; }
         bool operator==( const Iterator &it ) { return mIt == it.mIt; }
         bool operator!=( const Iterator &it ) { return mIt != it.mIt; }
 
       private:
         Resource::List::Iterator mIt;
     };
 
     Iterator begin()
     {
       Iterator it;
       it.mIt = mImpl->resourceList()->begin();
       return it;
     }
 
     Iterator end()
     {
       Iterator it;
       it.mIt = mImpl->resourceList()->end();
       return it;
     }
 
     class ActiveIterator
     {
         friend class Manager;
       public:
         ActiveIterator() : mList( 0 ) {};
         ActiveIterator( const ActiveIterator &it )
         {
           mIt = it.mIt;
           mList = it.mList;
         }
 
         T *operator*() { return static_cast<T *>( *mIt ); }
         ActiveIterator &operator++()
         {
           do { mIt++; } while ( checkActive() );
           return *this;
         }
         ActiveIterator &operator++(int)
         {
           do { mIt++; } while ( checkActive() );
           return *this;
         }
         ActiveIterator &operator--()
         {
           do { mIt--; } while ( checkActive() );
           return *this;
         }
         ActiveIterator &operator--(int)
         {
           do { mIt--; } while ( checkActive() );
           return *this;
         }
         bool operator==( const ActiveIterator &it ) { return mIt == it.mIt; }
         bool operator!=( const ActiveIterator &it ) { return mIt != it.mIt; }
 
       private:
         /**
           Check if iterator needs to be advanced once more.
         */
         bool checkActive()
         {
           if ( !mList || mIt == mList->end() ) return false;
           return !(*mIt)->isActive();
         }
 
         Resource::List::Iterator mIt;
         Resource::List *mList;
     };
 
     ActiveIterator activeBegin()
     {
       ActiveIterator it;
       it.mIt = mImpl->resourceList()->begin();
       it.mList = mImpl->resourceList();
       if ( it.mIt != mImpl->resourceList()->end() ) {
         if ( !(*it)->isActive() ) it++;
       }
       return it;
     }
 
     ActiveIterator activeEnd()
     {
       ActiveIterator it;
       it.mIt = mImpl->resourceList()->end();
       it.mList = mImpl->resourceList();
       return it;
     }
 
     bool isEmpty() const { return mImpl->resourceList()->isEmpty(); }
 
     Manager( const QString &family )
     {
       mFactory = Factory::self( family );
       // The managerimpl will use the same Factory object as the manager
       // because of the Factory::self() pattern
       mImpl = new ManagerImpl( family );
       mImpl->setListener( this );
 
       mListeners = new QPtrList<ManagerListener<T> >;
     }
 
     virtual ~Manager()
     {
       mImpl->setListener( 0 );
       delete mListeners;
       delete mImpl;
     }
 
     /**
       Recreate Resource objects from configuration file. If cfg is 0, read standard
       configuration file.
     */
     void readConfig( KConfig *cfg = 0 )
     {
       mImpl->readConfig( cfg );
     }
 
     /**
       Write configuration of Resource objects to configuration file. If cfg is 0, write
       to standard configuration file.
     */
     void writeConfig( KConfig *cfg = 0 )
     {
       mImpl->writeConfig( cfg );
     }
 
     /**
       Add resource to manager. This passes ownership of the Resource object
       to the manager.
     */
     void add( Resource *resource )
     {
       if ( resource ) mImpl->add( resource );
     }
 
     void remove( Resource *resource )
     {
       if ( resource ) mImpl->remove( resource );
     }
 
     T* standardResource()
     {
       return static_cast<T *>( mImpl->standardResource() );
     }
 
     void setStandardResource( T *resource )
     {
       if ( resource ) mImpl->setStandardResource( resource );
     }
 
     void setActive( Resource *resource, bool active )
     {
       if ( resource ) mImpl->setActive( resource, active );
     }
 
     /**
       Returns a list of the names of the reources managed by the
       Manager for this family.
     */
     QStringList resourceNames() const
     {
       return mImpl->resourceNames();
     }
 
     ConfigWidget *configWidget( const QString& type, QWidget *parent = 0 )
     {
-      return mFactory->resourceConfigWidget( type, parent );
+      return mFactory->configWidget( type, parent );
     }
 
     /**
       Creates a new resource of type @param type, with default
       settings. The resource is
       not added to the manager, the application has to do that.
       Returns a pointer to a resource object or a null pointer
       if resource type doesn't exist.
 
       @param type   The type of the resource, one of those returned
                     by @ref resourceTypeNames()
     */
     T *createResource( const QString& type )
     {
       return (T *)( mFactory->resource( type, 0 ) );
     }
 
     /**
       Returns a list of the names of all available resource types.
     */
     QStringList resourceTypeNames() const
     {
       return mFactory->typeNames();
     }
 
     QStringList resourceTypeDescriptions() const
     {
       QStringList typeDescs;
       QStringList types = mFactory->typeNames();
 
       for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it ) {
         QString desc = mFactory->typeName( *it );
         if ( !mFactory->typeDescription( *it ).isEmpty() )
           desc += " (" + mFactory->typeDescription( *it ) + ")";
 
         typeDescs.append( desc );
       }
 
       return typeDescs;
     }
 
     void resourceChanged( T *resource )
     {
       mImpl->resourceChanged( resource );
     }
 
     void addListener( ManagerListener<T> *listener )
     {
       mListeners->append( listener );
     }
 
     void removeListener( ManagerListener<T> *listener )
     {
       mListeners->remove( listener );
     }
 
     virtual void resourceAdded( Resource *res )
     {
-      kdDebug(5650) << "Manager::resourceAdded " << res->resourceName() << endl;
       T* resource = (T *)( res );
       ManagerListener<T> *listener;
       for ( listener = mListeners->first(); listener; listener = mListeners->next() )
         listener->resourceAdded( resource );
     }
 
     virtual void resourceModified( Resource *res )
     {
-      kdDebug(5650) << "Manager::resourceModified " << res->resourceName() << endl;
+     
       T* resource = (T *)( res );
       ManagerListener<T> *listener;
       for ( listener = mListeners->first(); listener; listener = mListeners->next() )
         listener->resourceModified( resource );
     }
 
     virtual void resourceDeleted( Resource *res )
     {
-      kdDebug(5650) << "Manager::resourceDeleted " << res->resourceName() << endl;
+     
       T* resource = (T *)( res );
       ManagerListener<T> *listener;
       for ( listener = mListeners->first(); listener; listener = mListeners->next() ) {
-        kdDebug(5650) << "Notifying a listener to Manager..." << endl;
         listener->resourceDeleted( resource );
       }
     }
 
   private:
     ManagerImpl *mImpl;
     Factory *mFactory;
     QPtrList<ManagerListener<T> > *mListeners;
 };
 
 }
 
 #endif