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
@@ -43,3 +43,3 @@ SUBDIRS_LDAP_PLUGIN = \
 SUBDIRS_MICROMAIL = \
-   kmicromail/libetpan \
+   libetpan \
   kmicromail/libmailwrapper \
@@ -291,3 +291,3 @@ tmake: objects \
       kmicromail/Makefile$(PLATFORM) \
-       kmicromail/libetpan/Makefile$(PLATFORM) \
+       libetpan/Makefile$(PLATFORM) \
       kmicromail/libmailwrapper/Makefile$(PLATFORM) \
@@ -356,4 +356,4 @@ kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
-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)
diff --git a/Makefile.Embedded b/Makefile.Embedded
index d24c8b8..594d47d 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -43,3 +43,3 @@ SUBDIRS_LDAP_PLUGIN = \
 SUBDIRS_MICROMAIL = \
-   kmicromail/libetpan \
+   libetpan \
   kmicromail/libmailwrapper \
@@ -291,3 +291,3 @@ tmake: objects \
       kmicromail/Makefile$(PLATFORM) \
-       kmicromail/libetpan/Makefile$(PLATFORM) \
+       libetpan/Makefile$(PLATFORM) \
       kmicromail/libmailwrapper/Makefile$(PLATFORM) \
@@ -356,4 +356,4 @@ kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
-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)
diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro
index 4379498..a5a51f7 100644
--- a/kmicromail/kmicromailE.pro
+++ b/kmicromail/kmicromailE.pro
@@ -56,4 +56,4 @@ INTERFACES     = editaccountsui.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)
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
@@ -40,3 +40,3 @@ INTERFACES     = logindialogui.ui \
-INCLUDEPATH +=  ../../microkde ../../microkde/kdecore ../libetpan/include $(QPEDIR)/include
+INCLUDEPATH +=  ../../microkde ../../microkde/kdecore $(KDEPIMDIR)/libetpan/include $(QPEDIR)/include
 LIBS        +=   -lssl -lcrypto
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
@@ -43,3 +43,3 @@ SUBDIRS_LDAP_PLUGIN = \
43	SUBDIRS_MICROMAIL = \	43	SUBDIRS_MICROMAIL = \
44	kmicromail/libetpan \	44	libetpan \
45	kmicromail/libmailwrapper \	45	kmicromail/libmailwrapper \
@@ -291,3 +291,3 @@ tmake: objects \
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) \
@@ -356,4 +356,4 @@ kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
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


diff --git a/Makefile.Embedded b/Makefile.Embedded index d24c8b8..594d47d 100644 --- a/Makefile.Embedded +++ b/Makefile.Embedded
@@ -43,3 +43,3 @@ SUBDIRS_LDAP_PLUGIN = \
43	SUBDIRS_MICROMAIL = \	43	SUBDIRS_MICROMAIL = \
44	kmicromail/libetpan \	44	libetpan \
45	kmicromail/libmailwrapper \	45	kmicromail/libmailwrapper \
@@ -291,3 +291,3 @@ tmake: objects \
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) \
@@ -356,4 +356,4 @@ kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
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


diff --git a/kmicromail/kmicromailE.pro b/kmicromail/kmicromailE.pro index 4379498..a5a51f7 100644 --- a/kmicromail/kmicromailE.pro +++ b/kmicromail/kmicromailE.pro
@@ -56,4 +56,4 @@ INTERFACES = editaccountsui.ui \
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)


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
@@ -40,3 +40,3 @@ INTERFACES = logindialogui.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