libetpan update - first step

author: zautrix <zautrix> 2005-03-18 19:24:17 (UTC)
committer: zautrix <zautrix> 2005-03-18 19:24:17 (UTC)
commit: 9319998f20f03dcc217fbb39656755dc65226276 (patch) (unidiff)
tree: 7c8e6731b9ec4a2eed99ec1b2942b467f5bd591b
parent: d6438efc4c7cff39024b65bfd1d2f810212da544 (diff)
download: kdepimpi-9319998f20f03dcc217fbb39656755dc65226276.zip
kdepimpi-9319998f20f03dcc217fbb39656755dc65226276.tar.gz
kdepimpi-9319998f20f03dcc217fbb39656755dc65226276.tar.bz2
4 files changed, 11 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index d24c8b8..594d47d 100644
--- a/Makefile
+++ b/Makefile
@@ -32,25 +32,25 @@ 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 \
@@ -280,25 +280,25 @@ tmake: objects \
       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)
@@ -345,26 +345,26 @@ kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
 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)
diff --git a/Makefile.Embedded b/Makefile.Embedded
index d24c8b8..594d47d 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -32,25 +32,25 @@ 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 \
@@ -280,25 +280,25 @@ tmake: objects \
       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)
@@ -345,26 +345,26 @@ kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
 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)
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 4379498..a5a51f7 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -45,26 +45,26 @@ INTERFACES     = editaccountsui.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
@@ -29,21 +29,21 @@ SOURCES         = imapwrapper.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
author	zautrix <zautrix>	2005-03-18 19:24:17 (UTC)
committer	zautrix <zautrix>	2005-03-18 19:24:17 (UTC)
commit	9319998f20f03dcc217fbb39656755dc65226276 (patch) (unidiff)
tree	7c8e6731b9ec4a2eed99ec1b2942b467f5bd591b
parent	d6438efc4c7cff39024b65bfd1d2f810212da544 (diff)
download	kdepimpi-9319998f20f03dcc217fbb39656755dc65226276.zip kdepimpi-9319998f20f03dcc217fbb39656755dc65226276.tar.gz kdepimpi-9319998f20f03dcc217fbb39656755dc65226276.tar.bz2

