author | ar <ar> | 2004-05-01 21:43:55 (UTC) |
---|---|---|
committer | ar <ar> | 2004-05-01 21:43:55 (UTC) |
commit | c3c3d7c9be7b6ff1c905686bd960877f816962ff (patch) (unidiff) | |
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,8 +1,8 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | 3 | ||
4 | HEADERS = mailwrapper.h \ | 4 | HEADERS = mailwrapper.h \ |
5 | imapwrapper.h \ | 5 | imapwrapper.h \ |
6 | mailtypes.h \ | 6 | mailtypes.h \ |
7 | pop3wrapper.h \ | 7 | pop3wrapper.h \ |
8 | abstractmail.h \ | 8 | abstractmail.h \ |
@@ -48,11 +48,11 @@ contains( $(CONFIG_TARGET_MACOSX), y ){ | |||
48 | DESTDIR = $(OPIEDIR)/lib | 48 | DESTDIR = $(OPIEDIR)/lib |
49 | TARGET = mailwrapper | 49 | TARGET = mailwrapper |
50 | 50 | ||
51 | include ( $(OPIEDIR)/include.pro ) | 51 | include ( $(OPIEDIR)/include.pro ) |
52 | 52 | ||
53 | !isEmpty( LIBETPAN_INC_DIR ) { | 53 | !isEmpty( LIBETPAN_INC_DIR ) { |
54 | INCLUDEPATH += $$LIBETPAN_INC_DIR | 54 | INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH |
55 | } | 55 | } |
56 | !isEmpty( LIBETPAN_LIB_DIR ) { | 56 | !isEmpty( LIBETPAN_LIB_DIR ) { |
57 | LIBS += -L$$LIBETPAN_LIB_DIR | 57 | LIBS = -L$$LIBETPAN_LIB_DIR $$LIBS |
58 | } | 58 | } |
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 | |||
@@ -14,13 +14,13 @@ HEADERS = defines.h \ | |||
14 | statuswidget.h \ | 14 | statuswidget.h \ |
15 | newmaildir.h \ | 15 | newmaildir.h \ |
16 | selectstore.h \ | 16 | selectstore.h \ |
17 | selectsmtp.h \ | 17 | selectsmtp.h \ |
18 | nntpgroups.h \ | 18 | nntpgroups.h \ |
19 | nntpgroupsdlg.h | 19 | nntpgroupsdlg.h |
20 | 20 | ||
21 | SOURCES = main.cpp \ | 21 | SOURCES = main.cpp \ |
22 | opiemail.cpp \ | 22 | opiemail.cpp \ |
23 | mainwindow.cpp \ | 23 | mainwindow.cpp \ |
24 | accountview.cpp \ | 24 | accountview.cpp \ |
25 | accountitem.cpp \ | 25 | accountitem.cpp \ |
26 | composemail.cpp \ | 26 | composemail.cpp \ |
@@ -33,13 +33,13 @@ SOURCES = main.cpp \ | |||
33 | statuswidget.cpp \ | 33 | statuswidget.cpp \ |
34 | newmaildir.cpp \ | 34 | newmaildir.cpp \ |
35 | selectstore.cpp \ | 35 | selectstore.cpp \ |
36 | selectsmtp.cpp \ | 36 | selectsmtp.cpp \ |
37 | nntpgroups.cpp \ | 37 | nntpgroups.cpp \ |
38 | nntpgroupsdlg.cpp | 38 | nntpgroupsdlg.cpp |
39 | 39 | ||
40 | INTERFACES = editaccountsui.ui \ | 40 | INTERFACES = editaccountsui.ui \ |
41 | selectmailtypeui.ui \ | 41 | selectmailtypeui.ui \ |
42 | imapconfigui.ui \ | 42 | imapconfigui.ui \ |
43 | pop3configui.ui \ | 43 | pop3configui.ui \ |
44 | nntpconfigui.ui \ | 44 | nntpconfigui.ui \ |
45 | smtpconfigui.ui \ | 45 | smtpconfigui.ui \ |
@@ -47,13 +47,13 @@ INTERFACES = editaccountsui.ui \ | |||
47 | composemailui.ui \ | 47 | composemailui.ui \ |
48 | settingsdialogui.ui \ | 48 | settingsdialogui.ui \ |
49 | statuswidgetui.ui \ | 49 | statuswidgetui.ui \ |
50 | newmaildirui.ui \ | 50 | newmaildirui.ui \ |
51 | selectstoreui.ui \ | 51 | selectstoreui.ui \ |
52 | nntpgroupsui.ui | 52 | nntpgroupsui.ui |
53 | 53 | ||
54 | 54 | ||
55 | INCLUDEPATH += $(OPIEDIR)/include /usr/local/include | 55 | INCLUDEPATH += $(OPIEDIR)/include /usr/local/include |
56 | 56 | ||
57 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) | 57 | CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX ) |
58 | contains( CONFTEST, y ){ | 58 | contains( CONFTEST, y ){ |
59 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -liconv -lopiemm2 | 59 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -liconv -lopiemm2 |
@@ -62,11 +62,11 @@ contains( CONFTEST, y ){ | |||
62 | } | 62 | } |
63 | 63 | ||
64 | TARGET = opiemail | 64 | TARGET = opiemail |
65 | 65 | ||
66 | include ( $(OPIEDIR)/include.pro ) | 66 | include ( $(OPIEDIR)/include.pro ) |
67 | !isEmpty( LIBETPAN_INC_DIR ) { | 67 | !isEmpty( LIBETPAN_INC_DIR ) { |
68 | INCLUDEPATH += $$LIBETPAN_INC_DIR | 68 | INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH |
69 | } | 69 | } |
70 | !isEmpty( LIBETPAN_LIB_DIR ) { | 70 | !isEmpty( LIBETPAN_LIB_DIR ) { |
71 | LIBS += -Wl,-rpath-link,$$LIBETPAN_LIB_DIR | 71 | LIBS = -Wl,-rpath-link,$$LIBETPAN_LIB_DIR $$LIBS |
72 | } | 72 | } |