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
@@ -41,7 +41,7 @@ SUBDIRS_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
@@ -289,7 +289,7 @@ tmake: objects \
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) \
@@ -354,8 +354,8 @@ kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
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)
diff --git a/Makefile.Embedded b/Makefile.Embedded
index d24c8b8..594d47d 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -41,7 +41,7 @@ SUBDIRS_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
@@ -289,7 +289,7 @@ tmake: objects \
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) \
@@ -354,8 +354,8 @@ kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
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)
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 4379498..a5a51f7 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -54,8 +54,8 @@ INTERFACES = editaccountsui.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
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
@@ -38,7 +38,7 @@ SOURCES = imapwrapper.cpp \
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