summaryrefslogtreecommitdiff
path: root/noncore/net
authorar <ar>2004-05-01 21:43:55 (UTC)
committer ar <ar>2004-05-01 21:43:55 (UTC)
commitc3c3d7c9be7b6ff1c905686bd960877f816962ff (patch) (side-by-side diff)
tree0766ac99f1e66b83beca222426e1a08faeff53c1 /noncore/net
parent8aa8b5166653d52f9623fbb1391d044916a2a260 (diff)
downloadopie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.zip
opie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.tar.gz
opie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.tar.bz2
- use lib and inlcude dir from dependencies before the other dir's
Diffstat (limited to 'noncore/net') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/libmailwrapper/libmailwrapper.pro6
-rw-r--r--noncore/net/mail/mail.pro10
2 files changed, 8 insertions, 8 deletions
diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.pro b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
index 5e44064..befadd7 100644
--- a/noncore/net/mail/libmailwrapper/libmailwrapper.pro
+++ b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
@@ -1,4 +1,4 @@
TEMPLATE = lib
-CONFIG += qt warn_on
+CONFIG += qt warn_on
HEADERS = mailwrapper.h \
@@ -52,7 +52,7 @@ include ( $(OPIEDIR)/include.pro )
!isEmpty( LIBETPAN_INC_DIR ) {
- INCLUDEPATH += $$LIBETPAN_INC_DIR
+ INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
}
!isEmpty( LIBETPAN_LIB_DIR ) {
- LIBS += -L$$LIBETPAN_LIB_DIR
+ LIBS = -L$$LIBETPAN_LIB_DIR $$LIBS
}
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index a3328cb..c88923f 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -18,5 +18,5 @@ HEADERS = defines.h \
nntpgroups.h \
nntpgroupsdlg.h
-
+
SOURCES = main.cpp \
opiemail.cpp \
@@ -37,5 +37,5 @@ SOURCES = main.cpp \
nntpgroups.cpp \
nntpgroupsdlg.cpp
-
+
INTERFACES = editaccountsui.ui \
selectmailtypeui.ui \
@@ -51,5 +51,5 @@ INTERFACES = editaccountsui.ui \
selectstoreui.ui \
nntpgroupsui.ui
-
+
INCLUDEPATH += $(OPIEDIR)/include /usr/local/include
@@ -66,7 +66,7 @@ TARGET = opiemail
include ( $(OPIEDIR)/include.pro )
!isEmpty( LIBETPAN_INC_DIR ) {
- INCLUDEPATH += $$LIBETPAN_INC_DIR
+ INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
}
!isEmpty( LIBETPAN_LIB_DIR ) {
- LIBS += -Wl,-rpath-link,$$LIBETPAN_LIB_DIR
+ LIBS = -Wl,-rpath-link,$$LIBETPAN_LIB_DIR $$LIBS
}