Details | Last modification | View Log | RSS feed
Rev | Author | Line No. | Line |
---|---|---|---|
185 | kardasa | 1 | --- make_linux.mak- 2012-07-02 00:49:48.729100052 +0000 |
2 | +++ make_linux.mak 2012-07-02 00:53:16.753499389 +0000 |
||
3 | @@ -66,7 +66,7 @@ |
||
4 | # Uncomment for Native Stats tool |
||
5 | #NATIVE_STATS = -DNATIVE_STATS |
||
6 | |||
7 | -MOZILLACFLAGS = -O \ |
||
8 | +MOZILLACFLAGS = $(CXXFLAGS) \ |
||
9 | -DSWT_VERSION=$(SWT_VERSION) \ |
||
10 | $(NATIVE_STATS) \ |
||
11 | -DMOZILLA_STRICT_API=1 \ |
||
12 | @@ -106,7 +106,7 @@ |
||
13 | WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o |
||
14 | GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o |
||
15 | |||
16 | -CFLAGS = -O -Wall \ |
||
17 | +CFLAGS += \ |
||
18 | -DSWT_VERSION=$(SWT_VERSION) \ |
||
19 | $(NATIVE_STATS) \ |
||
20 | -DLINUX -DGTK \ |
||
21 | @@ -130,13 +130,13 @@ |
||
22 | make_swt: $(SWT_LIB) $(SWTPI_LIB) |
||
23 | |||
24 | $(SWT_LIB): $(SWT_OBJECTS) |
||
25 | - $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) |
||
26 | + $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) |
||
27 | |||
28 | callback.o: callback.c callback.h |
||
29 | $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c |
||
30 | |||
31 | $(SWTPI_LIB): $(SWTPI_OBJECTS) |
||
32 | - $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) |
||
33 | + $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) |
||
34 | |||
35 | swt.o: swt.c swt.h |
||
36 | $(CC) $(CFLAGS) -c swt.c |
||
37 | @@ -155,7 +155,7 @@ |
||
38 | make_cairo: $(CAIRO_LIB) |
||
39 | |||
40 | $(CAIRO_LIB): $(CAIRO_OBJECTS) |
||
41 | - $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) |
||
42 | + $(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) |
||
43 | |||
44 | cairo.o: cairo.c cairo.h swt.h |
||
45 | $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c |
||
46 | @@ -171,7 +171,7 @@ |
||
47 | make_cde: $(CDE_LIB) |
||
48 | |||
49 | $(CDE_LIB): $(CDE_OBJECTS) |
||
50 | - $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) |
||
51 | + $(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) |
||
52 | |||
53 | # |
||
54 | # AWT lib |
||
55 | @@ -179,7 +179,7 @@ |
||
56 | make_awt:$(AWT_LIB) |
||
57 | |||
58 | $(AWT_LIB): $(AWT_OBJECTS) |
||
59 | - $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) |
||
60 | + $(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) |
||
61 | |||
62 | # |
||
63 | # Atk lib |
||
64 | @@ -187,7 +187,7 @@ |
||
65 | make_atk: $(ATK_LIB) |
||
66 | |||
67 | $(ATK_LIB): $(ATK_OBJECTS) |
||
68 | - $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) |
||
69 | + $(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) |
||
70 | |||
71 | atk.o: atk.c atk.h |
||
72 | $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c |
||
73 | @@ -204,7 +204,7 @@ |
||
74 | make_gnome: $(GNOME_LIB) |
||
75 | |||
76 | $(GNOME_LIB): $(GNOME_OBJECTS) |
||
77 | - $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) |
||
78 | + $(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) |
||
79 | |||
80 | gnome.o: gnome.c |
||
81 | $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c |
||
82 | @@ -221,7 +221,7 @@ |
||
83 | make_mozilla:$(MOZILLA_LIB) |
||
84 | |||
85 | $(MOZILLA_LIB): $(MOZILLA_OBJECTS) |
||
86 | - $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} |
||
87 | + $(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} |
||
88 | |||
89 | xpcom.o: xpcom.cpp |
||
90 | $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp |
||
91 | @@ -242,7 +242,7 @@ |
||
92 | |||
93 | $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) |
||
94 | echo -e "#include<stdlib.h>\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | gcc --shared -xc - -o libswt-xulrunner-fix.so |
||
95 | - $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} |
||
96 | + $(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} |
||
97 | |||
98 | xpcomxul.o: xpcom.cpp |
||
99 | $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp |
||
100 | @@ -262,7 +262,7 @@ |
||
101 | make_xpcominit:$(XPCOMINIT_LIB) |
||
102 | |||
103 | $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) |
||
104 | - $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} |
||
105 | + $(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} |
||
106 | |||
107 | xpcominit.o: xpcominit.cpp |
||
108 | $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp |
||
109 | @@ -279,7 +279,7 @@ |
||
110 | make_webkit: $(WEBKIT_LIB) |
||
111 | |||
112 | $(WEBKIT_LIB): $(WEBKIT_OBJECTS) |
||
113 | - $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) |
||
114 | + $(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) |
||
115 | |||
116 | webkit.o: webkitgtk.c |
||
117 | $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o |
||
118 | @@ -296,7 +296,7 @@ |
||
119 | make_glx: $(GLX_LIB) |
||
120 | |||
121 | $(GLX_LIB): $(GLX_OBJECTS) |
||
122 | - $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) |
||
123 | + $(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) |
||
124 | |||
125 | glx.o: glx.c |
||
126 | $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c |
||
127 | --- make_freebsd.mak- 2012-07-02 00:53:28.553351871 +0000 |
||
128 | +++ make_freebsd.mak 2012-07-02 00:55:37.369741444 +0000 |
||
129 | @@ -64,7 +64,7 @@ |
||
130 | # Uncomment for Native Stats tool |
||
131 | #NATIVE_STATS = -DNATIVE_STATS |
||
132 | |||
133 | -MOZILLACFLAGS = -O \ |
||
134 | +MOZILLACFLAGS += \ |
||
135 | -DSWT_VERSION=$(SWT_VERSION) \ |
||
136 | $(NATIVE_STATS) \ |
||
137 | -DMOZILLA_STRICT_API=1 \ |
||
138 | @@ -91,7 +91,7 @@ |
||
139 | XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o |
||
140 | GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o |
||
141 | |||
142 | -CFLAGS = -O -Wall \ |
||
143 | +CFLAGS += \ |
||
144 | -DSWT_VERSION=$(SWT_VERSION) \ |
||
145 | $(NATIVE_STATS) \ |
||
146 | -DFREEBSD -DGTK \ |
||
147 | @@ -115,13 +115,13 @@ |
||
148 | make_swt: $(SWT_LIB) $(SWTPI_LIB) |
||
149 | |||
150 | $(SWT_LIB): $(SWT_OBJECTS) |
||
151 | - $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) |
||
152 | + $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) |
||
153 | |||
154 | callback.o: callback.c callback.h |
||
155 | $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c |
||
156 | |||
157 | $(SWTPI_LIB): $(SWTPI_OBJECTS) |
||
158 | - $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) |
||
159 | + $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) |
||
160 | |||
161 | swt.o: swt.c swt.h |
||
162 | $(CC) $(CFLAGS) -c swt.c |
||
163 | @@ -140,7 +140,7 @@ |
||
164 | make_cairo: $(CAIRO_LIB) |
||
165 | |||
166 | $(CAIRO_LIB): $(CAIRO_OBJECTS) |
||
167 | - $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) |
||
168 | + $(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) |
||
169 | |||
170 | cairo.o: cairo.c cairo.h swt.h |
||
171 | $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c |
||
172 | @@ -156,7 +156,7 @@ |
||
173 | make_cde: $(CDE_LIB) |
||
174 | |||
175 | $(CDE_LIB): $(CDE_OBJECTS) |
||
176 | - $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) |
||
177 | + $(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) |
||
178 | |||
179 | # |
||
180 | # AWT lib |
||
181 | @@ -164,7 +164,7 @@ |
||
182 | make_awt:$(AWT_LIB) |
||
183 | |||
184 | $(AWT_LIB): $(AWT_OBJECTS) |
||
185 | - $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) |
||
186 | + $(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) |
||
187 | |||
188 | # |
||
189 | # Atk lib |
||
190 | @@ -172,7 +172,7 @@ |
||
191 | make_atk: $(ATK_LIB) |
||
192 | |||
193 | $(ATK_LIB): $(ATK_OBJECTS) |
||
194 | - $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) |
||
195 | + $(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) |
||
196 | |||
197 | atk.o: atk.c atk.h |
||
198 | $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c |
||
199 | @@ -189,7 +189,7 @@ |
||
200 | make_gnome: $(GNOME_LIB) |
||
201 | |||
202 | $(GNOME_LIB): $(GNOME_OBJECTS) |
||
203 | - $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) |
||
204 | + $(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) |
||
205 | |||
206 | gnome.o: gnome.c |
||
207 | $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c |
||
208 | @@ -206,7 +206,7 @@ |
||
209 | make_mozilla:$(MOZILLA_LIB) |
||
210 | |||
211 | $(MOZILLA_LIB): $(MOZILLA_OBJECTS) |
||
212 | - $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} |
||
213 | + $(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} |
||
214 | |||
215 | xpcom.o: xpcom.cpp |
||
216 | $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp |
||
217 | @@ -226,7 +226,7 @@ |
||
218 | make_xulrunner:$(XULRUNNER_LIB) |
||
219 | |||
220 | $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) |
||
221 | - $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} |
||
222 | + $(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} |
||
223 | |||
224 | xpcomxul.o: xpcom.cpp |
||
225 | $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp |
||
226 | @@ -252,7 +252,7 @@ |
||
227 | make_xpcominit:$(XPCOMINIT_LIB) |
||
228 | |||
229 | $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) |
||
230 | - $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} |
||
231 | + $(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} |
||
232 | |||
233 | xpcominit.o: xpcominit.cpp |
||
234 | $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp |
||
235 | @@ -269,7 +269,7 @@ |
||
236 | make_glx: $(GLX_LIB) |
||
237 | |||
238 | $(GLX_LIB): $(GLX_OBJECTS) |
||
239 | - $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) |
||
240 | + $(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) |
||
241 | |||
242 | glx.o: glx.c |
||
243 | $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c |