3 files changed, 3 insertions, 253 deletions
diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.pro b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
index 1b8f611..2f8c54d 100644
--- a/noncore/net/mail/libmailwrapper/libmailwrapper.pro
+++ b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
@@ -47,97 +47,13 @@ contains( $(CONFIG_TARGET_MACOSX), y ){
    LIBS    += -liconv
 }
 DESTDIR      = $(OPIEDIR)/lib
 TARGET       = mailwrapper
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBETPAN_INC_DIR ) {
    INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
 }
 !isEmpty( LIBETPAN_LIB_DIR ) {
    LIBS = -L$$LIBETPAN_LIB_DIR $$LIBS
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index e2f548f..e394bbf 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -60,96 +60,13 @@ contains( CONFTEST, y ){
 }else{
    LIBS        += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -lopiemm2
 }
 TARGET       = opiemail
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )
 !isEmpty( LIBETPAN_INC_DIR ) {
    INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
 }
 !isEmpty( LIBETPAN_LIB_DIR ) {
    LIBS = -Wl,-rpath-link,$$LIBETPAN_LIB_DIR $$LIBS
 }
diff --git a/noncore/net/mail/taskbarapplet/taskbarapplet.pro b/noncore/net/mail/taskbarapplet/taskbarapplet.pro
index 5b33977..258c745 100644
--- a/noncore/net/mail/taskbarapplet/taskbarapplet.pro
+++ b/noncore/net/mail/taskbarapplet/taskbarapplet.pro
@@ -6,90 +6,7 @@ SOURCES		+=	mailapplet.cpp \
                        mailappletimpl.cpp 
 INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/noncore/net/mail
        LIBS            +=-lmailwrapper -lqpe -lopiecore2
        TARGET          =mailapplet
        DESTDIR                 +=$(OPIEDIR)/plugins/applets/
-include(
+include( $(OPIEDIR)/include.pro )
- $(OPIEDIR)/include.pro )

diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.pro b/noncore/net/mail/libmailwrapper/libmailwrapper.pro index 1b8f611..2f8c54d 100644 --- a/noncore/net/mail/libmailwrapper/libmailwrapper.pro +++ b/noncore/net/mail/libmailwrapper/libmailwrapper.pro
@@ -47,97 +47,13 @@ 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(	53	include( $(OPIEDIR)/include.pro )
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 )
138		54
139	!isEmpty( LIBETPAN_INC_DIR ) {	55	!isEmpty( LIBETPAN_INC_DIR ) {
140	INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH	56	INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
141	}	57	}
142	!isEmpty( LIBETPAN_LIB_DIR ) {	58	!isEmpty( LIBETPAN_LIB_DIR ) {
143	LIBS = -L$$LIBETPAN_LIB_DIR $$LIBS	59	LIBS = -L$$LIBETPAN_LIB_DIR $$LIBS


diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro index e2f548f..e394bbf 100644 --- a/noncore/net/mail/mail.pro +++ b/noncore/net/mail/mail.pro
@@ -60,96 +60,13 @@ contains( CONFTEST, y ){
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(	66	include( $(OPIEDIR)/include.pro )
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 )
150	!isEmpty( LIBETPAN_INC_DIR ) {	67	!isEmpty( LIBETPAN_INC_DIR ) {
151	INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH	68	INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
152	}	69	}
153	!isEmpty( LIBETPAN_LIB_DIR ) {	70	!isEmpty( LIBETPAN_LIB_DIR ) {
154	LIBS = -Wl,-rpath-link,$$LIBETPAN_LIB_DIR $$LIBS	71	LIBS = -Wl,-rpath-link,$$LIBETPAN_LIB_DIR $$LIBS
155	}	72	}


diff --git a/noncore/net/mail/taskbarapplet/taskbarapplet.pro b/noncore/net/mail/taskbarapplet/taskbarapplet.pro index 5b33977..258c745 100644 --- a/noncore/net/mail/taskbarapplet/taskbarapplet.pro +++ b/noncore/net/mail/taskbarapplet/taskbarapplet.pro
@@ -6,90 +6,7 @@ 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(	12	include( $(OPIEDIR)/include.pro )
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 )