| author | ar <ar> | 2004-05-01 21:43:55 (UTC) |
|---|---|---|
| committer | ar <ar> | 2004-05-01 21:43:55 (UTC) |
| commit | c3c3d7c9be7b6ff1c905686bd960877f816962ff (patch) (side-by-side diff) | |
| tree | 0766ac99f1e66b83beca222426e1a08faeff53c1 /noncore/net/mail | |
| parent | 8aa8b5166653d52f9623fbb1391d044916a2a260 (diff) | |
| download | opie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.zip opie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.tar.gz opie-c3c3d7c9be7b6ff1c905686bd960877f816962ff.tar.bz2 | |
- use lib and inlcude dir from dependencies before the other dir's
| -rw-r--r-- | noncore/net/mail/libmailwrapper/libmailwrapper.pro | 6 | ||||
| -rw-r--r-- | noncore/net/mail/mail.pro | 10 |
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,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt warn_on +CONFIG += qt warn_on HEADERS = mailwrapper.h \ imapwrapper.h \ @@ -51,8 +51,8 @@ TARGET = mailwrapper 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 @@ -17,7 +17,7 @@ HEADERS = defines.h \ selectsmtp.h \ nntpgroups.h \ nntpgroupsdlg.h - + SOURCES = main.cpp \ opiemail.cpp \ mainwindow.cpp \ @@ -36,7 +36,7 @@ SOURCES = main.cpp \ selectsmtp.cpp \ nntpgroups.cpp \ nntpgroupsdlg.cpp - + INTERFACES = editaccountsui.ui \ selectmailtypeui.ui \ imapconfigui.ui \ @@ -50,7 +50,7 @@ INTERFACES = editaccountsui.ui \ newmaildirui.ui \ selectstoreui.ui \ nntpgroupsui.ui - + INCLUDEPATH += $(OPIEDIR)/include /usr/local/include @@ -65,8 +65,8 @@ 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 } |