today added

8 files changed, 402 insertions, 279 deletions

diff --git a/Makefile b/Makefile
index a24fc09..594d47d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,279 +1,385 @@
-#############################################################################
-# Makefile for building: kdepim-desktop
-# Generated by qmake (1.07a) (Qt 3.3.3) on: Wed Apr 13 21:23:44 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-kabc-plugins-file \
-		sub-kabc-plugins-dir \
-		sub-kabc-plugins-qtopia \
-		sub-libical \
-		sub-libkcal \
-		sub-kabc \
-		sub-libkdepim \
-		sub-microkde \
-		sub-korganizer \
-		sub-kaddressbook \
-		sub-gammu-emb-common \
-		sub-gammu-emb-gammu \
-		sub-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)
-
-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/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)
-
-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)
-
-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)
-
-libetpan/$(MAKEFILE): 
-	@$(CHK_DIR_EXISTS) "libetpan" || $(MKDIR) "libetpan"
-	cd libetpan && $(QMAKE) libetpan.pro -o $(MAKEFILE)
-sub-libetpan: libetpan/$(MAKEFILE) FORCE
-	cd 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 variables.pri
-	$(QMAKE) -o Makefile kdepim-desktop.pro
-qmake: qmake_all
-	@$(QMAKE) -o Makefile kdepim-desktop.pro
-
-all: $(SUBTARGETS)
-qmake_all: kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) kabc/plugins/qtopia/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) kabc/$(MAKEFILE) libkdepim/$(MAKEFILE) microkde/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) 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 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/qtopia ] && cd kabc/plugins/qtopia ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-	 ( [ -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 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 libetpan ] && cd 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 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/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -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 gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-	 ( [ -d libetpan ] && cd 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 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/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-	 ( [ -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 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 libetpan ] && cd 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 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/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) install; ) || true
-	 ( [ -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 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 libetpan ] && cd 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 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/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-	 ( [ -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 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 libetpan ] && cd 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 = \
+   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 dest
+	mkdir -p dest$(LIBICAL_PATH)
+	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 
+
+pac:
+	rm -f $(QPEDIR)/lib/libmicro*
+	rm -f $(QPEDIR)/plugins/applets/libkopi*
+	make
+	make install
+	make dist
+install:
+
+	cd bin/kdepim; make install
+	cp -r Pim $(QPEDIR)/apps
+	cp db2file/db2file $(QPEDIR)/bin/db2file
+	chmod ugo+x $(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 *ipk.zip
+	rm -rf ../kdepimpi_$(KDEPIM_VERSION)/*
+	rm -f *~
+	cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
+	cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
+	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
+	zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
+	mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
+	mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
+	mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
+
+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) \
+       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)
+
+libetpan/Makefile$(PLATFORM): libetpan/libetpanE.pro
+	cd 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/kaddressbook/icons16/today_small.png b/bin/kdepim/kaddressbook/icons16/today_small.png
new file mode 100644
index 0000000..fcc4ac2
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons16/today_small.png
diff --git a/bin/kdepim/kaddressbook/icons22/today_small.png b/bin/kdepim/kaddressbook/icons22/today_small.png
new file mode 100644
index 0000000..fcc4ac2
--- a/dev/null
+++ b/bin/kdepim/kaddressbook/icons22/today_small.png
diff --git a/bin/kdepim/korganizer/today_small.png b/bin/kdepim/korganizer/today_small.png
new file mode 100644
index 0000000..fcc4ac2
--- a/dev/null
+++ b/bin/kdepim/korganizer/today_small.png
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index d4aa78c..3b2a276 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -133,24 +133,27 @@ void KOEditorGeneralEvent::initTime(QWidget *parent,QBoxLayout *topLayout)
 
   // time widgets are checked if they contain a valid time
   connect(mStartTimeEdit, SIGNAL(timeChanged(QTime)),
 	  this, SLOT(startTimeChanged(QTime)));
   connect(mEndTimeEdit, SIGNAL(timeChanged(QTime)),
 	  this, SLOT(endTimeChanged(QTime)));
 
   // date widgets are checked if they contain a valid date
   connect(mStartDateEdit, SIGNAL(dateChanged(QDate)),
 	  this, SLOT(startDateChanged(QDate)));
   connect(mEndDateEdit, SIGNAL(dateChanged(QDate)),
 	  this, SLOT(endDateChanged(QDate)));
+  connect(mStartDateEdit,SIGNAL(setTimeTo(QTime)),mStartTimeEdit,SLOT(setTime(QTime)));
+  connect(mEndDateEdit,SIGNAL(setTimeTo(QTime)),mEndTimeEdit,SLOT(setTime(QTime)));
+
 }
 
 void KOEditorGeneralEvent::initClass(QWidget *parent,QBoxLayout *topLayout)
 {
   QBoxLayout *classLayout = new QHBoxLayout(topLayout);
 
   QLabel *freeTimeLabel = new QLabel(i18n("Show time as:"),parent);
   classLayout->addWidget(freeTimeLabel);
 
   mFreeTimeCombo = new QComboBox(false, parent);
   mFreeTimeCombo->insertItem(i18n("Busy"));
   mFreeTimeCombo->insertItem(i18n("Free"));
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index a03ec52..4a1576a 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -115,24 +115,26 @@ void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout)
 
   mStartDateEdit = new KDateEdit(timeBoxFrame);
   layoutTimeBox->addWidget(mStartDateEdit,1,1);
 
   mStartTimeEdit = new KOTimeEdit(timeBoxFrame);
   layoutTimeBox->addWidget(mStartTimeEdit,1,2);
 
 
   mTimeButton = new QCheckBox(i18n("Time associated"),timeBoxFrame);
   layoutTimeBox->addMultiCellWidget(mTimeButton,2,2,0,1);
 
   connect(mTimeButton,SIGNAL(toggled(bool)),SLOT(enableTimeEdits(bool)));
+  connect(mDueDateEdit,SIGNAL(setTimeTo(QTime)),mDueTimeEdit,SLOT(setTime(QTime)));
+  connect(mStartDateEdit,SIGNAL(setTimeTo(QTime)),mStartTimeEdit,SLOT(setTime(QTime)));
   
   // some more layouting
   //layoutTimeBox->setColStretch(3,1);  
 }
 
 
 void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout)
 {
   mCompletedCombo = new QComboBox(parent);
   // xgettext:no-c-format
   mCompletedCombo->insertItem(i18n("  0 %"));
   // xgettext:no-c-format
@@ -150,29 +152,30 @@ void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout)
 
   mCompletedLabel = new QLabel(i18n("completed"),parent);
   topLayout->addWidget(mCompletedLabel); 
 
   mCompleteDateEdit = new KDateEdit(parent);
   topLayout->addWidget(mCompleteDateEdit ); 
 
   mCompleteTimeEdit = new KOTimeEdit(parent);
   topLayout->addWidget( mCompleteTimeEdit); 
 
   mCompletedCombo->setSizePolicy( QSizePolicy( QSizePolicy::Preferred,QSizePolicy::Preferred) );
   mCompletedLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding,QSizePolicy::Preferred) );
+  connect(mCompleteDateEdit,SIGNAL(setTimeTo(QTime)),mCompleteTimeEdit,SLOT(setTime(QTime)));
 
   if (  QApplication::desktop()->width() <= 480 ) {
       if (  QApplication::desktop()->width() < 320 )
           mCompleteDateEdit->setMaximumWidth( 85 );
-      else
+      else 
           mCompleteDateEdit->setMaximumWidth( 140 );
       topLayout->setSpacing( 0 );
   }
 }
 
 void KOEditorGeneralTodo::initPriority(QWidget *parent, QBoxLayout *topLayout)
 {
 
     QHBox* h = new QHBox ( parent );
     topLayout->addWidget( h );
   QLabel *priorityLabel = new QLabel(i18n("Priority:"), h);
   // topLayout->addWidget(priorityLabel);
diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp
index 3d9e690..bf38479 100644
--- a/libkdepim/kdateedit.cpp
+++ b/libkdepim/kdateedit.cpp
@@ -59,38 +59,42 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP )
   palette.setColor( QColorGroup::Highlight, QColor(red,green,blue) );
   palette.setColor( QColorGroup::HighlightedText, palette.color( QPalette::Normal , QColorGroup::Foreground ) );
   mDateEdit->setPalette( palette );
 
   if ( withoutDP ) {
       mDateFrame = 0;
       mDateButton = 0;
       mDatePicker = 0;
   } else {
       QPixmap pixmap = SmallIcon("smallcal");
       mDateButton = new QPushButton(this);
       mDateButton->setPixmap(pixmap);
+      QPixmap pixmap2 = SmallIcon("today_small");
+      QPushButton*  nowButton = new QPushButton(this);
+      nowButton->setPixmap(pixmap2);
 
       mDateFrame = new QVBox(0,0,WType_Popup);
       // mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised);
       mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised );
       mDateFrame->setLineWidth(3);
       mDateFrame->hide();
 
       mDatePicker = new KDatePicker(mDateFrame,QDate::currentDate());
       connect(mDatePicker,SIGNAL(dateEntered(QDate)),SLOT(setDate(QDate)));
       connect(mDatePicker,SIGNAL(dateEntered(QDate)),SIGNAL(dateChanged(QDate)));
       connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(setDate(QDate)));
       connect(mDatePicker,SIGNAL(dateSelected(QDate)),SIGNAL(dateChanged(QDate)));
       connect(mDatePicker,SIGNAL(dateSelected(QDate)),mDateFrame,SLOT(hide()));
       connect(mDateButton,SIGNAL(clicked()),SLOT(toggleDatePicker()));
+      connect(nowButton,SIGNAL(clicked()),SLOT(goToNow()));
       mDateButton->setFocusPolicy( QWidget::NoFocus ); 
       mDateButton->setAutoDefault( false ); 
       //mDateFrame->resize( 400, 300 );
       
   }
       connect(mDateEdit,SIGNAL(returnPressed()),SLOT(lineEnterPressed()));
       connect(mDateEdit,SIGNAL(textChanged(const QString &)),
               SLOT(textChanged(const QString &)));
 
   // Create the keyword list. This will be used to match against when the user
   // enters information.
   mKeywordMap[i18n("tomorrow")] = 1;
@@ -123,24 +127,29 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP )
 
 KDateEdit::~KDateEdit()
 {
   delete mDateFrame;
 }
 void KDateEdit::clear()
 {
   bool b = mDateEdit->signalsBlocked();
   mDateEdit->blockSignals(true);
   mDateEdit->setText("");
   mDateEdit->blockSignals(b);
 }
+void KDateEdit::goToNow()
+{
+    setDate(QDate::currentDate() );
+    emit setTimeTo( QTime::currentTime() );
+}
 void KDateEdit::setDate(QDate newDate)
 {
   if (!newDate.isValid() && !mHandleInvalid)
     return;
   if ( readDate() ==  newDate )
       return;
   QString dateString = "";
   if(newDate.isValid())
     dateString = KGlobal::locale()->formatDate( newDate, dateFormShort );
 
   mTextChanged = false;
 
diff --git a/libkdepim/kdateedit.h b/libkdepim/kdateedit.h
index cf3b90a..2d8c452 100644
--- a/libkdepim/kdateedit.h
+++ b/libkdepim/kdateedit.h
@@ -78,45 +78,47 @@ class KDateEdit : public QHBox
     * to display the proper date when the focus leaves.
     */
     virtual bool eventFilter(QObject *o, QEvent *e);
     void toggleDateFormat();
     void clear();
   signals:
     /** This signal is emitted whenever the user modifies the date. This
     * may not get emitted until the user presses enter in the line edit or
     * focus leaves the widget (ie: the user confirms their selection).
     */
     void dateChanged(QDate);
     void returnPressed();
+    void setTimeTo( QTime );
   public slots:
     /** Sets the date.
     *
     * @param date The new date to display. This date must be valid or
     * it will not be displayed.
     */
     void setDate(QDate date);
     // set Date with key_up key_down to relation of cursor Position
     // and set selection from begin to end of single date
     void setDate(QDate, int *cpos, const int, const bool);
 
     /** Sets the date edit to be enabled or disabled (grayed out)
     *
     * @param on Enabled if true, disabled if false
     */
     void setEnabled(bool on);
 
   protected slots:
     void toggleDatePicker();
     void lineEnterPressed();
     void textChanged(const QString &);
+    void goToNow();
 
   private:
     /** Reads the text from the line edit. If the text is a keyword, the
     * word will be translated to a date. If the text is not a keyword, the
     * text will be interpreted as a date.
     */
     QDate readDate() const;
 
     /** Maps the text that the user can enter to the offset in days from
     * today. For example, the text 'tomorrow' is mapped to +1.
     */
     QMap<QString, int> mKeywordMap;