desktop fixes

9 files changed, 281 insertions, 394 deletions

diff --git a/Makefile b/Makefile
index 8c6110c..be106e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,362 +1,229 @@
-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/libcrypt/mpi  \
-   pwmanager/libcrypt/error  \
-   pwmanager/libcrypt/cipher  \
-   pwmanager/libcrypt/zlib \
-   pwmanager/pwmanager
-
-SUBDIRS = \
-   $(SUBDIRS_MICROKDE) \
-   $(SUBDIRS_QTOPIA_PLUGIN) \
-   $(SUBDIRS_OPIE_PLUGIN) \
-   $(SUBDIRS_SHARP_PLUGIN) \
-   $(SUBDIRS_LDAP_PLUGIN) \
-   $(SUBDIRS_MICROMAIL) \
-   $(SUBDIRS_GAMMU) \
-   $(SUBDIRS_PWMANAGER) 
-
-
-all: build_microkde \
-     build_qtopia_plugin \
-     build_opie_plugin \
-     build_sharp_plugin \
-     build_ldap_plugin \
-     build_micromail \
-     build_gammu \
-     build_pwmanager
-
-
-build_microkde: variable_test tmake
-	for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-
-build_qtopia_plugin: build_microkde
-  ifdef BUILD_NO_QTOPIA_PLUGIN
-	@echo == qtopia plugin not build.
-  else
-	for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-  endif
-
-build_opie_plugin: build_microkde
-  ifdef BUILD_NO_OPIE_PLUGIN
-	@echo == opie plugin not build.
-  else
-	for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-  endif
-
-build_sharp_plugin: build_microkde
-  ifdef BUILD_NO_SHARP_PLUGIN
-	@echo == ldap plugin not build.
-  else
-	for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-  endif
-  
-build_ldap_plugin: build_microkde
-  ifdef BUILD_NO_LDAP_PLUGIN
-	@echo == ldap plugin not build.
-  else
-	  for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
-            make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-  endif
-
-
-build_micromail: build_microkde
-  ifdef BUILD_NO_MICROMAIL
-	@echo == kmicromail not build.
-  else
-	for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-  endif
-
-build_gammu: variable_test tmake
-  ifdef BUILD_NO_GAMMU
-	@echo == gammu not build.
-  else
-	for i in $(SUBDIRS_GAMMU); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-  endif
-
-build_pwmanager: build_microkde
-  ifdef BUILD_NO_PWMANAGER
-	@echo == pwmanager not build.
-  else
-	for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
-  endif
-
-
-variable_info:
-	@echo --------------------------------------
-	@echo KDEPIM buildsystem, variableinfo...
-	@echo KDEPIMDIR=$(KDEPIMDIR)
-	@echo QTDIR=$(QTDIR)
-	@echo QPEDIR=$(QPEDIR)
-	@echo OPIEDIR=$(OPIEDIR)
-	@echo PLATFORM=$(PLATFORM)
-	@echo RELEASE_DEBUG=$(RELEASE_DEBUG)
-	@echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
-	@echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
-	@echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
-	@echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
-	@echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
-        ifndef BUILD_NO_SHARP_PLUGIN
-	@echo SHARPDTMSDK=$(SHARPDTMSDK)
-        endif
-	@echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
-	@echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
-	@echo --------------------------------------
-
-variable_test: variable_info
-	@echo KDEPIM buildsystem, variablecheck...
-  ifndef KDEPIMDIR
-	@echo KDEPIMDIR is not defined.
-	$(error KDEPIMDIR is not defined)
-  endif
-  ifndef PLATFORM
-	@echo PLATFORM is not defined.
-	$(error PLATFORM is not defined)
-  endif
-  ifdef BUILD_NO_LDAP_PLUGIN
-	@echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
-  endif
-  ifdef BUILD_NO_OPIE_PLUGIN
-	@echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
-  endif
-  ifdef BUILD_NO_QTOPIA_PLUGIN
-	@echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
-  endif
-  ifdef BUILD_NO_MICROMAIL
-	@echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
-  endif
-  ifdef BUILD_NO_SHARP_PLUGIN
-	@echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
-  else
-  ifndef SHARPDTMSDK
-	@echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
-	$(error SHARPDTMSDK is not defined)
-  endif
-  endif
-  ifdef BUILD_NO_GAMMU
-	@echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
-  endif
-  ifdef BUILD_NO_PWMANAGER
-	@echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
-  endif
-	@echo --------------------------------------
-
-
-objects:
-	for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
-	for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
-	mkdir -p libical/lib/$(PLATFORM)
-	mkdir -p pwmanager/libcrypt/$(PLATFORM)
-
-clean:
-	rm -rf libical/lib/$(PLATFORM)/*;
-	rm -rf pwmanager/libcrypt/$(PLATFORM)/*;
-	for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
-          rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
-          done 
-
-install:
-
-	cd bin/kdepim; make install
-	cp -r Pim $(QPEDIR)/apps
-	cp db2file/db2file $(QPEDIR)/bin/db2file
-	cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
-	cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
-	cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
-	cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
-    
-dist: 
-	@echo Dont forget to do "make install" before "make dist"
-	rm -f *arm.ipk
-	rm -f *~
-	cd ..; tar czf 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) \
-       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)
-
+#############################################################################
+# Makefile for building: kdepim-desktop
+# Generated by qmake (1.07a) (Qt 3.3.1) on: Wed Oct 20 01:01:01 2004
+# 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
+SUBTARGETS =	 \
+		sub-pwmanager-libcrypt-cipher \
+		sub-pwmanager-libcrypt-error \
+		sub-pwmanager-libcrypt-mpi \
+		sub-pwmanager-libcrypt-zlib \
+		sub-gammu-emb-common \
+		sub-gammu-emb-gammu \
+		sub-libical \
+		sub-libkcal \
+		sub-microkde \
+		sub-libkdepim \
+		sub-kabc \
+		sub-pwmanager-pwmanager \
+		sub-korganizer \
+		sub-kaddressbook \
+		sub-kabc-plugins-file \
+		sub-kabc-plugins-dir
+
+first: all
+
+all: Makefile $(SUBTARGETS)
+
+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)
+
+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)
+
+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)
+
+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)
+
+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)
+
+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)
+
+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)
+
+korganizer/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
+	cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE)
+sub-korganizer: korganizer/$(MAKEFILE) FORCE
+	cd korganizer && $(MAKE) -f $(MAKEFILE)
+
+kaddressbook/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
+	cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE)
+sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
+	cd kaddressbook && $(MAKE) -f $(MAKEFILE)
+
+kabc/plugins/file/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
+	cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
+sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
+	cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
+
+kabc/plugins/dir/$(MAKEFILE): 
+	@$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
+	cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE)
+sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
+	cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
+
+Makefile: kdepim-desktop.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
+	$(QMAKE) -o Makefile kdepim-desktop.pro
+qmake: qmake_all
+	@$(QMAKE) -o Makefile kdepim-desktop.pro
+
+all: $(SUBTARGETS)
+qmake_all: pwmanager/libcrypt/cipher/$(MAKEFILE) pwmanager/libcrypt/error/$(MAKEFILE) pwmanager/libcrypt/mpi/$(MAKEFILE) pwmanager/libcrypt/zlib/$(MAKEFILE) gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) pwmanager/pwmanager/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE)
+	 ( [ -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 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 pwmanager/pwmanager ] && cd pwmanager/pwmanager ; 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 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 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 pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(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 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 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 pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(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 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 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 pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(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 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 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 pwmanager/pwmanager ] && cd pwmanager/pwmanager ; $(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/kdepim-desktop.pro b/kdepim-desktop.pro
index 7a3a96e..cb4eee3 100644
--- a/kdepim-desktop.pro
+++ b/kdepim-desktop.pro
@@ -1,6 +1,6 @@
 
 
 TEMPLATE = subdirs
-SUBDIRS =   gammu/emb/common gammu/emb/gammu libical libkcal microkde libkdepim kabc korganizer kaddressbook kabc/plugins/file kabc/plugins/dir
+SUBDIRS =   pwmanager/libcrypt/cipher  pwmanager/libcrypt/error  pwmanager/libcrypt/mpi  pwmanager/libcrypt/zlib  gammu/emb/common gammu/emb/gammu libical libkcal microkde libkdepim kabc pwmanager/pwmanager korganizer kaddressbook kabc/plugins/file kabc/plugins/dir 
 #kalarmd
 
diff --git a/pwmanager/pwmanager/main.cpp b/pwmanager/pwmanager/main.cpp
index 3f2d055..9d1d863 100644
--- a/pwmanager/pwmanager/main.cpp
+++ b/pwmanager/pwmanager/main.cpp
@@ -203,6 +203,7 @@ int main(int argc, char *argv[])
       m.show();
 #endif
       */