diff --git a/Makefile b/Makefile index d24c8b8..594d47d 100644 --- a/Makefile +++ b/Makefile
@@ -32,25 +32,25 @@ SUBDIRS_QTOPIA_PLUGIN = \
32	kabc/plugins/qtopia	32	kabc/plugins/qtopia
33		33
34	SUBDIRS_OPIE_PLUGIN = \	34	SUBDIRS_OPIE_PLUGIN = \
35	kabc/plugins/opie	35	kabc/plugins/opie
36		36
37	SUBDIRS_SHARP_PLUGIN = \	37	SUBDIRS_SHARP_PLUGIN = \
38	kabc/plugins/sharpdtm	38	kabc/plugins/sharpdtm
39		39
40	SUBDIRS_LDAP_PLUGIN = \	40	SUBDIRS_LDAP_PLUGIN = \
41	kabc/plugins/ldap	41	kabc/plugins/ldap
42		42
43	SUBDIRS_MICROMAIL = \	43	SUBDIRS_MICROMAIL = \
44	kmicromail/libetpan \	44	libetpan \
45	kmicromail/libmailwrapper \	45	kmicromail/libmailwrapper \
46	kmicromail	46	kmicromail
47		47
48	SUBDIRS_GAMMU = \	48	SUBDIRS_GAMMU = \
49	gammu/emb/common \	49	gammu/emb/common \
50	gammu/emb/gammu	50	gammu/emb/gammu
51		51
52	SUBDIRS_PWMANAGER = \	52	SUBDIRS_PWMANAGER = \
53	pwmanager/libcrypt/mpi \	53	pwmanager/libcrypt/mpi \
54	pwmanager/libcrypt/error \	54	pwmanager/libcrypt/error \
55	pwmanager/libcrypt/cipher \	55	pwmanager/libcrypt/cipher \
56	pwmanager/libcrypt/zlib \	56	pwmanager/libcrypt/zlib \
@@ -280,25 +280,25 @@ tmake: objects \
280	libical/src/libical/Makefile$(PLATFORM) \	280	libical/src/libical/Makefile$(PLATFORM) \
281	libical/src/libicalss/Makefile$(PLATFORM) \	281	libical/src/libicalss/Makefile$(PLATFORM) \
282	kabc/Makefile$(PLATFORM) \	282	kabc/Makefile$(PLATFORM) \
283	kabc/formats/binary/Makefile$(PLATFORM) \	283	kabc/formats/binary/Makefile$(PLATFORM) \
284	kabc/plugins/file/Makefile$(PLATFORM) \	284	kabc/plugins/file/Makefile$(PLATFORM) \
285	kabc/plugins/dir/Makefile$(PLATFORM) \	285	kabc/plugins/dir/Makefile$(PLATFORM) \
286	kabc/plugins/ldap/Makefile$(PLATFORM) \	286	kabc/plugins/ldap/Makefile$(PLATFORM) \
287	kabc/plugins/opie/Makefile$(PLATFORM) \	287	kabc/plugins/opie/Makefile$(PLATFORM) \
288	kabc/plugins/qtopia/Makefile$(PLATFORM) \	288	kabc/plugins/qtopia/Makefile$(PLATFORM) \
289	kabc/plugins/sharpdtm/Makefile$(PLATFORM) \	289	kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
290	kaddressbook/Makefile$(PLATFORM) \	290	kaddressbook/Makefile$(PLATFORM) \
291	kmicromail/Makefile$(PLATFORM) \	291	kmicromail/Makefile$(PLATFORM) \
292	kmicromail/libetpan/Makefile$(PLATFORM) \	292	libetpan/Makefile$(PLATFORM) \
293	kmicromail/libmailwrapper/Makefile$(PLATFORM) \	293	kmicromail/libmailwrapper/Makefile$(PLATFORM) \
294	gammu/emb/common/Makefile$(PLATFORM) \	294	gammu/emb/common/Makefile$(PLATFORM) \
295	gammu/emb/gammu/Makefile$(PLATFORM) \	295	gammu/emb/gammu/Makefile$(PLATFORM) \
296	pwmanager/pwmanager/Makefile$(PLATFORM) \	296	pwmanager/pwmanager/Makefile$(PLATFORM) \
297	pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \	297	pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
298	pwmanager/libcrypt/error/Makefile$(PLATFORM) \	298	pwmanager/libcrypt/error/Makefile$(PLATFORM) \
299	pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \	299	pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
300	pwmanager/libcrypt/zlib/Makefile$(PLATFORM)	300	pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
301		301
302	qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro	302	qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
303	cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)	303	cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
304		304
@@ -345,26 +345,26 @@ kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
345	kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro	345	kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
346	cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)	346	cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
347		347
348	kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro	348	kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
349	cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)	349	cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
350		350
351	kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro	351	kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
352	cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)	352	cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
353		353
354	kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro	354	kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
355	cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)	355	cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
356		356
357	kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro	357	libetpan/Makefile$(PLATFORM): libetpan/libetpanE.pro
358	cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)	358	cd libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
359		359
360	kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro	360	kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
361	cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)	361	cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
362		362
363	gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro	363	gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
364	cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)	364	cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
365		365
366	gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro	366	gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
367	cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)	367	cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
368		368
369	pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro	369	pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
370	cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)	370	cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)


