| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | Makefile.Embedded | 8 | ||||
| -rw-r--r-- | kmicromail/kmicromailE.pro | 4 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/libmailwrapperE.pro | 2 |
4 files changed, 11 insertions, 11 deletions
@@ -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 - 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) 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 - 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) 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 -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) 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 |