author | mickeyl <mickeyl> | 2004-12-24 12:58:59 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-12-24 12:58:59 (UTC) |
commit | dc57cb439c6c9256f76f78a487942a4d1b2a2e27 (patch) (unidiff) | |
tree | f2b1dc69283c3de30930a650c87be834e04998c9 /noncore/net/mail | |
parent | 3236db49b0718764bcfe211442354202725a6ff6 (diff) | |
download | opie-dc57cb439c6c9256f76f78a487942a4d1b2a2e27.zip opie-dc57cb439c6c9256f76f78a487942a4d1b2a2e27.tar.gz opie-dc57cb439c6c9256f76f78a487942a4d1b2a2e27.tar.bz2 |
qmake 1.08a has more rigid syntax checking and chokes on our .pro files
-rw-r--r-- | noncore/net/mail/libmailwrapper/libmailwrapper.pro | 86 | ||||
-rw-r--r-- | noncore/net/mail/mail.pro | 85 | ||||
-rw-r--r-- | noncore/net/mail/taskbarapplet/taskbarapplet.pro | 85 |
3 files changed, 253 insertions, 3 deletions
diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.pro b/noncore/net/mail/libmailwrapper/libmailwrapper.pro index dd9efcb..1b8f611 100644 --- a/noncore/net/mail/libmailwrapper/libmailwrapper.pro +++ b/noncore/net/mail/libmailwrapper/libmailwrapper.pro | |||
@@ -41,20 +41,104 @@ INTERFACES = logindialogui.ui \ | |||
41 | sendmailprogressui.ui | 41 | sendmailprogressui.ui |
42 | 42 | ||
43 | INCLUDEPATH += $(OPIEDIR)/include | 43 | INCLUDEPATH += $(OPIEDIR)/include |
44 | LIBS += -lqpe -letpan -lssl -lcrypto | 44 | LIBS += -lqpe -letpan -lssl -lcrypto |
45 | 45 | ||
46 | contains( $(CONFIG_TARGET_MACOSX), y ){ | 46 | contains( $(CONFIG_TARGET_MACOSX), y ){ |
47 | LIBS += -liconv | 47 | LIBS += -liconv |
48 | } | 48 | } |
49 | 49 | ||
50 | DESTDIR = $(OPIEDIR)/lib | 50 | DESTDIR = $(OPIEDIR)/lib |
51 | TARGET = mailwrapper | 51 | TARGET = mailwrapper |
52 | 52 | ||
53 | include ( $(OPIEDIR)/include.pro ) | 53 | include( |
54 | |||
55 | |||
56 | |||
57 | |||
58 | |||
59 | |||
60 | |||
61 | |||
62 | |||
63 | |||
64 | |||
65 | |||
66 | |||
67 | |||
68 | |||
69 | |||
70 | |||
71 | |||
72 | |||
73 | |||
74 | |||
75 | |||
76 | |||
77 | |||
78 | |||
79 | |||
80 | |||
81 | |||
82 | |||
83 | |||
84 | |||
85 | |||
86 | |||
87 | |||
88 | |||
89 | |||
90 | |||
91 | |||
92 | |||
93 | |||
94 | |||
95 | |||
96 | |||
97 | |||
98 | |||
99 | |||
100 | |||
101 | |||
102 | |||
103 | |||
104 | |||
105 | |||
106 | |||
107 | |||
108 | |||
109 | |||
110 | |||
111 | |||
112 | |||
113 | |||
114 | |||
115 | |||
116 | |||
117 | |||
118 | |||
119 | |||
120 | |||
121 | |||
122 | |||
123 | |||
124 | |||
125 | |||
126 | |||
127 | |||
128 | |||
129 | |||
130 | |||
131 | |||
132 | |||
133 | |||
134 | |||
135 | |||
136 | |||
137 | $(OPIEDIR)/include.pro ) | ||
54 | 138 | ||
55 | !isEmpty( LIBETPAN_INC_DIR ) { | 139 | !isEmpty( LIBETPAN_INC_DIR ) { |
56 | INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH | 140 | INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH |
57 | } | 141 | } |
58 | !isEmpty( LIBETPAN_LIB_DIR ) { | 142 | !isEmpty( LIBETPAN_LIB_DIR ) { |
59 | LIBS = -L$$LIBETPAN_LIB_DIR $$LIBS | 143 | LIBS = -L$$LIBETPAN_LIB_DIR $$LIBS |
60 | } | 144 | } |
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro index c88923f..e2f548f 100644 --- a/noncore/net/mail/mail.pro +++ b/noncore/net/mail/mail.pro | |||
@@ -54,19 +54,102 @@ INTERFACES = editaccountsui.ui \ | |||
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 |
60 | }else{ | 60 | }else{ |
61 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -lopiemm2 | 61 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -lopiemm2 |
62 | } | 62 | } |
63 | 63 | ||
64 | TARGET = opiemail | 64 | TARGET = opiemail |
65 | 65 | ||
66 | include ( $(OPIEDIR)/include.pro ) | 66 | include( |
67 | |||
68 | |||
69 | |||
70 | |||
71 | |||
72 | |||
73 | |||
74 | |||
75 | |||
76 | |||
77 | |||
78 | |||
79 | |||
80 | |||
81 | |||
82 | |||
83 | |||
84 | |||
85 | |||
86 | |||
87 | |||
88 | |||
89 | |||
90 | |||
91 | |||
92 | |||
93 | |||
94 | |||
95 | |||
96 | |||
97 | |||
98 | |||
99 | |||
100 | |||
101 | |||
102 | |||
103 | |||
104 | |||
105 | |||
106 | |||
107 | |||
108 | |||
109 | |||
110 | |||
111 | |||
112 | |||
113 | |||
114 | |||
115 | |||
116 | |||
117 | |||
118 | |||
119 | |||
120 | |||
121 | |||
122 | |||
123 | |||
124 | |||
125 | |||
126 | |||
127 | |||
128 | |||
129 | |||
130 | |||
131 | |||
132 | |||
133 | |||
134 | |||
135 | |||
136 | |||
137 | |||
138 | |||
139 | |||
140 | |||
141 | |||
142 | |||
143 | |||
144 | |||
145 | |||
146 | |||
147 | |||
148 | |||
149 | $(OPIEDIR)/include.pro ) | ||
67 | !isEmpty( LIBETPAN_INC_DIR ) { | 150 | !isEmpty( LIBETPAN_INC_DIR ) { |
68 | INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH | 151 | INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH |
69 | } | 152 | } |
70 | !isEmpty( LIBETPAN_LIB_DIR ) { | 153 | !isEmpty( LIBETPAN_LIB_DIR ) { |
71 | LIBS = -Wl,-rpath-link,$$LIBETPAN_LIB_DIR $$LIBS | 154 | LIBS = -Wl,-rpath-link,$$LIBETPAN_LIB_DIR $$LIBS |
72 | } | 155 | } |
diff --git a/noncore/net/mail/taskbarapplet/taskbarapplet.pro b/noncore/net/mail/taskbarapplet/taskbarapplet.pro index 1b13ddc..5b33977 100644 --- a/noncore/net/mail/taskbarapplet/taskbarapplet.pro +++ b/noncore/net/mail/taskbarapplet/taskbarapplet.pro | |||
@@ -1,12 +1,95 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG +=qt plugin warn_on | 2 | CONFIG +=qt plugin warn_on |
3 | HEADERS +=mailapplet.h \ | 3 | HEADERS +=mailapplet.h \ |
4 | mailappletimpl.h | 4 | mailappletimpl.h |
5 | SOURCES +=mailapplet.cpp \ | 5 | SOURCES +=mailapplet.cpp \ |
6 | mailappletimpl.cpp | 6 | mailappletimpl.cpp |
7 | INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/noncore/net/mail | 7 | INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/noncore/net/mail |
8 | LIBS +=-lmailwrapper -lqpe -lopiecore2 | 8 | LIBS +=-lmailwrapper -lqpe -lopiecore2 |
9 | TARGET =mailapplet | 9 | TARGET =mailapplet |
10 | DESTDIR +=$(OPIEDIR)/plugins/applets/ | 10 | DESTDIR +=$(OPIEDIR)/plugins/applets/ |
11 | 11 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include( |
13 | |||
14 | |||
15 | |||
16 | |||
17 | |||
18 | |||
19 | |||
20 | |||
21 | |||
22 | |||
23 | |||
24 | |||
25 | |||
26 | |||
27 | |||
28 | |||
29 | |||
30 | |||
31 | |||
32 | |||
33 | |||
34 | |||
35 | |||
36 | |||
37 | |||
38 | |||
39 | |||
40 | |||
41 | |||
42 | |||
43 | |||
44 | |||
45 | |||
46 | |||
47 | |||
48 | |||
49 | |||
50 | |||
51 | |||
52 | |||
53 | |||
54 | |||
55 | |||
56 | |||
57 | |||
58 | |||
59 | |||
60 | |||
61 | |||
62 | |||
63 | |||
64 | |||
65 | |||
66 | |||
67 | |||
68 | |||
69 | |||
70 | |||
71 | |||
72 | |||
73 | |||
74 | |||
75 | |||
76 | |||
77 | |||
78 | |||
79 | |||
80 | |||
81 | |||
82 | |||
83 | |||
84 | |||
85 | |||
86 | |||
87 | |||
88 | |||
89 | |||
90 | |||
91 | |||
92 | |||
93 | |||
94 | |||
95 | $(OPIEDIR)/include.pro ) | ||