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 | |
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,14 +1,14 @@ TEMPLATE = lib -CONFIG += qt warn_on +CONFIG += qt warn_on HEADERS = mailwrapper.h \ imapwrapper.h \ mailtypes.h \ pop3wrapper.h \ abstractmail.h \ smtpwrapper.h \ genericwrapper.h \ mboxwrapper.h \ settings.h \ logindialog.h \ sendmailprogress.h \ @@ -42,17 +42,17 @@ INCLUDEPATH += $(OPIEDIR)/include LIBS += -lqpe -letpan -lssl -lcrypto contains( $(CONFIG_TARGET_MACOSX), y ){ LIBS += -liconv } DESTDIR = $(OPIEDIR)/lib 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 @@ -8,65 +8,65 @@ HEADERS = defines.h \ mainwindow.h \ viewmail.h \ viewmailbase.h \ opiemail.h \ mailistviewitem.h \ settingsdialog.h \ statuswidget.h \ newmaildir.h \ selectstore.h \ selectsmtp.h \ nntpgroups.h \ nntpgroupsdlg.h - + SOURCES = main.cpp \ opiemail.cpp \ mainwindow.cpp \ accountview.cpp \ accountitem.cpp \ composemail.cpp \ addresspicker.cpp \ editaccounts.cpp \ viewmail.cpp \ viewmailbase.cpp \ mailistviewitem.cpp \ settingsdialog.cpp \ statuswidget.cpp \ newmaildir.cpp \ selectstore.cpp \ selectsmtp.cpp \ nntpgroups.cpp \ nntpgroupsdlg.cpp - + INTERFACES = editaccountsui.ui \ selectmailtypeui.ui \ imapconfigui.ui \ pop3configui.ui \ nntpconfigui.ui \ smtpconfigui.ui \ addresspickerui.ui \ composemailui.ui \ settingsdialogui.ui \ statuswidgetui.ui \ newmaildirui.ui \ selectstoreui.ui \ nntpgroupsui.ui - + INCLUDEPATH += $(OPIEDIR)/include /usr/local/include CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) contains( CONFTEST, y ){ LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -liconv -lopiemm2 }else{ LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -lopiemm2 } 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 } |