4 files changed, 11 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index d24c8b8..594d47d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,92 +1,92 @@
 export KDEPIMDIR = $(shell pwd)
 export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version)
 ifeq ($(PLATFORM) , zaurus)
  BUILD_NO_LDAP_PLUGIN=1
 endif
 ifneq ($(PLATFORM) , zaurus)
  BUILD_NO_SHARP_PLUGIN=1
 endif
 #opie plugin is deprecated. The qtopia plugin handles the task from now on.
 BUILD_NO_OPIE_PLUGIN=1
 SUBDIRS_MICROKDE = \
   libical/src/libical \
   libical/src/libicalss \
   qtcompat \
   microkde \
   libkcal \
   libkdepim \
   kabc \
   kabc/formats/binary \
   kabc/plugins/file \
   kabc/plugins/dir \
   korganizer \
   kalarmd \
   kaddressbook
 SUBDIRS_QTOPIA_PLUGIN = \
   kabc/plugins/qtopia
 SUBDIRS_OPIE_PLUGIN = \
   kabc/plugins/opie
 SUBDIRS_SHARP_PLUGIN = \
   kabc/plugins/sharpdtm
 SUBDIRS_LDAP_PLUGIN = \
   kabc/plugins/ldap
 SUBDIRS_MICROMAIL = \
