added KDE sync

4 files changed, 219 insertions, 337 deletions

diff --git a/Makefile b/Makefile
index 6a8521f..93437e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,338 +1,171 @@
-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
-
-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/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)
-
-clean:
-	rm -rf libical/lib/$(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 kdepim.src.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
-	./mkipks korganizer-alarm.control
-  ifndef BUILD_NO_GAMMU
-	./mkipks phoneaccess.control
-  endif
-  ifndef BUILD_NO_PWMANAGER
-	./mkipks pwmanager.control
-  endif
-	./mkipks pim_TAB_icon.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) \
-
-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)
+#############################################################################
+# Makefile for building: kdepim-desktop
+# Generated by qmake (1.07a) (Qt 3.3.3) on: Sat Oct 16 22:32:03 2004
+# Project:  kdepim-desktop.pro
+# Template: subdirs
+# Command: $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -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-gammu-emb-common \
+		sub-gammu-emb-gammu \
+		sub-libical \
+		sub-libkcal \
+		sub-microkde \
+		sub-libkdepim \
+		sub-kabc \
+		sub-korganizer \
+		sub-kaddressbook \
+		sub-kabc-plugins-file \
+		sub-kabc-plugins-dir
+
+first: all
+
+all: Makefile $(SUBTARGETS)
+
+gammu/emb/common/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
+	cd gammu/emb/common && $(QMAKE) common.pro "CONFIG+=thread" "CONFIG+=debug" -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 "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
+	cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
+
+libical/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
+	cd libical && $(QMAKE) libical.pro "CONFIG+=thread" "CONFIG+=debug" -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 "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-libkcal: libkcal/$(MAKEFILE) FORCE
+	cd libkcal && $(MAKE) -f $(MAKEFILE)
+
+microkde/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
+	cd microkde && $(QMAKE) microkde.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-microkde: microkde/$(MAKEFILE) FORCE
+	cd microkde && $(MAKE) -f $(MAKEFILE)
+
+libkdepim/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
+	cd libkdepim && $(QMAKE) libkdepim.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
+	cd libkdepim && $(MAKE) -f $(MAKEFILE)
+
+kabc/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
+	cd kabc && $(QMAKE) kabc.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-kabc: kabc/$(MAKEFILE) FORCE
+	cd kabc && $(MAKE) -f $(MAKEFILE)
+
+korganizer/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
+	cd korganizer && $(QMAKE) korganizer.pro "CONFIG+=thread" "CONFIG+=debug" -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 "CONFIG+=thread" "CONFIG+=debug" -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 "CONFIG+=thread" "CONFIG+=debug" -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 "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
+	cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
+
+Makefile: kdepim-desktop.pro  /usr/local/qtgcc/mkspecs/default/qmake.conf 
+	$(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kdepim-desktop.pro
+qmake: qmake_all
+	@$(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kdepim-desktop.pro
+
+all: $(SUBTARGETS)
+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)
+	 ( [ -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 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 microkde ] && cd microkde ; 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 kabc ] && cd kabc ; 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
+clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
+	 ( [ -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 libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+	 ( [ -d kabc ] && cd kabc ; $(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
+uninstall_subdirs: qmake_all FORCE
+	 ( [ -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 libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+	 ( [ -d kabc ] && cd kabc ; $(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
+install_subdirs: qmake_all FORCE
+	 ( [ -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 libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
+	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
+	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
+	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
+	 ( [ -d kabc ] && cd kabc ; $(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
+distclean: qmake_all FORCE
+	 ( [ -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 libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+	 ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+	 ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+	 ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+	 ( [ -d kabc ] && cd kabc ; $(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
+
+install:  install_subdirs
+
+uninstall:  uninstall_subdirs
+
+FORCE:
 
diff --git a/kde2file/caldump/main.cpp b/kde2file/caldump/main.cpp
index 95ae29e..76bfad3 100644
--- a/kde2file/caldump/main.cpp
+++ b/kde2file/caldump/main.cpp
@@ -114,32 +114,33 @@ int main( int argc, char *argv[] )
     qDebug("************************************* ");
     qDebug("************************************* ");
     qDebug("************************************* ");
     qDebug("Using timezone id: %s", calendarResource->timeZoneId().latin1());
 
     if ( !read ) {
         localCalendar = new CalendarLocal();
         localCalendar->setTimeZoneId( calendarResource->timeZoneId());
         KCal::Incidence::List  allInc = calendarResource->rawIncidences();
         Incidence::List::ConstIterator it;
         int num = 0;
         for( it = allInc.begin(); it != allInc.end(); ++it ) {
             ResourceCalendar * re = calendarResource->resource( (*it) );
             if ( re && !re->readOnly() ) {
                 ++num;
                 Incidence* cl = (*it)->clone();
+                cl->setLastModified( (*it)->lastModified() );
                 if ( cl->type() == "Journal" )
                     localCalendar->addJournal( (Journal *) cl  );
                 else if ( cl->type() == "Todo" )
                     localCalendar->addTodo( (Todo *) cl );
                 else if ( cl->type() == "Event" )
                     localCalendar->addEvent( (Event *) cl );
             }
         }
   
         FileStorage* storage = new FileStorage( calendarResource );
         storage->setFileName( "/tmp/kdedumpall.ics" );
         storage->setSaveFormat( new ICalFormat() );
         storage->save();
         delete storage;
         qDebug("************************************* ");
         qDebug("************************************* ");
@@ -149,48 +150,51 @@ int main( int argc, char *argv[] )
     } else {
         localCalendar = new CalendarLocal();
         localCalendar->setTimeZoneId( calendarResource->timeZoneId());
         FileStorage* storage = new FileStorage( localCalendar );
         storage->setFileName( "/tmp/kdedumpall.ics" );
         int num = 0;
         int del = 0;
         if ( storage->load() ) {
             KCal::Incidence::List  allInc = calendarResource->rawIncidences();
             KCal::Incidence::List  newInc = localCalendar->rawIncidences();
             Incidence::List::ConstIterator it;
             for( it = allInc.begin(); it != allInc.end(); ++it ) {
                 ResourceCalendar * re = calendarResource->resource( (*it) );
                 if ( re && !re->readOnly() ) {
                     Incidence* cl = localCalendar->incidence( (*it)->uid() );
                     if ( cl ) {
+                        QDateTime lm = cl->lastModified();
                         cl->setResources( (*it)->resources() );
+                        cl->setLastModified(lm);
                     } 
                     ++del; 
                     cl = (*it);
                     if ( cl->type() == "Journal" )
                         calendarResource->deleteJournal( (Journal *) cl  );
                     else if ( cl->type() == "Todo" )
                         calendarResource->deleteTodo( (Todo *) cl );
                     else if ( cl->type() == "Event" )
                         calendarResource->deleteEvent( (Event *) cl );
                 }
             }
             for( it = newInc.begin(); it != newInc.end(); ++it ) {
                 Incidence* cl = (*it)->clone();
                 ++num;
                 calendarResource->addIncidence( cl );
+                //cl->setLastModified( (*it)->lastModified() );
             }
             calendarResource->save();
             qDebug("************************************* ");
             qDebug("************************************* ");
             qDebug("************************************* ");
             qDebug("%d calendar entries deleted/ %d added from file /tmp/kdedumpall.ics", del, num);
             
         } else
             qDebug("error loading file /tmp/kdedumpall.ics");
 
     }
 
     if ( localCalendar ) {
         localCalendar->close();
         delete localCalendar;
     }
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 5175f94..7ee56e4 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -86,64 +86,74 @@ void KSyncManager::fillSyncMenu()
     mSyncMenu->insertSeparator();
     if ( mServerSocket == 0 ) {
         mSyncMenu->insertItem( i18n("Enable Pi-Sync"), 2 );
     } else {
         mSyncMenu->insertItem( i18n("Disable Pi-Sync"), 3 );
     }
     mSyncMenu->insertSeparator();
     mSyncMenu->insertItem( i18n("Multiple sync"), 1 );
     mSyncMenu->insertSeparator();
     
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     config.setGroup("General");
     QStringList prof = config.readListEntry("SyncProfileNames");
     mLocalMachineName = config.readEntry("LocalMachineName","undefined");
     if ( prof.count() < 2 ) {
         prof.clear();
+#ifdef DESKTOP_VERSION
+#ifdef _WIN32_
+        prof << i18n("OutLook(not_implemented)");
+#else
+        prof << i18n("KDE_Desktop");
+#endif
+#else
         prof << i18n("Sharp_DTM");
+#endif
         prof << i18n("Local_file");
         prof << i18n("Last_file");
         KSyncProfile* temp = new KSyncProfile ();
         temp->setName( prof[0] );
         temp->writeConfig(&config);
         temp->setName( prof[1] );
         temp->writeConfig(&config);
         temp->setName( prof[2] );
         temp->writeConfig(&config);
         config.setGroup("General");
         config.writeEntry("SyncProfileNames",prof);
         config.writeEntry("ExternSyncProfiles","Sharp_DTM");
         config.sync();
         delete temp;
     }
     mExternSyncProfiles = config.readListEntry("ExternSyncProfiles");
     mSyncProfileNames = prof;
     unsigned int i;
     for ( i = 0; i < prof.count(); ++i ) {
         mSyncMenu->insertItem(  prof[i], 1000+i );
         if ( i == 2 )
             mSyncMenu->insertSeparator();
     }
     QDir app_dir;
     //US do not display SharpDTM if app is pwmpi, or no sharpfiles available
     if ( mTargetApp == PWMPI) {
         mSyncMenu->removeItem( 1000 );
     }
+#ifndef DESKTOP_VERSION
     else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
         mSyncMenu->removeItem( 1000 );
     }
+#endif
     mSyncMenu->removeItem( 1002 );
 }
 
 void KSyncManager::slotSyncMenu( int action )
 {
     //qDebug("syncaction %d ", action);
     if ( action == 0 ) {
 
         // seems to be a Qt2 event handling bug
         // syncmenu.clear causes a segfault at first time
         // when we call it after the main event loop, it is ok
         // same behaviour when calling OM/Pi via QCOP for the first time
         QTimer::singleShot ( 1, this, SLOT ( confSync() ) ); 
         //confSync();
 
         return;
@@ -173,33 +183,37 @@ void KSyncManager::slotSyncMenu( int action )
     mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ;
     mCurrentSyncName =  mLocalMachineName ;
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
     KSyncProfile* temp = new KSyncProfile ();
     temp->setName(mSyncProfileNames[mCurrentSyncProfile]);
     temp->readConfig(&config);
     mAskForPreferences = temp->getAskForPreferences();
     mSyncAlgoPrefs = temp->getSyncPrefs();
     mWriteBackFile = temp->getWriteBackFile();
     mWriteBackExistingOnly = temp->getWriteBackExisting();
     mIsKapiFile = temp->getIsKapiFile();
     mWriteBackInFuture = 0;
     if ( temp->getWriteBackFuture() )
         mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
     mShowSyncSummary = temp->getShowSummaryAfterSync();
     if ( action == 1000  ) {
+#ifdef DESKTOP_VERSION
+        syncKDE();
+#else
         syncSharp();
+#endif
     
     } else if ( action == 1001 ) {
         syncLocalFile();
 
     } else if ( action == 1002 ) {
         mWriteBackFile = false;
         mAskForPreferences = false;
         mShowSyncSummary = false; 
         mSyncAlgoPrefs = 3; 
         quickSyncLocalFile();
 
     } else if ( action >= 1003  ) {
         if ( temp->getIsLocalFileSync() ) {
             switch(mTargetApp)
                 {
                 case (KAPI):
@@ -728,32 +742,62 @@ void KSyncManager::confSync()
 { 
     static KSyncPrefsDialog* sp = 0;
     if ( ! sp ) {
         sp = new KSyncPrefsDialog( mParent, "syncprefs", true );
     }
     sp->usrReadConfig();
 #ifndef DESKTOP_VERSION
     sp->showMaximized();
 #else
     sp->show();
 #endif
     sp->exec();
     mSyncProfileNames = sp->getSyncProfileNames();
     mLocalMachineName = sp->getLocalMachineName ();
     QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 
 }
+void KSyncManager::syncKDE()
+{
+    emit save();
+    switch(mTargetApp)
+        {
+        case (KAPI):
+
+            break;
+        case (KOPI):
+            {
+                QString command ="./kdecaldump"; 
+                system (  command.latin1());
+                    if ( syncWithFile( "/tmp/kdedumpall.ics",true ) ) {
+                        if ( mWriteBackFile ) {
+                            command += " --read";
+                            system (  command.latin1());
+                        }
+                    }
+                
+            }
+            break;
+        case (PWMPI):
+
+            break;
+        default:
+            qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
+            break;
+	      
+        }
+}
 
 void KSyncManager::syncSharp()
 {
 
     if ( ! syncExternalApplication("sharp") )
         qDebug("ERROR sync sharp  ");
 }
 
 bool KSyncManager::syncExternalApplication(QString  resource)
 {
    
     emit save();
 
     if ( mAskForPreferences )
         edit_sync_options();
 
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 9094aac..7d5b05e 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -157,32 +157,33 @@ class KSyncManager : public QObject
     void readFileFromSocket();
     void fillSyncMenu();
 
  private:
     void syncPi();
     KServerSocket * mServerSocket;
     void enableQuick();
     KPimPrefs* mPrefs;
     QString mDefFileName;
     QString mCurrentSyncDevice;
     QString mCurrentSyncName;
     void quickSyncLocalFile();
     bool syncWithFile( QString fn , bool quick );
     void syncLocalFile();
     void syncPhone();
     void syncSharp();
+    void syncKDE();
     bool syncExternalApplication(QString);
     int mCurrentSyncProfile ;
     void syncRemote( KSyncProfile* prof,  bool ask = true);
     void edit_sync_options();
     void edit_pisync_options();
     int ringSync();
     QString  getPassword( );
 
     private slots:
     void confSync();
  private:
     bool mBlockSaveFlag;
     QWidget* mParent;
     KSyncInterface* mImplementation;
     TargetApp mTargetApp; 
     QPopupMenu* mSyncMenu;