+      qDebug("exec ");
       a.exec();
 
   }
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index 26a44b1..c511661 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -586,10 +586,10 @@ bool PwM::saveAs()
 //US ENH : changed code to run with older MOC
 void PwM::addPwd_slot()
 {
-  addPwd_slot(0, 0);
+  addPwd_slot1(0, 0);
 }
 
-void PwM::addPwd_slot(QString *pw, PwMDoc *_doc)
+void PwM::addPwd_slot1(QString *pw, PwMDoc *_doc)
 {
 	PwMDoc *doc;
 	if (_doc) {
@@ -655,15 +655,15 @@ void PwM::addPwd_slot(QString *pw, PwMDoc *_doc)
 //US ENH : changed code to run with older MOC
 void PwM::editPwd_slot()
 {
-  editPwd_slot(0,0,0);
+  editPwd_slot3(0,0,0);
 }
 
-void PwM::editPwd_slot(const QString *category)
+void PwM::editPwd_slot1(const QString *category)
 {
-  editPwd_slot(category, 0, 0);
+  editPwd_slot3(category, 0, 0);
 }
 
-void PwM::editPwd_slot(const QString *category, const int *index,
+void PwM::editPwd_slot3(const QString *category, const int *index,
 		       PwMDoc *_doc)
 {
 	PwMDoc *doc;
diff --git a/pwmanager/pwmanager/pwm.h b/pwmanager/pwmanager/pwm.h
index fe1f7a1..116bc66 100644
--- a/pwmanager/pwmanager/pwm.h
+++ b/pwmanager/pwmanager/pwm.h
@@ -134,14 +134,16 @@ public slots:
 	void print_slot();
 	/** manage/add triggered */
 	//US ENH : changed code to run with older MOC
+
 	void addPwd_slot();
-	void addPwd_slot(QString *pw, PwMDoc *_doc);
+	void addPwd_slot1(QString *pw, PwMDoc *_doc);
 	/** manage/edit triggered */
 	//US ENH : changed code to run with older MOC
 	void editPwd_slot();
-	void editPwd_slot(const QString *category);
-	void editPwd_slot(const QString *category = 0, const int *index = 0,
+	void editPwd_slot1(const QString *category);
+	void editPwd_slot3(const QString *category = 0, const int *index = 0,
 			  PwMDoc *_doc = 0);
+
 	/** manage/delete triggered */
 	void deletePwd_slot();
 	/** execute the "Launcher" entry */
diff --git a/pwmanager/pwmanager/pwmanager.pro b/pwmanager/pwmanager/pwmanager.pro
index 34f7403..7f39c76 100644
--- a/pwmanager/pwmanager/pwmanager.pro
+++ b/pwmanager/pwmanager/pwmanager.pro
@@ -1,33 +1,38 @@
 TEMPLATE	= app
 CONFIG		+= qt warn_on
-
-
+DESTDIR= ../../bin
 TARGET		= pwmpi
-OBJECTS_DIR = obj/$(PLATFORM)
-MOC_DIR = moc/$(PLATFORM)
-DESTDIR=$(QPEDIR)/bin
+include( ../../variables.pri )
 
-INCLUDEPATH += . ../../ ../../qtcompat ../../qtcompat/xml ../../libkdepim ../../microkde ../../microkde/kdecore ../../microkde/kdeui ../../microkde/kutils $(QPEDIR)/include
+INCLUDEPATH += . ../../  ../../libkdepim ../../microkde ../../microkde/kdecore ../../microkde/kdeui ../../microkde/kutils 
 DEFINES += PWM_EMBEDDED CONFIG_PWMANAGER_GCRY DESKTOP_VERSION
 
 #enable this setting if you want debugoutput for pwmanager
 #DEFINES += CONFIG_DEBUG
-LIBS += -L../libcrypt/$(PLATFORM)
+LIBS += -L../libcrypt/
+LIBS += -L../../bin/
 LIBS += -lmicrokde
-LIBS += -lmicroqtcompat
 LIBS += -lmicrokdepim
-LIBS += -L$(QPEDIR)/lib
-LIBS += -lqpe
 LIBS += -lzlib
-#LIBS += -lbz2
-#LIBS += -lkpmicrogcrypt
-LIBS += -ljpeg
-LIBS += $(QTOPIALIB)
 LIBS += -lkpmicrocipher
 LIBS += -lkpmicroerror
 LIBS += -lkpmicrompi
 LIBS += -lstdc++
 
+unix:{
+OBJECTS_DIR = obj/unix
+MOC_DIR = moc/unix
+
+}
+win32:{
+
+DEFINES += _WIN32_
+OBJECTS_DIR = obj/win
+MOC_DIR = moc/win
+QMAKE_LINK += /NODEFAULTLIB:LIBC
+
+}
+
 #INTERFACES = \
 #addentrywnd.ui \
 #configwnd.ui \
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index e29e3d1..8869f3a 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -2329,8 +2329,8 @@ PwMerror PwMDoc::exportToText(const QString *file)
 	KGlobal::locale()->setDateFormatShort("%A %B %d");
 	KGlobal::locale()->setHore24Format(true);
 
-	header += KGlobal::locale()->formatDate(currDate, true, KLocale::Userdefined);
-	header += KGlobal::locale()->formatTime(currTime, true);
+	header += KGlobal::locale()->formatDate(currDate, true, KLocale::Userdefined).latin1();
+	header += KGlobal::locale()->formatTime(currTime, true).latin1();
 	KGlobal::locale()->setDateFormatShort(dfs);
 	KGlobal::locale()->setHore24Format(!ampm);
 
@@ -3018,7 +3018,7 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
   if (found == false)
     {
       PwMSyncItem newSyncItemLocal;
-      newSyncItemLocal.syncName = mCurrentSyncDevice;
+      newSyncItemLocal.syncName = mCurrentSyncDevice.latin1();
       newSyncItemLocal.lastSyncDate = mLastSync;
       syncLocal->addSyncDataEntry(&newSyncItemLocal, true);
       found = syncLocal->findSyncData(mCurrentSyncDevice, &index);
@@ -3038,7 +3038,7 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
       qDebug("FULLDATE 1");
       fullDateRange = true;
       PwMSyncItem newSyncItemRemote;
-      newSyncItemRemote.syncName = mCurrentSyncName;
+      newSyncItemRemote.syncName = mCurrentSyncName.latin1();
       newSyncItemRemote.lastSyncDate = mLastSync;
       syncRemote->addSyncDataEntry(&newSyncItemRemote, true);
       found = syncRemote->findSyncData(mCurrentSyncName, &index);
diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp
index 8946443..ea9e330 100644
--- a/pwmanager/pwmanager/pwminit.cpp
+++ b/pwmanager/pwmanager/pwminit.cpp
@@ -19,6 +19,7 @@
 
 #include "pwminit.h"
 #include "randomizer.h"
+#include <qdir.h>
 
 #ifndef PWM_EMBEDDED
 #include "selftest.h"
@@ -128,6 +129,7 @@ PwMInit::~PwMInit()
 
 void PwMInit::initializeApp()
 {
+    qDebug("PwMInit::initializeApp() ");
 	PWM_ASSERT(runStatus == unknown);
 	runStatus = init;
 	initPosixSignalHandler();
@@ -140,18 +142,22 @@ void PwMInit::initializeApp()
 	initKeycard();
 	initTray();
 	handleCmdLineArgs();
-
+    qDebug("handle ");
 	bool openDeeplocked = false;
 	if (conf()->confGlobAutostartDeepLocked() ||
 	    savedCmd.open_deeplocked)
 		openDeeplocked = true;
-	if (conf()->confWndAutoMinimizeOnStart() ||
-	    savedCmd.minToTray) {
+    if ( false ){
+    // LR is not working
+	//if (conf()->confWndAutoMinimizeOnStart() ||
+    //   savedCmd.minToTray) {
 		PwMDoc *newDoc = createDoc();
+        qDebug("  createDoc()");
 		if (!newDoc->openDocUi(newDoc,
 				       conf()->confGlobAutoStart(),
 				       openDeeplocked)) {
 			delete newDoc;
+        }
 
 			//US ENH for embedded devices: in the case of failure, open a document the default way  
 			createMainWnd(conf()->confGlobAutoStart(),
@@ -163,7 +169,7 @@ void PwMInit::initializeApp()
 
 
 
-		}
+            //	}
 	} else {
 		createMainWnd(conf()->confGlobAutoStart(),
 			      openDeeplocked,
@@ -286,6 +292,7 @@ PwM * PwMInit::createMainWnd(const QString &loadFile,
 			     PwMDoc *doc,
 			     bool minimized)
 {
+    qDebug("PwMInit::createMainWnd ");
 	PwM *newWnd;
 	if (!doc)
 		doc = createDoc();
@@ -317,6 +324,7 @@ PwM * PwMInit::createMainWnd(const QString &loadFile,
        app->setMainWidget( newWnd );
        newWnd->resize (640, 480 );
        newWnd->show();
+       qDebug("show ");
 #endif //DESKTOP_VERSION
 
 #endif //PWM_EMBEDDED
diff --git a/pwmanager/pwmanager/serializer.cpp b/pwmanager/pwmanager/serializer.cpp
index 2d6498e..ed0f754 100644
--- a/pwmanager/pwmanager/serializer.cpp
+++ b/pwmanager/pwmanager/serializer.cpp
@@ -170,7 +170,11 @@ bool Serializer::parseXml(const QCString &buffer)
 	if (!domDoc->setContent(buffer, true))
 		return false;
 #else
+#ifdef DESKTOP_VERSION
+	if (!domDoc->setContent(buffer, true))
+#else
 	if (!domDoc->setContent(buffer))
+#endif
 		return false;
 #endif
 	if (!checkValid())
@@ -732,7 +736,7 @@ bool Serializer::readSyncData(const QDomNode &n, vector<PwMSyncItem> *dta)
 			  continue;
 			}
 
-			curSync.syncName = devicename;
+			curSync.syncName = devicename.latin1();
 #ifndef PWM_EMBEDDED
 			curSync.lastSyncDate = QDateTime::fromString(val, Qt::ISODate);
 #else