-   kmicromail/libetpan \
+   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
@@ -244,142 +244,142 @@ dist:
        rm -f *arm.ipk
        rm -f *ipk.zip
        rm -rf ../kdepimpi_$(KDEPIM_VERSION)/*
        rm -f *~
        cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
        cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
        cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
        mkipks kmicrokdelibs.control
        mkipks korganizer.control
        mkipks kaddressbook.control
  ifndef BUILD_NO_MICROMAIL
        mkipks kopiemail.control
  endif
  ifndef BUILD_NO_SHARP_PLUGIN
        mkipks ksharpPIM-DTMaccess.control
  endif
        mkipks korganizer-alarm.control
  ifndef BUILD_NO_GAMMU
        mkipks kmobilephoneaccess.control
  endif
  ifndef BUILD_NO_PWMANAGER
        mkipks pwmanager.control
  endif
        mkipks pimTABicon.control
        zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
        mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
        mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
        mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
 tmake: objects \
       qtcompat/Makefile$(PLATFORM) \
       microkde/Makefile$(PLATFORM) \
       libkcal/Makefile$(PLATFORM) \
       libkdepim/Makefile$(PLATFORM) \
       korganizer/Makefile$(PLATFORM) \
       kalarmd/Makefile$(PLATFORM) \
       libical/src/libical/Makefile$(PLATFORM) \
       libical/src/libicalss/Makefile$(PLATFORM) \
       kabc/Makefile$(PLATFORM) \
       kabc/formats/binary/Makefile$(PLATFORM) \
       kabc/plugins/file/Makefile$(PLATFORM) \
       kabc/plugins/dir/Makefile$(PLATFORM) \
       kabc/plugins/ldap/Makefile$(PLATFORM) \
       kabc/plugins/opie/Makefile$(PLATFORM) \
       kabc/plugins/qtopia/Makefile$(PLATFORM) \
       kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
       kaddressbook/Makefile$(PLATFORM) \
       kmicromail/Makefile$(PLATFORM) \
-       kmicromail/libetpan/Makefile$(PLATFORM) \
+       libetpan/Makefile$(PLATFORM) \
       kmicromail/libmailwrapper/Makefile$(PLATFORM) \
       gammu/emb/common/Makefile$(PLATFORM) \
       gammu/emb/gammu/Makefile$(PLATFORM) \
       pwmanager/pwmanager/Makefile$(PLATFORM) \
       pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
       pwmanager/libcrypt/error/Makefile$(PLATFORM) \
       pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
       pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
 qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
        cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
 microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
        cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
 libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
        cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
 libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
        cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
 kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
        cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
 korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
        cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
 libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
        cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
 libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
        cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
 kabc/Makefile$(PLATFORM): kabc/kabcE.pro
        cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
 kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
        cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
 kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
        cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
 kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
        cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
 kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
        cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
 kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
        cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
 kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
        cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
 kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
        cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
 kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
        cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
 kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
        cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
-kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
+libetpan/Makefile$(PLATFORM): libetpan/libetpanE.pro
-        cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
+        cd libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
 kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
        cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
 gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
        cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
 gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
        cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
 pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
        cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro
        cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro
        cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro
        cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro
        cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM)
diff --git a/Makefile.Embedded b/Makefile.Embedded
index d24c8b8..594d47d 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -1,92 +1,92 @@
 export KDEPIMDIR = $(shell pwd)
 export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version)
 ifeq ($(PLATFORM) , zaurus)
  BUILD_NO_LDAP_PLUGIN=1
 endif
 ifneq ($(PLATFORM) , zaurus)
  BUILD_NO_SHARP_PLUGIN=1
 endif
 #opie plugin is deprecated. The qtopia plugin handles the task from now on.
 BUILD_NO_OPIE_PLUGIN=1
 SUBDIRS_MICROKDE = \
   libical/src/libical \
   libical/src/libicalss \
   qtcompat \
   microkde \
   libkcal \
   libkdepim \
   kabc \
   kabc/formats/binary \
   kabc/plugins/file \
   kabc/plugins/dir \
   korganizer \
   kalarmd \
   kaddressbook
 SUBDIRS_QTOPIA_PLUGIN = \
   kabc/plugins/qtopia
 SUBDIRS_OPIE_PLUGIN = \
   kabc/plugins/opie
 SUBDIRS_SHARP_PLUGIN = \
   kabc/plugins/sharpdtm
 SUBDIRS_LDAP_PLUGIN = \
   kabc/plugins/ldap
 SUBDIRS_MICROMAIL = \
-   kmicromail/libetpan \
+   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
@@ -244,142 +244,142 @@ dist:
        rm -f *arm.ipk
        rm -f *ipk.zip
        rm -rf ../kdepimpi_$(KDEPIM_VERSION)/*
        rm -f *~
        cd ..;mkdir -p kdepimpi_$(KDEPIM_VERSION)
        cd ../kdepimpi_$(KDEPIM_VERSION);mkdir -p ipk
        cd ..; tar czf kdepimpi-$(KDEPIM_VERSION).tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
        mkipks kmicrokdelibs.control
        mkipks korganizer.control
        mkipks kaddressbook.control
  ifndef BUILD_NO_MICROMAIL
        mkipks kopiemail.control
  endif
  ifndef BUILD_NO_SHARP_PLUGIN
        mkipks ksharpPIM-DTMaccess.control
  endif
        mkipks korganizer-alarm.control
  ifndef BUILD_NO_GAMMU
        mkipks kmobilephoneaccess.control
  endif
  ifndef BUILD_NO_PWMANAGER
        mkipks pwmanager.control
  endif
        mkipks pimTABicon.control
        zip kdepim_$(KDEPIM_VERSION)_for_SharpRom.ipk.zip *.ipk ReleaseNotes.txt
        mv *.ipk ../kdepimpi_$(KDEPIM_VERSION)/ipk/
        mv *for_SharpRom.ipk.zip ../kdepimpi_$(KDEPIM_VERSION)/
        mv ../kdepimpi-$(KDEPIM_VERSION).tar.gz ../kdepimpi_$(KDEPIM_VERSION)/
 tmake: objects \
       qtcompat/Makefile$(PLATFORM) \
       microkde/Makefile$(PLATFORM) \
       libkcal/Makefile$(PLATFORM) \
       libkdepim/Makefile$(PLATFORM) \
       korganizer/Makefile$(PLATFORM) \
       kalarmd/Makefile$(PLATFORM) \
       libical/src/libical/Makefile$(PLATFORM) \
       libical/src/libicalss/Makefile$(PLATFORM) \
       kabc/Makefile$(PLATFORM) \
       kabc/formats/binary/Makefile$(PLATFORM) \
       kabc/plugins/file/Makefile$(PLATFORM) \
       kabc/plugins/dir/Makefile$(PLATFORM) \
       kabc/plugins/ldap/Makefile$(PLATFORM) \
       kabc/plugins/opie/Makefile$(PLATFORM) \
       kabc/plugins/qtopia/Makefile$(PLATFORM) \
       kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
       kaddressbook/Makefile$(PLATFORM) \
       kmicromail/Makefile$(PLATFORM) \
-       kmicromail/libetpan/Makefile$(PLATFORM) \
+       libetpan/Makefile$(PLATFORM) \
       kmicromail/libmailwrapper/Makefile$(PLATFORM) \
       gammu/emb/common/Makefile$(PLATFORM) \
       gammu/emb/gammu/Makefile$(PLATFORM) \
       pwmanager/pwmanager/Makefile$(PLATFORM) \
       pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
       pwmanager/libcrypt/error/Makefile$(PLATFORM) \
       pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
       pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
 qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
        cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
 microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
        cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
 libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
        cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
 libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
        cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
 kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
        cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
 korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
        cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
 libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
        cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
 libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
        cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
 kabc/Makefile$(PLATFORM): kabc/kabcE.pro
        cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
 kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
        cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
 kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
        cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
 kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
        cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
 kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
        cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
 kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
        cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
 kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
        cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
 kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
        cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
 kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
        cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
 kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
        cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
-kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
+libetpan/Makefile$(PLATFORM): libetpan/libetpanE.pro
-        cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
+        cd libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
 kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
        cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
 gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
        cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
 gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
        cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
 pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
        cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro
        cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro
        cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro
        cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM)
 pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro
        cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM)
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 4379498..a5a51f7 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -9,64 +9,64 @@ HEADERS         = defines.h \
               viewmail.h \
               viewmailbase.h \
               opiemail.h \
               mailistviewitem.h \
               settingsdialog.h \
               statuswidget.h \
               newmaildir.h \
               selectstore.h \
               selectsmtp.h \
               nntpgroups.h \
               koprefs.h \
               koprefsdialog.h \
               nntpgroupsdlg.h
 SOURCES         = main.cpp  \
               opiemail.cpp \
               mainwindow.cpp \
               accountview.cpp \
               accountitem.cpp \
               composemail.cpp \
               editaccounts.cpp \
               viewmail.cpp \
               viewmailbase.cpp \
               mailistviewitem.cpp \
               settingsdialog.cpp \
               statuswidget.cpp \
               newmaildir.cpp \
               selectstore.cpp \
               selectsmtp.cpp \
               nntpgroups.cpp \
               koprefs.cpp\
               koprefsdialog.cpp\
               nntpgroupsdlg.cpp
 INTERFACES     = editaccountsui.ui \
               selectmailtypeui.ui \
               imapconfigui.ui \
               pop3configui.ui \
               nntpconfigui.ui \
               smtpconfigui.ui \
               composemailui.ui \
               settingsdialogui.ui \
               statuswidgetui.ui \
               newmaildirui.ui \
               selectstoreui.ui \
               nntpgroupsui.ui
-INCLUDEPATH += $(QPEDIR)/include . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim  $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui 
+INCLUDEPATH += $(QPEDIR)/include . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim  $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/libetpan/include $(KDEPIMDIR)/microkde/kdeui 
-LIBS        += -L$(QPEDIR)/lib -lmicromailwrapper -lqpe -lmicrolibetpan  -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokdepim
+LIBS        += -L$(QPEDIR)/lib -lmicromailwrapper -lqpe -lmicrolibetpan  -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokdepim -lpthread
 LIBS += $(QTOPIALIB)
 #LIBS += -lqtopia 
 #next line for Zaurus only
 #LIBS +=  -luuid
 LIBS += $(GCC3EXTRALIB1)
 LIBS += $(GCC3EXTRALIB2)
 #
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/bin
 TARGET       = ompi
diff --git a/kmicromail/libmailwrapper/libmailwrapperE.pro b/kmicromail/libmailwrapper/libmailwrapperE.pro
index 7cc7a90..57b0643 100644
--- a/kmicromail/libmailwrapper/libmailwrapperE.pro
+++ b/kmicromail/libmailwrapper/libmailwrapperE.pro
@@ -1,49 +1,49 @@
 TEMPLATE        = lib
 CONFIG        += qt warn_on
 HEADERS         = mailwrapper.h \
               imapwrapper.h \
               mailtypes.h \
               pop3wrapper.h \
               abstractmail.h  \
               smtpwrapper.h \
               genericwrapper.h \
               mboxwrapper.h \
               settings.h \
               logindialog.h \
               sendmailprogress.h \
               statusmail.h \
               mhwrapper.h \
               nntpwrapper.h \
               generatemail.h \
               storemail.h
 SOURCES         = imapwrapper.cpp \
               mailwrapper.cpp \
               mailtypes.cpp \
               pop3wrapper.cpp \
               abstractmail.cpp \
               smtpwrapper.cpp \
               genericwrapper.cpp \
               mboxwrapper.cpp \
               settings.cpp \
               logindialog.cpp \
               sendmailprogress.cpp \
               statusmail.cpp \
               mhwrapper.cpp \
              nntpwrapper.cpp \
              generatemail.cpp \
              storemail.cpp
 INTERFACES     = logindialogui.ui \
              sendmailprogressui.ui
-INCLUDEPATH +=  ../../microkde ../../microkde/kdecore ../libetpan/include $(QPEDIR)/include
+INCLUDEPATH +=  ../../microkde ../../microkde/kdecore $(KDEPIMDIR)/libetpan/include $(QPEDIR)/include
 LIBS        +=   -lssl -lcrypto
 #-lqpe -letpan
 DESTDIR      = $(QPEDIR)/lib
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 TARGET       = micromailwrapper