4 files changed, 11 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index d24c8b8..594d47d 100644
--- a/Makefile
+++ b/Makefile
@@ -36,17 +36,17 @@ SUBDIRS_OPIE_PLUGIN = \
 
 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 = \
@@ -284,17 +284,17 @@ tmake: objects \
        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)
@@ -349,18 +349,18 @@ 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)
+libetpan/Makefile$(PLATFORM): libetpan/libetpanE.pro
+        cd libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
 
 kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
         cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
 
 gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
         cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
 
 gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
diff --git a/Makefile.Embedded b/Makefile.Embedded
index d24c8b8..594d47d 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -36,17 +36,17 @@ SUBDIRS_OPIE_PLUGIN = \
 
 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 = \
@@ -284,17 +284,17 @@ tmake: objects \
        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)
@@ -349,18 +349,18 @@ 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)
+libetpan/Makefile$(PLATFORM): libetpan/libetpanE.pro
+        cd libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
 
 kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
         cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
 
 gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
         cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
 
 gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 4379498..a5a51f7 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -49,18 +49,18 @@ INTERFACES     = editaccountsui.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 
-LIBS        += -L$(QPEDIR)/lib -lmicromailwrapper -lqpe -lmicrolibetpan  -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokdepim
+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 -lpthread
 LIBS += $(QTOPIALIB)
 #LIBS += -lqtopia 
 #next line for Zaurus only
 #LIBS +=  -luuid
 
 LIBS += $(GCC3EXTRALIB1)
 LIBS += $(GCC3EXTRALIB2)
 #
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
@@ -33,17 +33,17 @@ SOURCES         = imapwrapper.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