3 files changed, 285 insertions, 372 deletions
diff --git a/Makefile b/Makefile
index 467710f..dbc91ad 100644
--- a/Makefile
+++ b/Makefile
@@ -1,368 +1,253 @@
-export KDEPIMDIR = $(shell pwd)
+#############################################################################
+# Makefile for building: kdepim-desktop
-export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version)
+# Generated by qmake (1.07a) (Qt 3.3.1) on: Thu Oct 28 15:32:28 2004
+# Project:  kdepim-desktop.pro
-ifeq ($(PLATFORM) , zaurus)
+# Template: subdirs
-  BUILD_NO_LDAP_PLUGIN=1
+# Command: $(QMAKE) -o Makefile kdepim-desktop.pro
-endif
+#############################################################################
-ifneq ($(PLATFORM) , zaurus)
+        MAKEFILE =Makefile
-  BUILD_NO_SHARP_PLUGIN=1
+        QMAKE    =qmake
-endif
+DEL_FILE =    rm -f
+CHK_DIR_EXISTS= test -d
-#opie plugin is deprecated. The qtopia plugin handles the task from now on.
+MKDIR    = mkdir -p
-BUILD_NO_OPIE_PLUGIN=1
+        SUBTARGETS = \
+                sub-gammu-emb-common \
-SUBDIRS_MICROKDE = \
+                sub-gammu-emb-gammu \
-   libical/src/libical \
+                sub-libical \
-   libical/src/libicalss \
+                sub-libkcal \
-   qtcompat \
+                sub-microkde \
-   microkde \
+                sub-libkdepim \
-   libkcal \
+                sub-kabc \
-   libkdepim \
+                sub-korganizer \
-   kabc \
+                sub-kaddressbook \
-   kabc/formats/binary \
+                sub-kabc-plugins-file \
-   kabc/plugins/file \
+                sub-kabc-plugins-dir \
-   kabc/plugins/dir \
+                sub-kabc-plugins-file \
-   korganizer \
+                sub-kabc-plugins-qtopia \
-   kalarmd \
+                sub-pwmanager-libcrypt-cipher \
-   kaddressbook
+                sub-pwmanager-libcrypt-error \
+                sub-pwmanager-libcrypt-mpi \
-SUBDIRS_QTOPIA_PLUGIN = \
+                sub-pwmanager-libcrypt-zlib \
-   kabc/plugins/qtopia
+                sub-pwmanager-pwmanager
-SUBDIRS_OPIE_PLUGIN = \
+first: all
-   kabc/plugins/opie
+all: Makefile $(SUBTARGETS)
-SUBDIRS_SHARP_PLUGIN = \
-   kabc/plugins/sharpdtm
+gammu/emb/common/$(MAKEFILE): 
+        @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
-SUBDIRS_LDAP_PLUGIN = \
+        cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE)
-   kabc/plugins/ldap
+sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
+        cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
-SUBDIRS_MICROMAIL = \
-   kmicromail/libetpan \
+gammu/emb/gammu/$(MAKEFILE): 
-   kmicromail/libmailwrapper \
+        @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu"
-   kmicromail
+        cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE)
+sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
-SUBDIRS_GAMMU = \
+        cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
-   gammu/emb/common \
-   gammu/emb/gammu
+libical/$(MAKEFILE): 
+        @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
-SUBDIRS_PWMANAGER = \
+        cd libical && $(QMAKE) libical.pro -o $(MAKEFILE)
-   pwmanager/libcrypt/mpi  \
+sub-libical: libical/$(MAKEFILE) FORCE
-   pwmanager/libcrypt/error  \
+        cd libical && $(MAKE) -f $(MAKEFILE)
-   pwmanager/libcrypt/cipher  \
-   pwmanager/libcrypt/zlib \
+libkcal/$(MAKEFILE): 
-   pwmanager/pwmanager
+        @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
+        cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE)
-SUBDIRS = \
+sub-libkcal: libkcal/$(MAKEFILE) FORCE
-   $(SUBDIRS_MICROKDE) \
+        cd libkcal && $(MAKE) -f $(MAKEFILE)
-   $(SUBDIRS_QTOPIA_PLUGIN) \
-   $(SUBDIRS_OPIE_PLUGIN) \
+microkde/$(MAKEFILE): 
-   $(SUBDIRS_SHARP_PLUGIN) \
+        @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
-   $(SUBDIRS_LDAP_PLUGIN) \
+        cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE)
-   $(SUBDIRS_MICROMAIL) \
+sub-microkde: microkde/$(MAKEFILE) FORCE
-   $(SUBDIRS_GAMMU) \
+        cd microkde && $(MAKE) -f $(MAKEFILE)
-   $(SUBDIRS_PWMANAGER) 
+libkdepim/$(MAKEFILE): 
+        @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
-all: build_microkde \
+        cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE)
-     build_qtopia_plugin \
+sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
-     build_opie_plugin \
+        cd libkdepim && $(MAKE) -f $(MAKEFILE)
-     build_sharp_plugin \
-     build_ldap_plugin \
+kabc/$(MAKEFILE): 
-     build_micromail \
+        @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
-     build_gammu \
+        cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE)
-     build_pwmanager
+sub-kabc: kabc/$(MAKEFILE) FORCE
+        cd kabc && $(MAKE) -f $(MAKEFILE)
-build_microkde: variable_test tmake
+korganizer/$(MAKEFILE): 
-        for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
+        @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+        cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE)
-          done
+sub-korganizer: korganizer/$(MAKEFILE) FORCE
+        cd korganizer && $(MAKE) -f $(MAKEFILE)
-build_qtopia_plugin: build_microkde
-  ifdef BUILD_NO_QTOPIA_PLUGIN
+kaddressbook/$(MAKEFILE): 
-        @echo == qtopia plugin not build.
+        @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
-  else
+        cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE)
-        for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
+sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+        cd kaddressbook && $(MAKE) -f $(MAKEFILE)
-          done
-  endif
+kabc/plugins/file/$(MAKEFILE): 
+        @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
-build_opie_plugin: build_microkde
+        cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
-  ifdef BUILD_NO_OPIE_PLUGIN
+sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
-        @echo == opie plugin not build.
+        cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
-  else
-        for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
+kabc/plugins/dir/$(MAKEFILE): 
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+        @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
-          done
+        cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE)
-  endif
+sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
+        cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
-build_sharp_plugin: build_microkde
-  ifdef BUILD_NO_SHARP_PLUGIN
+kabc/plugins/file/$(MAKEFILE): 
-        @echo == ldap plugin not build.
+        @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
-  else
+        cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
-        for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
+sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+        cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
-          done
-  endif
+kabc/plugins/qtopia/$(MAKEFILE): 
-  
+        @$(CHK_DIR_EXISTS) "kabc/plugins/qtopia" || $(MKDIR) "kabc/plugins/qtopia"
-build_ldap_plugin: build_microkde
+        cd kabc/plugins/qtopia && $(QMAKE) qtopia.pro -o $(MAKEFILE)
-  ifdef BUILD_NO_LDAP_PLUGIN
+sub-kabc-plugins-qtopia: kabc/plugins/qtopia/$(MAKEFILE) FORCE
-        @echo == ldap plugin not build.
+        cd kabc/plugins/qtopia && $(MAKE) -f $(MAKEFILE)
-  else
-          for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
+pwmanager/libcrypt/cipher/$(MAKEFILE): 
-            make -f Makefile$(PLATFORM) || exit 1; popd; \
+        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/cipher" || $(MKDIR) "pwmanager/libcrypt/cipher"
-          done
+        cd pwmanager/libcrypt/cipher && $(QMAKE) cipher.pro -o $(MAKEFILE)
-  endif
+sub-pwmanager-libcrypt-cipher: pwmanager/libcrypt/cipher/$(MAKEFILE) FORCE
+        cd pwmanager/libcrypt/cipher && $(MAKE) -f $(MAKEFILE)
-build_micromail: build_microkde
+pwmanager/libcrypt/error/$(MAKEFILE): 
-  ifdef BUILD_NO_MICROMAIL
+        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/error" || $(MKDIR) "pwmanager/libcrypt/error"
-        @echo == kmicromail not build.
+        cd pwmanager/libcrypt/error && $(QMAKE) error.pro -o $(MAKEFILE)
-  else
+sub-pwmanager-libcrypt-error: pwmanager/libcrypt/error/$(MAKEFILE) FORCE
-        for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
+        cd pwmanager/libcrypt/error && $(MAKE) -f $(MAKEFILE)
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
+pwmanager/libcrypt/mpi/$(MAKEFILE): 
-  endif
+        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/mpi" || $(MKDIR) "pwmanager/libcrypt/mpi"
+        cd pwmanager/libcrypt/mpi && $(QMAKE) mpi.pro -o $(MAKEFILE)
-build_gammu: variable_test tmake
+sub-pwmanager-libcrypt-mpi: pwmanager/libcrypt/mpi/$(MAKEFILE) FORCE
-  ifdef BUILD_NO_GAMMU
+        cd pwmanager/libcrypt/mpi && $(MAKE) -f $(MAKEFILE)
-        @echo == gammu not build.
-  else
+pwmanager/libcrypt/zlib/$(MAKEFILE): 
-        for i in $(SUBDIRS_GAMMU); do pushd $$i; \
+        @$(CHK_DIR_EXISTS) "pwmanager/libcrypt/zlib" || $(MKDIR) "pwmanager/libcrypt/zlib"
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+        cd pwmanager/libcrypt/zlib && $(QMAKE) zlib.pro -o $(MAKEFILE)
-          done
+sub-pwmanager-libcrypt-zlib: pwmanager/libcrypt/zlib/$(MAKEFILE) FORCE
-  endif
+        cd pwmanager/libcrypt/zlib && $(MAKE) -f $(MAKEFILE)
-build_pwmanager: build_microkde
+pwmanager/pwmanager/$(MAKEFILE): 
-  ifdef BUILD_NO_PWMANAGER
+        @$(CHK_DIR_EXISTS) "pwmanager/pwmanager" || $(MKDIR) "pwmanager/pwmanager"
-        @echo == pwmanager not build.
+        cd pwmanager/pwmanager && $(QMAKE) pwmanager.pro -o $(MAKEFILE)
-  else
+sub-pwmanager-pwmanager: pwmanager/pwmanager/$(MAKEFILE) FORCE
-        for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \
+        cd pwmanager/pwmanager && $(MAKE) -f $(MAKEFILE)
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
+Makefile: kdepim-desktop.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-  endif
+        $(QMAKE) -o Makefile kdepim-desktop.pro
+qmake: qmake_all
+        @$(QMAKE) -o Makefile kdepim-desktop.pro
-variable_info:
-        @echo --------------------------------------
+all: $(SUBTARGETS)
-        @echo KDEPIM buildsystem, variableinfo...
+qmake_all: gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/qtopia/$(MAKEFILE) pwmanager/libcrypt/cipher/$(MAKEFILE) pwmanager/libcrypt/error/$(MAKEFILE) pwmanager/libcrypt/mpi/$(MAKEFILE) pwmanager/libcrypt/zlib/$(MAKEFILE) pwmanager/pwmanager/$(MAKEFILE)
-        @echo KDEPIMDIR=$(KDEPIMDIR)
+         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo QTDIR=$(QTDIR)
+         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo QPEDIR=$(QPEDIR)
+         ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo OPIEDIR=$(OPIEDIR)
+         ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo PLATFORM=$(PLATFORM)
+         ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
+         ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
+         ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
+         ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
+         ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
+         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        ifndef BUILD_NO_SHARP_PLUGIN
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo SHARPDTMSDK=$(SHARPDTMSDK)
+         ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        endif
+         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
+         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
+         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo --------------------------------------
+         ( [ -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
-variable_test: variable_info
+clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
-        @echo KDEPIM buildsystem, variablecheck...
+         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  ifndef KDEPIMDIR
+         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-        @echo KDEPIMDIR is not defined.
+         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-        $(error KDEPIMDIR is not defined)
+         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  endif
+         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  ifndef PLATFORM
+         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-        @echo PLATFORM is not defined.
+         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-        $(error PLATFORM is not defined)
+         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  endif
+         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  ifdef BUILD_NO_LDAP_PLUGIN
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-        @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
+         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  endif
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  ifdef BUILD_NO_OPIE_PLUGIN
+         ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-        @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
+         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  endif
+         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  ifdef BUILD_NO_QTOPIA_PLUGIN
+         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-        @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
+         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  endif
+         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  ifdef BUILD_NO_MICROMAIL
+uninstall_subdirs: qmake_all FORCE
-        @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
+         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  endif
+         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  ifdef BUILD_NO_SHARP_PLUGIN
+         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-        @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
+         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  else
+         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  ifndef SHARPDTMSDK
+         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-        @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
+         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-        $(error SHARPDTMSDK is not defined)
+         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  endif
+         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  endif
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  ifdef BUILD_NO_GAMMU
+         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-        @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  endif
+         ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  ifdef BUILD_NO_PWMANAGER
+         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-        @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
+         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  endif
+         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-        @echo --------------------------------------
+         ( [ -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
-objects:
+         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
+         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
+         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        mkdir -p libical/lib/$(PLATFORM)
+         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        mkdir -p pwmanager/libcrypt/$(PLATFORM)
+         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
+         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
-clean:
+         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        rm -rf libical/lib/$(PLATFORM)/*;
+         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
+         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
-          rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
+         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
-          done 
+         ( [ -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
-install:
+         ( [ -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
-        cd bin/kdepim; make install
+         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        cp -r Pim $(QPEDIR)/apps
+         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        cp db2file/db2file $(QPEDIR)/bin/db2file
+         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
+distclean: qmake_all FORCE
-        cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
+         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
+         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
+         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-    
+         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-dist: 
+         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo Dont forget to do "make install" before "make dist"
+         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        rm -f *arm.ipk
+         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        rm -f *~
+         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
+         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        mkipks kmicrokdelibs.control
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        mkipks korganizer.control
+         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        mkipks kaddressbook.control
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-  ifndef BUILD_NO_MICROMAIL
+         ( [ -d kabc/plugins/qtopia ] && cd kabc/plugins/qtopia ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        mkipks kopiemail.control
+         ( [ -d pwmanager/libcrypt/cipher ] && cd pwmanager/libcrypt/cipher ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-  endif
+         ( [ -d pwmanager/libcrypt/error ] && cd pwmanager/libcrypt/error ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-  ifndef BUILD_NO_SHARP_PLUGIN
+         ( [ -d pwmanager/libcrypt/mpi ] && cd pwmanager/libcrypt/mpi ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        mkipks ksharpPIM-DTMaccess.control
+         ( [ -d pwmanager/libcrypt/zlib ] && cd pwmanager/libcrypt/zlib ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-  endif
+         ( [ -d pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        mkipks korganizer-alarm.control
-  ifndef BUILD_NO_GAMMU
+install:  install_subdirs
-        mkipks kmobilephoneaccess.control
-  endif
+uninstall:  uninstall_subdirs
-  ifndef BUILD_NO_PWMANAGER
-        mkipks pwmanager.control
+FORCE:
-  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/Zaurus-KDE_syncHowTo.txt b/bin/kdepim/Zaurus-KDE_syncHowTo.txt
index 6ceabdb..8186dd7 100644
--- a/bin/kdepim/Zaurus-KDE_syncHowTo.txt
+++ b/bin/kdepim/Zaurus-KDE_syncHowTo.txt
@@ -78,66 +78,69 @@ Same way is KA/Pi working.
 *****************************************************
 Download latest version of KA/Pi+KO/Pi from
 http://sourceforge.net/projects/kdepimpi/
 Project KDE/Pim.
 Direct link is:
 http://sourceforge.net/project/showfiles.php?group_id=104103&package_id=112604
 Click on the version number to read the release notes/change log.
 Choose there the right precompiled package for your Z:
 For Sharp ROM
 -File: kdepim_1.x.xx_for_SharpROM.ipk.zip
 For Open Zaurus ROM:
 -File: kdepim_1.x.xx_for_OZ-gcc3xx.ipk.zip
 If unsure, choose:
 -File: kdepim_1.x.xx_for_SharpROM.ipk.zip
 Unzip the file and install the packages as usual on your Z.
 In order to intstall KA/Pi+KO/Pi on your Z,
 you need to install the following files:
 kmicrokdelibs_1.x.xx_arm.ipk  
 kaddressbook_1.x.xx_arm.ipk
 korganizer_1.x.xx_arm.ipk
 *****************************************************
 2) Installing desktop version of KA/Pi+KO/Pi on the desktop
 *****************************************************
 Precompiled packages are available for SuSE 9.1.
 Choose on the above download location:
 File: KDE-Pim-Pi-1.9.11-SuSE9.1.i586.rpm
 Download file and install it on console with
 su
-rpm -ihv KDE-Pim-Pi-1.9.11-SuSE9.1.i586.rpm
+rpm -ihv KDE-Pim-Pi-1.9.11-SuSE_9.1.i586.rpm
-(NOTE:update with rpm -Uhv KDE-Pim-Pi-1.9.11-SuSE9.1.i586.rpm)
+NOTE:update with 
+            rpm -Uhv KDE-Pim-Pi-1.9.11-SuSE_9.1.i586.rpm
+     erase (uninstall) with
+            rpm -e KDE-Pim-Pi-1.9.11-SuSE_9.1     
 NOTE for users of SuSE 9.1:
 You need KDE version 3.3.0 or higher on your desktop.
 Plese make an online update in SuSE (YAST), then update
 your KDE to version 3.3.0 or higher.
 You can find links to updated precompiled versions of KDE 
 for SuSE 9.1 on the SusE web site, 
 a direct link is for example:
 ftp://ftp.gwdg.de/pub/linux/suse/ftp.suse.com/suse/i386/supplementary/KDE/update_for_9.1
 HOWTO UPDATE KDE:
 Download there the packages in "base".
 And the needed package for your language in "internationalization".
 Put all downloaded files in one "installation" directory.
 Open console and go to the downloaded "installation" directory.
 Do there a
 su
 and then perform a test for the update:
 rpm -Uhv --test *.rpm
 If no dependencies are shown, you can do the actual update with 
 rpm -Uhv *.rpm
 If there are missing dependencies, you can resolve them by
 - download the needed updated KDE package from the 
    "applications" or from the "development" folder on the server.
 - adding a needed rpm package from the SuSE install DVD
 - remove the package that has dependencies from your "installation" directory.
 Do the 
 rpm -Uhv --test *.rpm
 until you get no dependencies and no errors, then do a
 rpm -Uhv *.rpm
 Run
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 9857e3e..9a1f2a9 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -322,64 +322,65 @@ void KSyncManager::slotSyncMenu( int action )
    }
    delete temp;
    setBlockSave(false);
 }
 void KSyncManager::enableQuick( bool ask )
 {
    bool autoStart;
    bool changed = false;
    if ( ask ) {
        QDialog dia ( 0, "input-dialog", true );
        QLineEdit lab ( &dia );
        QVBoxLayout lay( &dia );
        lab.setText( mPrefs->mPassiveSyncPort );
        lay.setMargin(7);
        lay.setSpacing(7);
        int po = 9197+mTargetApp;
        QLabel label ( i18n("Port number (Default: %1)").arg(po), &dia );
        lay.addWidget( &label);
        lay.addWidget( &lab);
        QLineEdit lepw ( &dia );
        lepw.setText( mPrefs->mPassiveSyncPw );
        QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia );
        lay.addWidget( &label2);
        lay.addWidget( &lepw);
        QCheckBox autostart(i18n("Automatically start\nat application startup"), &dia );
        lay.addWidget( &autostart);
        autostart.setChecked( mPrefs->mPassiveSyncAutoStart );
 #ifdef DESKTOP_VERSION
 #ifdef _WIN32_
        QCheckBox syncdesktop( i18n("Automatically sync with Outlook\nwhen receiving sync request"),&dia );
+        syncdesktop.hide();// not implemented!
 #else
        QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia );
 #endif
        lay.addWidget( &syncdesktop);
 #else
        mPrefs->mPassiveSyncWithDesktop = false;
        QCheckBox syncdesktop( i18n("Automatically sync\nwith KDE-Desktop"),&dia );
        syncdesktop.hide();
 #endif
        syncdesktop.setChecked( mPrefs->mPassiveSyncWithDesktop );
        dia.setFixedSize( 230,120 );
        dia.setCaption( i18n("Enter port for Pi-Sync") );
        QPushButton pb ( "OK",  &dia);
        lay.addWidget( &pb );
        connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
        dia.show();
        if ( ! dia.exec() )
            return;
        dia.hide();
        qApp->processEvents();
        if ( mPrefs->mPassiveSyncPw != lepw.text() ) {
            changed = true;
            mPrefs->mPassiveSyncPw = lepw.text();
        }
        if ( mPrefs->mPassiveSyncPort != lab.text() ) {
            mPrefs->mPassiveSyncPort = lab.text();
            changed = true;
        }
        autoStart = autostart.isChecked();
        if (mPrefs->mPassiveSyncWithDesktop != syncdesktop.isChecked() ) {
            changed = true;
@@ -544,71 +545,73 @@ int KSyncManager::ringSync()
    KSyncProfile* temp = new KSyncProfile ();
    mAskForPreferences = false;
    for ( i = 0; i < syncProfileNames.count(); ++i ) {
        mCurrentSyncProfile = i;
        temp->setName(syncProfileNames[mCurrentSyncProfile]);
        temp->readConfig(&config);
        bool includeInRingSync;
        switch(mTargetApp)
            {
            case (KAPI):
                includeInRingSync = temp->getIncludeInRingSyncAB();
                break;
            case (KOPI):
                includeInRingSync = temp->getIncludeInRingSync();
                break;
            case (PWMPI):
                includeInRingSync = temp->getIncludeInRingSyncPWM();
                break;
            default:
                qDebug("KSyncManager::ringSync: invalid apptype selected");
                break;
              
            }
        
        
        if ( includeInRingSync && ( i < 1 || i > 2  )) {
            mParent->topLevelWidget()->setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
            ++syncedProfiles;
            // mAskForPreferences = temp->getAskForPreferences();
            mWriteBackFile = temp->getWriteBackFile();
            mWriteBackExistingOnly = temp->getWriteBackExisting();
+            mIsKapiFile = temp->getIsKapiFile();
            mWriteBackInFuture = 0;
            if ( temp->getWriteBackFuture() )
                mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
            mShowSyncSummary = false;
            mCurrentSyncDevice = syncProfileNames[i] ;
            mCurrentSyncName = mLocalMachineName;
            if ( i == 0 ) {
+                mIsKapiFile = false; 
 #ifdef DESKTOP_VERSION
                syncKDE();
 #else
                syncSharp();
 #endif
            } else {
                if ( temp->getIsLocalFileSync() ) {
                    switch(mTargetApp)
                        {
                        case (KAPI):
                            if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
                                mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
                            break;
                        case (KOPI):
                            if ( syncWithFile( temp->getRemoteFileName( ), false ) )
                                mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName();
                            break;
                        case (PWMPI):
                            if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
                                mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
                            break;
                        default:
                            qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
                            break;
                        }
                } else {
                    if (  temp->getIsPhoneSync() ) {
                        mPhoneDevice = temp->getPhoneDevice( ) ;
                        mPhoneConnection = temp->getPhoneConnection( );
                        mPhoneModel = temp->getPhoneModel( );
                        syncPhone();
                    } else if (  temp->getIsPiSync() ) {
@@ -992,64 +995,65 @@ void KSyncManager::hideProgressBar()
 bool KSyncManager::isProgressBarCanceled()
 {
    return !bar->isVisible();
 }
 QString KSyncManager::syncFileName()
 {
    QString fn = "tempfile";
    switch(mTargetApp)
        {
        case (KAPI):
            fn = "tempsyncab.vcf";
            break;
        case (KOPI):
            fn = "tempsynccal.ics";
            break;
        case (PWMPI):
            fn = "tempsyncpw.pwm";
            break;
        default:
            break;
        }
 #ifdef _WIN32_
    return  locateLocal( "tmp", fn );
 #else
    return (QString( "/tmp/" )+ fn );
 #endif
 }
 void KSyncManager::syncPi()
 {
+    mIsKapiFile = true; 
    mPisyncFinished = false;
    qApp->processEvents();
    if ( mAskForPreferences )
        if ( !edit_pisync_options()) {
            mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
            return;
        }
    bool ok;
    Q_UINT16 port = mActiveSyncPort.toUInt(&ok);
    if ( ! ok ) {
        mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
        return;
    }
    KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this );
    connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
    mParent->topLevelWidget()->setCaption( i18n("Sending request for remote file ...") );
    commandSocket->readFile(  syncFileName() );
 }
 void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
 {
    //enum { success, errorW, errorR, quiet };
    if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) {
        mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
        delete s;
        if ( state == KCommandSocket::errorR ) {
            KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
            connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
            commandSocket->sendStop();
        }
        mPisyncFinished = true;
        return;
@@ -1109,110 +1113,131 @@ void KServerSocket::newConnection ( int socket )
    connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) );
    connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
    mSocket->setSocket( socket );
 }
 void KServerSocket::discardClient()
 {
    //qDebug(" KServerSocket::discardClient()");
    if ( mSocket ) {
        delete mSocket;
        mSocket = 0;
    }
    //emit endConnect();
 }
 void KServerSocket::readClient()
 {
    if ( blockRC )
        return;
    if ( mSocket == 0 ) {
        qDebug("ERROR::KServerSocket::readClient(): mSocket == 0  ");
        return;
    }
    //qDebug("KServerSocket::readClient()");
    if ( mSocket->canReadLine() ) {
        QString line = mSocket->readLine();
        //qDebug("KServerSocket readline: %s ", line.latin1());
        QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line );
        if ( tokens[0] == "GET" ) {
            if (  tokens[1] == mPassWord ) {
                //emit sendFile( mSocket );
                bool ok = false;
                QDateTime dt = KGlobal::locale()->readDateTime( tokens[2], KLocale::ISODate, &ok);
-                if ( ok )
+                if ( ok ) {
                    KSyncManager::mRequestedSyncEvent = dt; 
+                }
                else
                    KSyncManager::mRequestedSyncEvent = QDateTime();
                send_file();
            }
            else {
                KMessageBox::error( 0, i18n("Got send file request\nwith invalid password"));
                //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
            }
        } 
        if ( tokens[0] == "PUT" ) {
            if (  tokens[1] == mPassWord ) {
                //emit getFile( mSocket );
                blockRC = true;
                get_file();
            }
            else {
                KMessageBox::error( 0, i18n("Got receive file request\nwith invalid password"));
                //qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
            }
        } 
        if ( tokens[0] == "STOP" ) {
            //emit endConnect();
            end_connect();
        }
    }
 }
 void KServerSocket::end_connect()
 {
    delete mSyncActionDialog;
    mSyncActionDialog = 0;
 }
 void KServerSocket::send_file()
 {
    //qDebug("MainWindow::sendFile(QSocket* s) ");
    if ( mSyncActionDialog )
        delete mSyncActionDialog;
    mSyncActionDialog = new QDialog ( 0, "input-dialog", true );
    mSyncActionDialog->setCaption(i18n("Received sync request"));
    QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog );
    QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog );
    lay->addWidget( label);
    lay->setMargin(7);
    lay->setSpacing(7);
-    mSyncActionDialog->setFixedSize( 230, 120);
+    if ( KSyncManager::mRequestedSyncEvent.isValid() ) {
+        int secs = QDateTime::currentDateTime().secsTo( KSyncManager::mRequestedSyncEvent );
+        //if ( secs > 30 ) 
+        if ( true ) 
+            {
+                QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs );
+                QLabel* label = new QLabel( warning, mSyncActionDialog );
+                if ( secs > 600 )
+                    {
+                        QFont f = label->font();
+                        f. setBold (true ); 
+                        f.setPointSize (  f.pointSize() + 10);
+                        label->setFont( f );
+                    }
+                lay->addWidget( label);
+                mSyncActionDialog->setFixedSize( 230, 200);
+            } else {
+            mSyncActionDialog->setFixedSize( 230, 120);
+        }
+    } else
+        mSyncActionDialog->setFixedSize( 230, 120);
    mSyncActionDialog->show();
    mSyncActionDialog->raise();
    emit request_file();
    qApp->processEvents();
    QString fileName = mFileName;
    QFile file( fileName );
    if (!file.open( IO_ReadOnly ) ) {
        delete mSyncActionDialog;
        mSyncActionDialog = 0;
        qDebug("KSS::error open file ");
        mSocket->close();
        if ( mSocket->state() == QSocket::Idle )
            QTimer::singleShot( 10, this , SLOT ( discardClient()));
        return ;
        
    } 
    mSyncActionDialog->setCaption( i18n("Sending file...") );
    QTextStream ts( &file );
    ts.setEncoding( QTextStream::Latin1 );
    QTextStream os( mSocket );
    os.setEncoding( QTextStream::Latin1 );
    while ( ! ts.atEnd() ) {
        os << ts.readLine() << "\r\n";
    }
    //os << ts.read();
    file.close();
    mSyncActionDialog->setCaption( i18n("Waiting for synced file...") );
    mSocket->close();
    if ( mSocket->state() == QSocket::Idle )
        QTimer::singleShot( 10, this , SLOT ( discardClient()));
 }
@@ -1269,65 +1294,65 @@ void KServerSocket::readBackFileFromSocket()
    emit file_received( true );
    delete mSyncActionDialog;
    mSyncActionDialog = 0;
    blockRC = false;
 }
 KCommandSocket::KCommandSocket (  QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name )
 {
    mPassWord = password;
    mSocket = 0;
    mPort = port;
    mHost = host;
    mRetVal = quiet;
    mTimerSocket = new QTimer ( this );
    connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket()  ) );
 }
 void KCommandSocket::readFile( QString fn )
 {
    if ( !mSocket ) {
        mSocket = new QSocket( this );
        connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
        connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
    }
    mFileString = "";
    mFileName = fn;
    mFirst = true;
    mSocket->connectToHost( mHost, mPort ); 
    QTextStream os( mSocket );
    os.setEncoding( QTextStream::Latin1 );
-    QString curDt = KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate );
+    QString curDt = " " +KGlobal::locale()->formatDateTime(QDateTime::currentDateTime().addSecs(-1),true, true,KLocale::ISODate );
    os << "GET " << mPassWord << curDt <<"\r\n";
    mTimerSocket->start( 20000 );
 }
 void KCommandSocket::writeFile( QString fileName  )
 {
    if ( !mSocket ) {
        mSocket = new QSocket( this );
        connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
        connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) );
    }
    mFileName = fileName ;
    mSocket->connectToHost( mHost, mPort ); 
 }
 void KCommandSocket::writeFileToSocket()
 {
    QFile file2( mFileName );
    if (!file2.open( IO_ReadOnly ) ) {
        mRetVal= errorW;
        mSocket->close();
        if ( mSocket->state() == QSocket::Idle )
            QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
        return ;
    }  
    QTextStream ts2( &file2 );
    ts2.setEncoding( QTextStream::Latin1 );
    QTextStream os2( mSocket );
    os2.setEncoding( QTextStream::Latin1 );
    os2 << "PUT " << mPassWord << "\r\n";;
    while ( ! ts2.atEnd() ) {
        os2 << ts2.readLine() << "\r\n";
    }