diff --git a/Makefile.Embedded b/Makefile.Embedded index d24c8b8..594d47d 100644 --- a/Makefile.Embedded +++ b/Makefile.Embedded
@@ -32,25 +32,25 @@ SUBDIRS_QTOPIA_PLUGIN = \
32	kabc/plugins/qtopia	32	kabc/plugins/qtopia
33		33
34	SUBDIRS_OPIE_PLUGIN = \	34	SUBDIRS_OPIE_PLUGIN = \
35	kabc/plugins/opie	35	kabc/plugins/opie
36		36
37	SUBDIRS_SHARP_PLUGIN = \	37	SUBDIRS_SHARP_PLUGIN = \
38	kabc/plugins/sharpdtm	38	kabc/plugins/sharpdtm
39		39
40	SUBDIRS_LDAP_PLUGIN = \	40	SUBDIRS_LDAP_PLUGIN = \
41	kabc/plugins/ldap	41	kabc/plugins/ldap
42		42
43	SUBDIRS_MICROMAIL = \	43	SUBDIRS_MICROMAIL = \
44	kmicromail/libetpan \	44	libetpan \
45	kmicromail/libmailwrapper \	45	kmicromail/libmailwrapper \
46	kmicromail	46	kmicromail
47		47
48	SUBDIRS_GAMMU = \	48	SUBDIRS_GAMMU = \
49	gammu/emb/common \	49	gammu/emb/common \
50	gammu/emb/gammu	50	gammu/emb/gammu
51		51
52	SUBDIRS_PWMANAGER = \	52	SUBDIRS_PWMANAGER = \
53	pwmanager/libcrypt/mpi \	53	pwmanager/libcrypt/mpi \
54	pwmanager/libcrypt/error \	54	pwmanager/libcrypt/error \
55	pwmanager/libcrypt/cipher \	55	pwmanager/libcrypt/cipher \
56	pwmanager/libcrypt/zlib \	56	pwmanager/libcrypt/zlib \
@@ -280,25 +280,25 @@ tmake: objects \
280	libical/src/libical/Makefile$(PLATFORM) \	280	libical/src/libical/Makefile$(PLATFORM) \
281	libical/src/libicalss/Makefile$(PLATFORM) \	281	libical/src/libicalss/Makefile$(PLATFORM) \
282	kabc/Makefile$(PLATFORM) \	282	kabc/Makefile$(PLATFORM) \
283	kabc/formats/binary/Makefile$(PLATFORM) \	283	kabc/formats/binary/Makefile$(PLATFORM) \
284	kabc/plugins/file/Makefile$(PLATFORM) \	284	kabc/plugins/file/Makefile$(PLATFORM) \
285	kabc/plugins/dir/Makefile$(PLATFORM) \	285	kabc/plugins/dir/Makefile$(PLATFORM) \
286	kabc/plugins/ldap/Makefile$(PLATFORM) \	286	kabc/plugins/ldap/Makefile$(PLATFORM) \
287	kabc/plugins/opie/Makefile$(PLATFORM) \	287	kabc/plugins/opie/Makefile$(PLATFORM) \
288	kabc/plugins/qtopia/Makefile$(PLATFORM) \	288	kabc/plugins/qtopia/Makefile$(PLATFORM) \
289	kabc/plugins/sharpdtm/Makefile$(PLATFORM) \	289	kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
290	kaddressbook/Makefile$(PLATFORM) \	290	kaddressbook/Makefile$(PLATFORM) \
291	kmicromail/Makefile$(PLATFORM) \	291	kmicromail/Makefile$(PLATFORM) \
292	kmicromail/libetpan/Makefile$(PLATFORM) \	292	libetpan/Makefile$(PLATFORM) \
293	kmicromail/libmailwrapper/Makefile$(PLATFORM) \	293	kmicromail/libmailwrapper/Makefile$(PLATFORM) \
294	gammu/emb/common/Makefile$(PLATFORM) \	294	gammu/emb/common/Makefile$(PLATFORM) \
295	gammu/emb/gammu/Makefile$(PLATFORM) \	295	gammu/emb/gammu/Makefile$(PLATFORM) \
296	pwmanager/pwmanager/Makefile$(PLATFORM) \	296	pwmanager/pwmanager/Makefile$(PLATFORM) \
297	pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \	297	pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
298	pwmanager/libcrypt/error/Makefile$(PLATFORM) \	298	pwmanager/libcrypt/error/Makefile$(PLATFORM) \
299	pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \	299	pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
300	pwmanager/libcrypt/zlib/Makefile$(PLATFORM)	300	pwmanager/libcrypt/zlib/Makefile$(PLATFORM)
301		301
302	qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro	302	qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
303	cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)	303	cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
304		304
@@ -345,26 +345,26 @@ kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
345	kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro	345	kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
346	cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)	346	cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
347		347
348	kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro	348	kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
349	cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)	349	cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
350		350
351	kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro	351	kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
352	cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)	352	cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
353		353
354	kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro	354	kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
355	cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)	355	cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
356		356
357	kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro	357	libetpan/Makefile$(PLATFORM): libetpan/libetpanE.pro
358	cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)	358	cd libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
359		359
360	kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro	360	kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
361	cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)	361	cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
362		362
363	gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro	363	gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
364	cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)	364	cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
365		365
366	gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro	366	gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
367	cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)	367	cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
368		368
369	pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro	369	pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
370	cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)	370	cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.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
@@ -45,26 +45,26 @@ INTERFACES = editaccountsui.ui \
45	imapconfigui.ui \	45	imapconfigui.ui \
46	pop3configui.ui \	46	pop3configui.ui \
47	nntpconfigui.ui \	47	nntpconfigui.ui \
48	smtpconfigui.ui \	48	smtpconfigui.ui \
49	composemailui.ui \	49	composemailui.ui \
50	settingsdialogui.ui \	50	settingsdialogui.ui \
51	statuswidgetui.ui \	51	statuswidgetui.ui \
52	newmaildirui.ui \	52	newmaildirui.ui \
53	selectstoreui.ui \	53	selectstoreui.ui \
54	nntpgroupsui.ui	54	nntpgroupsui.ui
55		55
56		56
57	INCLUDEPATH += $(QPEDIR)/include . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui	57	INCLUDEPATH += $(QPEDIR)/include . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/libetpan/include $(KDEPIMDIR)/microkde/kdeui
58	LIBS += -L$(QPEDIR)/lib -lmicromailwrapper -lqpe -lmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokdepim	58	LIBS += -L$(QPEDIR)/lib -lmicromailwrapper -lqpe -lmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokdepim -lpthread
59	LIBS += $(QTOPIALIB)	59	LIBS += $(QTOPIALIB)
60	#LIBS += -lqtopia	60	#LIBS += -lqtopia
61	#next line for Zaurus only	61	#next line for Zaurus only
62	#LIBS += -luuid	62	#LIBS += -luuid
63		63
64	LIBS += $(GCC3EXTRALIB1)	64	LIBS += $(GCC3EXTRALIB1)
65	LIBS += $(GCC3EXTRALIB2)	65	LIBS += $(GCC3EXTRALIB2)
66	#	66	#
67	OBJECTS_DIR = obj/$(PLATFORM)	67	OBJECTS_DIR = obj/$(PLATFORM)
68	MOC_DIR = moc/$(PLATFORM)	68	MOC_DIR = moc/$(PLATFORM)
69	DESTDIR=$(QPEDIR)/bin	69	DESTDIR=$(QPEDIR)/bin
70	TARGET = ompi	70	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
@@ -29,21 +29,21 @@ SOURCES = imapwrapper.cpp \
29	settings.cpp \	29	settings.cpp \
30	logindialog.cpp \	30	logindialog.cpp \
31	sendmailprogress.cpp \	31	sendmailprogress.cpp \
32	statusmail.cpp \	32	statusmail.cpp \
33	mhwrapper.cpp \	33	mhwrapper.cpp \
34	nntpwrapper.cpp \	34	nntpwrapper.cpp \
35	generatemail.cpp \	35	generatemail.cpp \
36	storemail.cpp	36	storemail.cpp
37		37
38	INTERFACES = logindialogui.ui \	38	INTERFACES = logindialogui.ui \
39	sendmailprogressui.ui	39	sendmailprogressui.ui
40		40
41	INCLUDEPATH += ../../microkde ../../microkde/kdecore ../libetpan/include $(QPEDIR)/include	41	INCLUDEPATH += ../../microkde ../../microkde/kdecore $(KDEPIMDIR)/libetpan/include $(QPEDIR)/include
42	LIBS += -lssl -lcrypto	42	LIBS += -lssl -lcrypto
43		43
44	#-lqpe -letpan	44	#-lqpe -letpan
45		45
46	DESTDIR = $(QPEDIR)/lib	46	DESTDIR = $(QPEDIR)/lib
47	OBJECTS_DIR = obj/$(PLATFORM)	47	OBJECTS_DIR = obj/$(PLATFORM)
48	MOC_DIR = moc/$(PLATFORM)	48	MOC_DIR = moc/$(PLATFORM)
49	TARGET = micromailwrapper	49	TARGET = micromailwrapper