summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-03-18 19:24:17 (UTC)
committer zautrix <zautrix>2005-03-18 19:24:17 (UTC)
commit9319998f20f03dcc217fbb39656755dc65226276 (patch) (unidiff)
tree7c8e6731b9ec4a2eed99ec1b2942b467f5bd591b
parentd6438efc4c7cff39024b65bfd1d2f810212da544 (diff)
downloadkdepimpi-9319998f20f03dcc217fbb39656755dc65226276.zip
kdepimpi-9319998f20f03dcc217fbb39656755dc65226276.tar.gz
kdepimpi-9319998f20f03dcc217fbb39656755dc65226276.tar.bz2
libetpan update - first step
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile8
-rw-r--r--Makefile.Embedded8
-rw-r--r--kmicromail/kmicromailE.pro4
-rw-r--r--kmicromail/libmailwrapper/libmailwrapperE.pro2
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 = \
36 36
37SUBDIRS_SHARP_PLUGIN = \ 37SUBDIRS_SHARP_PLUGIN = \
38 kabc/plugins/sharpdtm 38 kabc/plugins/sharpdtm
39 39
40SUBDIRS_LDAP_PLUGIN = \ 40SUBDIRS_LDAP_PLUGIN = \
41 kabc/plugins/ldap 41 kabc/plugins/ldap
42 42
43SUBDIRS_MICROMAIL = \ 43SUBDIRS_MICROMAIL = \
44 kmicromail/libetpan \ 44 libetpan \
45 kmicromail/libmailwrapper \ 45 kmicromail/libmailwrapper \
46 kmicromail 46 kmicromail
47 47
48SUBDIRS_GAMMU = \ 48SUBDIRS_GAMMU = \
49 gammu/emb/common \ 49 gammu/emb/common \
50 gammu/emb/gammu 50 gammu/emb/gammu
51 51
52SUBDIRS_PWMANAGER = \ 52SUBDIRS_PWMANAGER = \
@@ -284,17 +284,17 @@ tmake: objects \
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)
@@ -349,18 +349,18 @@ 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
351kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro 351kaddressbook/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
354kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro 354kmicromail/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
357kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro 357libetpan/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
360kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro 360kmicromail/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
363gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro 363gammu/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
366gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro 366gammu/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 = \
36 36
37SUBDIRS_SHARP_PLUGIN = \ 37SUBDIRS_SHARP_PLUGIN = \
38 kabc/plugins/sharpdtm 38 kabc/plugins/sharpdtm
39 39
40SUBDIRS_LDAP_PLUGIN = \ 40SUBDIRS_LDAP_PLUGIN = \
41 kabc/plugins/ldap 41 kabc/plugins/ldap
42 42
43SUBDIRS_MICROMAIL = \ 43SUBDIRS_MICROMAIL = \
44 kmicromail/libetpan \ 44 libetpan \
45 kmicromail/libmailwrapper \ 45 kmicromail/libmailwrapper \
46 kmicromail 46 kmicromail
47 47
48SUBDIRS_GAMMU = \ 48SUBDIRS_GAMMU = \
49 gammu/emb/common \ 49 gammu/emb/common \
50 gammu/emb/gammu 50 gammu/emb/gammu
51 51
52SUBDIRS_PWMANAGER = \ 52SUBDIRS_PWMANAGER = \
@@ -284,17 +284,17 @@ tmake: objects \
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)
@@ -349,18 +349,18 @@ 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
351kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro 351kaddressbook/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
354kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro 354kmicromail/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
357kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro 357libetpan/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
360kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro 360kmicromail/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
363gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro 363gammu/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
366gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro 366gammu/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 \
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
57INCLUDEPATH += $(QPEDIR)/include . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore libetpan/include $(KDEPIMDIR)/microkde/kdeui 57INCLUDEPATH += $(QPEDIR)/include . $(KDEPIMDIR) $(KDEPIMDIR)/libkdepim $(KDEPIMDIR)/qtcompat $(KDEPIMDIR)/microkde $(KDEPIMDIR)/microkde/kdecore $(KDEPIMDIR)/libetpan/include $(KDEPIMDIR)/microkde/kdeui
58LIBS += -L$(QPEDIR)/lib -lmicromailwrapper -lqpe -lmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokdepim 58LIBS += -L$(QPEDIR)/lib -lmicromailwrapper -lqpe -lmicrolibetpan -lmicrokde -lmicroqtcompat -lssl -lcrypto -ljpeg -lmicrokdepim -lpthread
59LIBS += $(QTOPIALIB) 59LIBS += $(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
64LIBS += $(GCC3EXTRALIB1) 64LIBS += $(GCC3EXTRALIB1)
65LIBS += $(GCC3EXTRALIB2) 65LIBS += $(GCC3EXTRALIB2)
66# 66#
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 \
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
38INTERFACES = logindialogui.ui \ 38INTERFACES = logindialogui.ui \
39 sendmailprogressui.ui 39 sendmailprogressui.ui
40 40
41INCLUDEPATH += ../../microkde ../../microkde/kdecore ../libetpan/include $(QPEDIR)/include 41INCLUDEPATH += ../../microkde ../../microkde/kdecore $(KDEPIMDIR)/libetpan/include $(QPEDIR)/include
42LIBS += -lssl -lcrypto 42LIBS += -lssl -lcrypto
43 43
44#-lqpe -letpan 44#-lqpe -letpan
45 45
46DESTDIR = $(QPEDIR)/lib 46DESTDIR = $(QPEDIR)/lib
47OBJECTS_DIR = obj/$(PLATFORM) 47OBJECTS_DIR = obj/$(PLATFORM)
48MOC_DIR = moc/$(PLATFORM) 48MOC_DIR = moc/$(PLATFORM)
49TARGET = micromailwrapper 49TARGET = micromailwrapper