| blob | afc1a54a4238f32a21a6db085ea0c3a2fc449845 |
1 More quiet build stuff
3 From: Thorsten Behrens <thb@openoffice.org>
6 ---
8 dmake/make.c | 5 ++-
9 dmake/tests/misc-13 | 2 +
10 dmake/tests/misc-15 | 2 +
11 dmake/tests/targets-28 | 4 +-
12 solenv/bin/checkdll.sh | 2 +
13 solenv/inc/_tg_lib.mk | 60 ++++++++++++++++++++++++++++++++
14 solenv/inc/_tg_shl.mk | 80 +++++++++++++++++++++++++++++++++++++-----
15 solenv/inc/tg_lib.mk | 6 +++
16 solenv/inc/tg_shl.mk | 8 ++++
17 soltools/checkdll/checkdll.c | 16 ++++++--
18 10 files changed, 162 insertions(+), 23 deletions(-)
21 diff --git dmake/make.c dmake/make.c
22 index 4f120a6..7ad8fd1 100644
23 --- dmake/make.c
24 +++ dmake/make.c
25 @@ -251,8 +251,9 @@ Make_targets()/*
27 for( lp = Targets->ce_prq; lp != NIL(LINK); lp = lp->cl_next ) {
28 CELLPTR tgt = lp->cl_prq;
29 - if( !(tgt->ce_attr & A_UPDATED) )
30 - printf( "`%s' is up to date\n", tgt->CE_NAME );
31 + if( !(tgt->ce_attr & A_UPDATED)
32 + && (Verbose & V_MAKE) )
33 + printf( "`%s' is up to date\n", tgt->CE_NAME );
34 }
36 DB_RETURN( 0 );
37 diff --git dmake/tests/misc-13 dmake/tests/misc-13
38 index a2381a8..7493e74 100755
39 --- dmake/tests/misc-13
40 +++ dmake/tests/misc-13
41 @@ -38,7 +38,7 @@ TeSt.target :
43 EOT
45 -output=`eval ${DMAKEPROG} -r -f $file1`
46 +output=`eval ${DMAKEPROG} -vm -r -f $file1`
47 result=$?
49 if echo "$output" | grep -v ".target' is up to date" > /dev/null 2>&1 ; then
50 diff --git dmake/tests/misc-15 dmake/tests/misc-15
51 index 1c52324..a213c2d 100755
52 --- dmake/tests/misc-15
53 +++ dmake/tests/misc-15
54 @@ -37,7 +37,7 @@ MYTARGET:=\$(PWD)/target.abc
56 EOT
58 -output=`eval ${DMAKEPROG} -r -f $file1`
59 +output=`eval ${DMAKEPROG} -vm -r -f $file1`
60 result=$?
62 if echo "$output" | grep "target.abc' is up to date" > /dev/null 2>&1 ; then
63 diff --git dmake/tests/targets-28 dmake/tests/targets-28
64 index da202b0..0943eb6 100755
65 --- dmake/tests/targets-28
66 +++ dmake/tests/targets-28
67 @@ -112,10 +112,10 @@ sleep 1
69 # This tests that aa.x is not build as the dependency chain is intact with
70 # the virtual target aa.y having the same time stamp as aa.z.
71 -output3=`eval ${DMAKEPROG} -rf $file1 2>&1`
72 +output3=`eval ${DMAKEPROG} -vm -rf $file1 2>&1`
73 result3=$?
75 -if test $result3 = 0 -a "$output3" = "\`aa.x' is up to date" ; then
76 +if test $result3 = 0 && echo "$output3" | grep "aa.x' is up to date" > /dev/null 2>&1 ; then
77 echo "Subtest 3: OK"
78 result3=0
79 else
80 diff --git solenv/bin/checkdll.sh solenv/bin/checkdll.sh
81 index 776b580..0218df6 100755
82 --- solenv/bin/checkdll.sh
83 +++ solenv/bin/checkdll.sh
84 @@ -77,7 +77,7 @@ if [ -x $checkdll ]; then
85 export LD_LIBRARY_PATH;;
86 esac
88 - $checkdll "$*"
89 + $checkdll "$@"
90 if [ $? -ne 0 ]; then exit 1 ; fi
92 for parameter in $*; do
93 diff --git solenv/inc/_tg_lib.mk solenv/inc/_tg_lib.mk
94 index 103e283..258378c 100644
95 --- solenv/inc/_tg_lib.mk
96 +++ solenv/inc/_tg_lib.mk
97 @@ -21,14 +21,18 @@ $(LIB1ARCHIV) : $(LIB1TARGET)
98 .IF "$(OS)" == "MACOSX"
99 @echo ranlib $(LIB1ARCHIV) >> $(MISC)$/$(LIB1ARCHIV:b).cmd
100 .ENDIF
101 +.IF "$(QUIET_BUILD)"==""
102 @cat $(MISC)$/$(LIB1ARCHIV:b).cmd
103 +.ENDIF
104 @+source $(MISC)$/$(LIB1ARCHIV:b).cmd
105 .ELSE # "$(GUI)"=="UNX"
106 .IF "$(GUI)$(COM)"=="WNTGCC"
107 @+-$(RM) $(MISC)$/$(LIB1ARCHIV:b).cmd
108 @+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB1ARCHIV:b).cmd
109 @+echo ranlib $(LIB1ARCHIV) >> $(MISC)$/$(LIB1ARCHIV:b).cmd
110 +.IF "$(QUIET_BUILD)"==""
111 @cat $(MISC)$/$(LIB1ARCHIV:b).cmd
112 +.ENDIF
113 @+source $(MISC)$/$(LIB1ARCHIV:b).cmd
114 .ELSE
115 @echo just a dummy > $@
116 @@ -86,7 +90,9 @@ $(LIB1TARGET) : $(LIB1FILES) \
117 .ENDIF # "$(LIB1FILES)"!=""
118 .ELSE # "$(GUI)"=="WNT"
119 @-$(RM) $@
120 +.IF "$(QUIET_BUILD)"==""
121 echo $(LIBMGR) r $@ $(LIB1OBJFILES)
122 +.ENDIF
123 $(LIBMGR) r $@ $(LIB1OBJFILES) $(LIB1FILES) bla.lib
124 .ENDIF # "$(GUI)"=="WNT"
125 .ENDIF # "$(GUI)"=="UNX"
126 @@ -116,14 +122,18 @@ $(LIB2ARCHIV) : $(LIB2TARGET)
127 .IF "$(OS)" == "MACOSX"
128 @echo ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd
129 .ENDIF
130 +.IF "$(QUIET_BUILD)"==""
131 @cat $(MISC)$/$(LIB2ARCHIV:b).cmd
132 +.ENDIF
133 @+source $(MISC)$/$(LIB2ARCHIV:b).cmd
134 .ELSE # "$(GUI)"=="UNX"
135 .IF "$(GUI)$(COM)"=="WNTGCC"
136 @+-$(RM) $(MISC)$/$(LIB2ARCHIV:b).cmd
137 @+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB2ARCHIV:b).cmd
138 @+echo ranlib $(LIB2ARCHIV) >> $(MISC)$/$(LIB2ARCHIV:b).cmd
139 +.IF "$(QUIET_BUILD)"==""
140 @cat $(MISC)$/$(LIB2ARCHIV:b).cmd
141 +.ENDIF
142 @+source $(MISC)$/$(LIB2ARCHIV:b).cmd
143 .ELSE
144 @echo just a dummy > $@
145 @@ -181,7 +191,9 @@ $(LIB2TARGET) : $(LIB2FILES) \
146 .ENDIF # "$(LIB2FILES)"!=""
147 .ELSE # "$(GUI)"=="WNT"
148 @-$(RM) $@
149 +.IF "$(QUIET_BUILD)"==""
150 echo $(LIBMGR) r $@ $(LIB2OBJFILES)
151 +.ENDIF
152 $(LIBMGR) r $@ $(LIB2OBJFILES) $(LIB2FILES) bla.lib
153 .ENDIF # "$(GUI)"=="WNT"
154 .ENDIF # "$(GUI)"=="UNX"
155 @@ -211,14 +223,18 @@ $(LIB3ARCHIV) : $(LIB3TARGET)
156 .IF "$(OS)" == "MACOSX"
157 @echo ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd
158 .ENDIF
159 +.IF "$(QUIET_BUILD)"==""
160 @cat $(MISC)$/$(LIB3ARCHIV:b).cmd
161 +.ENDIF
162 @+source $(MISC)$/$(LIB3ARCHIV:b).cmd
163 .ELSE # "$(GUI)"=="UNX"
164 .IF "$(GUI)$(COM)"=="WNTGCC"
165 @+-$(RM) $(MISC)$/$(LIB3ARCHIV:b).cmd
166 @+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB3ARCHIV:b).cmd
167 @+echo ranlib $(LIB3ARCHIV) >> $(MISC)$/$(LIB3ARCHIV:b).cmd
168 +.IF "$(QUIET_BUILD)"==""
169 @cat $(MISC)$/$(LIB3ARCHIV:b).cmd
170 +.ENDIF
171 @+source $(MISC)$/$(LIB3ARCHIV:b).cmd
172 .ELSE
173 @echo just a dummy > $@
174 @@ -276,7 +292,9 @@ $(LIB3TARGET) : $(LIB3FILES) \
175 .ENDIF # "$(LIB3FILES)"!=""
176 .ELSE # "$(GUI)"=="WNT"
177 @-$(RM) $@
178 +.IF "$(QUIET_BUILD)"==""
179 echo $(LIBMGR) r $@ $(LIB3OBJFILES)
180 +.ENDIF
181 $(LIBMGR) r $@ $(LIB3OBJFILES) $(LIB3FILES) bla.lib
182 .ENDIF # "$(GUI)"=="WNT"
183 .ENDIF # "$(GUI)"=="UNX"
184 @@ -306,14 +324,18 @@ $(LIB4ARCHIV) : $(LIB4TARGET)
185 .IF "$(OS)" == "MACOSX"
186 @echo ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd
187 .ENDIF
188 +.IF "$(QUIET_BUILD)"==""
189 @cat $(MISC)$/$(LIB4ARCHIV:b).cmd
190 +.ENDIF
191 @+source $(MISC)$/$(LIB4ARCHIV:b).cmd
192 .ELSE # "$(GUI)"=="UNX"
193 .IF "$(GUI)$(COM)"=="WNTGCC"
194 @+-$(RM) $(MISC)$/$(LIB4ARCHIV:b).cmd
195 @+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB4ARCHIV:b).cmd
196 @+echo ranlib $(LIB4ARCHIV) >> $(MISC)$/$(LIB4ARCHIV:b).cmd
197 +.IF "$(QUIET_BUILD)"==""
198 @cat $(MISC)$/$(LIB4ARCHIV:b).cmd
199 +.ENDIF
200 @+source $(MISC)$/$(LIB4ARCHIV:b).cmd
201 .ELSE
202 @echo just a dummy > $@
203 @@ -371,7 +393,9 @@ $(LIB4TARGET) : $(LIB4FILES) \
204 .ENDIF # "$(LIB4FILES)"!=""
205 .ELSE # "$(GUI)"=="WNT"
206 @-$(RM) $@
207 +.IF "$(QUIET_BUILD)"==""
208 echo $(LIBMGR) r $@ $(LIB4OBJFILES)
209 +.ENDIF
210 $(LIBMGR) r $@ $(LIB4OBJFILES) $(LIB4FILES) bla.lib
211 .ENDIF # "$(GUI)"=="WNT"
212 .ENDIF # "$(GUI)"=="UNX"
213 @@ -401,14 +425,18 @@ $(LIB5ARCHIV) : $(LIB5TARGET)
214 .IF "$(OS)" == "MACOSX"
215 @echo ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd
216 .ENDIF
217 +.IF "$(QUIET_BUILD)"==""
218 @cat $(MISC)$/$(LIB5ARCHIV:b).cmd
219 +.ENDIF
220 @+source $(MISC)$/$(LIB5ARCHIV:b).cmd
221 .ELSE # "$(GUI)"=="UNX"
222 .IF "$(GUI)$(COM)"=="WNTGCC"
223 @+-$(RM) $(MISC)$/$(LIB5ARCHIV:b).cmd
224 @+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB5ARCHIV:b).cmd
225 @+echo ranlib $(LIB5ARCHIV) >> $(MISC)$/$(LIB5ARCHIV:b).cmd
226 +.IF "$(QUIET_BUILD)"==""
227 @cat $(MISC)$/$(LIB5ARCHIV:b).cmd
228 +.ENDIF
229 @+source $(MISC)$/$(LIB5ARCHIV:b).cmd
230 .ELSE
231 @echo just a dummy > $@
232 @@ -466,7 +494,9 @@ $(LIB5TARGET) : $(LIB5FILES) \
233 .ENDIF # "$(LIB5FILES)"!=""
234 .ELSE # "$(GUI)"=="WNT"
235 @-$(RM) $@
236 +.IF "$(QUIET_BUILD)"==""
237 echo $(LIBMGR) r $@ $(LIB5OBJFILES)
238 +.ENDIF
239 $(LIBMGR) r $@ $(LIB5OBJFILES) $(LIB5FILES) bla.lib
240 .ENDIF # "$(GUI)"=="WNT"
241 .ENDIF # "$(GUI)"=="UNX"
242 @@ -496,14 +526,18 @@ $(LIB6ARCHIV) : $(LIB6TARGET)
243 .IF "$(OS)" == "MACOSX"
244 @echo ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd
245 .ENDIF
246 +.IF "$(QUIET_BUILD)"==""
247 @cat $(MISC)$/$(LIB6ARCHIV:b).cmd
248 +.ENDIF
249 @+source $(MISC)$/$(LIB6ARCHIV:b).cmd
250 .ELSE # "$(GUI)"=="UNX"
251 .IF "$(GUI)$(COM)"=="WNTGCC"
252 @+-$(RM) $(MISC)$/$(LIB6ARCHIV:b).cmd
253 @+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB6ARCHIV:b).cmd
254 @+echo ranlib $(LIB6ARCHIV) >> $(MISC)$/$(LIB6ARCHIV:b).cmd
255 +.IF "$(QUIET_BUILD)"==""
256 @cat $(MISC)$/$(LIB6ARCHIV:b).cmd
257 +.ENDIF
258 @+source $(MISC)$/$(LIB6ARCHIV:b).cmd
259 .ELSE
260 @echo just a dummy > $@
261 @@ -561,7 +595,9 @@ $(LIB6TARGET) : $(LIB6FILES) \
262 .ENDIF # "$(LIB6FILES)"!=""
263 .ELSE # "$(GUI)"=="WNT"
264 @-$(RM) $@
265 +.IF "$(QUIET_BUILD)"==""
266 echo $(LIBMGR) r $@ $(LIB6OBJFILES)
267 +.ENDIF
268 $(LIBMGR) r $@ $(LIB6OBJFILES) $(LIB6FILES) bla.lib
269 .ENDIF # "$(GUI)"=="WNT"
270 .ENDIF # "$(GUI)"=="UNX"
271 @@ -591,14 +627,18 @@ $(LIB7ARCHIV) : $(LIB7TARGET)
272 .IF "$(OS)" == "MACOSX"
273 @echo ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd
274 .ENDIF
275 +.IF "$(QUIET_BUILD)"==""
276 @cat $(MISC)$/$(LIB7ARCHIV:b).cmd
277 +.ENDIF
278 @+source $(MISC)$/$(LIB7ARCHIV:b).cmd
279 .ELSE # "$(GUI)"=="UNX"
280 .IF "$(GUI)$(COM)"=="WNTGCC"
281 @+-$(RM) $(MISC)$/$(LIB7ARCHIV:b).cmd
282 @+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB7ARCHIV:b).cmd
283 @+echo ranlib $(LIB7ARCHIV) >> $(MISC)$/$(LIB7ARCHIV:b).cmd
284 +.IF "$(QUIET_BUILD)"==""
285 @cat $(MISC)$/$(LIB7ARCHIV:b).cmd
286 +.ENDIF
287 @+source $(MISC)$/$(LIB7ARCHIV:b).cmd
288 .ELSE
289 @echo just a dummy > $@
290 @@ -656,7 +696,9 @@ $(LIB7TARGET) : $(LIB7FILES) \
291 .ENDIF # "$(LIB7FILES)"!=""
292 .ELSE # "$(GUI)"=="WNT"
293 @-$(RM) $@
294 +.IF "$(QUIET_BUILD)"==""
295 echo $(LIBMGR) r $@ $(LIB7OBJFILES)
296 +.ENDIF
297 $(LIBMGR) r $@ $(LIB7OBJFILES) $(LIB7FILES) bla.lib
298 .ENDIF # "$(GUI)"=="WNT"
299 .ENDIF # "$(GUI)"=="UNX"
300 @@ -686,14 +728,18 @@ $(LIB8ARCHIV) : $(LIB8TARGET)
301 .IF "$(OS)" == "MACOSX"
302 @echo ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd
303 .ENDIF
304 +.IF "$(QUIET_BUILD)"==""
305 @cat $(MISC)$/$(LIB8ARCHIV:b).cmd
306 +.ENDIF
307 @+source $(MISC)$/$(LIB8ARCHIV:b).cmd
308 .ELSE # "$(GUI)"=="UNX"
309 .IF "$(GUI)$(COM)"=="WNTGCC"
310 @+-$(RM) $(MISC)$/$(LIB8ARCHIV:b).cmd
311 @+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB8ARCHIV:b).cmd
312 @+echo ranlib $(LIB8ARCHIV) >> $(MISC)$/$(LIB8ARCHIV:b).cmd
313 +.IF "$(QUIET_BUILD)"==""
314 @cat $(MISC)$/$(LIB8ARCHIV:b).cmd
315 +.ENDIF
316 @+source $(MISC)$/$(LIB8ARCHIV:b).cmd
317 .ELSE
318 @echo just a dummy > $@
319 @@ -751,7 +797,9 @@ $(LIB8TARGET) : $(LIB8FILES) \
320 .ENDIF # "$(LIB8FILES)"!=""
321 .ELSE # "$(GUI)"=="WNT"
322 @-$(RM) $@
323 +.IF "$(QUIET_BUILD)"==""
324 echo $(LIBMGR) r $@ $(LIB8OBJFILES)
325 +.ENDIF
326 $(LIBMGR) r $@ $(LIB8OBJFILES) $(LIB8FILES) bla.lib
327 .ENDIF # "$(GUI)"=="WNT"
328 .ENDIF # "$(GUI)"=="UNX"
329 @@ -781,14 +829,18 @@ $(LIB9ARCHIV) : $(LIB9TARGET)
330 .IF "$(OS)" == "MACOSX"
331 @echo ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd
332 .ENDIF
333 +.IF "$(QUIET_BUILD)"==""
334 @cat $(MISC)$/$(LIB9ARCHIV:b).cmd
335 +.ENDIF
336 @+source $(MISC)$/$(LIB9ARCHIV:b).cmd
337 .ELSE # "$(GUI)"=="UNX"
338 .IF "$(GUI)$(COM)"=="WNTGCC"
339 @+-$(RM) $(MISC)$/$(LIB9ARCHIV:b).cmd
340 @+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB9ARCHIV:b).cmd
341 @+echo ranlib $(LIB9ARCHIV) >> $(MISC)$/$(LIB9ARCHIV:b).cmd
342 +.IF "$(QUIET_BUILD)"==""
343 @cat $(MISC)$/$(LIB9ARCHIV:b).cmd
344 +.ENDIF
345 @+source $(MISC)$/$(LIB9ARCHIV:b).cmd
346 .ELSE
347 @echo just a dummy > $@
348 @@ -846,7 +898,9 @@ $(LIB9TARGET) : $(LIB9FILES) \
349 .ENDIF # "$(LIB9FILES)"!=""
350 .ELSE # "$(GUI)"=="WNT"
351 @-$(RM) $@
352 +.IF "$(QUIET_BUILD)"==""
353 echo $(LIBMGR) r $@ $(LIB9OBJFILES)
354 +.ENDIF
355 $(LIBMGR) r $@ $(LIB9OBJFILES) $(LIB9FILES) bla.lib
356 .ENDIF # "$(GUI)"=="WNT"
357 .ENDIF # "$(GUI)"=="UNX"
358 @@ -876,14 +930,18 @@ $(LIB10ARCHIV) : $(LIB10TARGET)
359 .IF "$(OS)" == "MACOSX"
360 @echo ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd
361 .ENDIF
362 +.IF "$(QUIET_BUILD)"==""
363 @cat $(MISC)$/$(LIB10ARCHIV:b).cmd
364 +.ENDIF
365 @+source $(MISC)$/$(LIB10ARCHIV:b).cmd
366 .ELSE # "$(GUI)"=="UNX"
367 .IF "$(GUI)$(COM)"=="WNTGCC"
368 @+-$(RM) $(MISC)$/$(LIB10ARCHIV:b).cmd
369 @+echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB10ARCHIV:b).cmd
370 @+echo ranlib $(LIB10ARCHIV) >> $(MISC)$/$(LIB10ARCHIV:b).cmd
371 +.IF "$(QUIET_BUILD)"==""
372 @cat $(MISC)$/$(LIB10ARCHIV:b).cmd
373 +.ENDIF
374 @+source $(MISC)$/$(LIB10ARCHIV:b).cmd
375 .ELSE
376 @echo just a dummy > $@
377 @@ -941,7 +999,9 @@ $(LIB10TARGET) : $(LIB10FILES) \
378 .ENDIF # "$(LIB10FILES)"!=""
379 .ELSE # "$(GUI)"=="WNT"
380 @-$(RM) $@
381 +.IF "$(QUIET_BUILD)"==""
382 echo $(LIBMGR) r $@ $(LIB10OBJFILES)
383 +.ENDIF
384 $(LIBMGR) r $@ $(LIB10OBJFILES) $(LIB10FILES) bla.lib
385 .ENDIF # "$(GUI)"=="WNT"
386 .ENDIF # "$(GUI)"=="UNX"
387 diff --git solenv/inc/_tg_shl.mk solenv/inc/_tg_shl.mk
388 index a9f08dc..19afa21 100644
389 --- solenv/inc/_tg_shl.mk
390 +++ solenv/inc/_tg_shl.mk
391 @@ -459,7 +459,11 @@ $(SHL1TARGETN) : \
392 .IF "$(SHL1NOCHECK)"==""
393 $(QUIET_BUILD) -$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
394 $(QUIET_BUILD) $(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
395 - $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
396 +.IF "$(QUIET_BUILD)"==""
397 + $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
398 +.ELSE
399 + $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
400 +.ENDIF
401 .ENDIF # "$(SHL1NOCHECK)"!=""
402 .ENDIF # "$(UPDATER)"=="YES"
403 .ENDIF # "$(OS)"=="MACOSX"
404 @@ -467,7 +471,9 @@ $(SHL1TARGETN) : \
405 $(QUIET_BUILD) $(RM) $(LB)$/$(SHL1TARGETN:b)
406 $(QUIET_BUILD) cd $(LB) && ln -s $(SHL1TARGETN:f) $(SHL1TARGETN:b)
407 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
408 +.IF "$(QUIET_BUILD)"==""
409 @ls -l $@
410 +.ENDIF
411 .ENDIF # "$(GUI)" == "UNX"
413 .IF "$(GUI)" == "OS2"
414 @@ -1007,7 +1013,11 @@ $(SHL2TARGETN) : \
415 .IF "$(SHL2NOCHECK)"==""
416 $(QUIET_BUILD) -$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
417 $(QUIET_BUILD) $(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
418 - $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
419 +.IF "$(QUIET_BUILD)"==""
420 + $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
421 +.ELSE
422 + $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
423 +.ENDIF
424 .ENDIF # "$(SHL2NOCHECK)"!=""
425 .ENDIF # "$(UPDATER)"=="YES"
426 .ENDIF # "$(OS)"=="MACOSX"
427 @@ -1015,7 +1025,9 @@ $(SHL2TARGETN) : \
428 $(QUIET_BUILD) $(RM) $(LB)$/$(SHL2TARGETN:b)
429 $(QUIET_BUILD) cd $(LB) && ln -s $(SHL2TARGETN:f) $(SHL2TARGETN:b)
430 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
431 +.IF "$(QUIET_BUILD)"==""
432 @ls -l $@
433 +.ENDIF
434 .ENDIF # "$(GUI)" == "UNX"
436 .IF "$(GUI)" == "OS2"
437 @@ -1555,7 +1567,11 @@ $(SHL3TARGETN) : \
438 .IF "$(SHL3NOCHECK)"==""
439 $(QUIET_BUILD) -$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
440 $(QUIET_BUILD) $(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
441 - $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
442 +.IF "$(QUIET_BUILD)"==""
443 + $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
444 +.ELSE
445 + $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
446 +.ENDIF
447 .ENDIF # "$(SHL3NOCHECK)"!=""
448 .ENDIF # "$(UPDATER)"=="YES"
449 .ENDIF # "$(OS)"=="MACOSX"
450 @@ -1563,7 +1579,9 @@ $(SHL3TARGETN) : \
451 $(QUIET_BUILD) $(RM) $(LB)$/$(SHL3TARGETN:b)
452 $(QUIET_BUILD) cd $(LB) && ln -s $(SHL3TARGETN:f) $(SHL3TARGETN:b)
453 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
454 +.IF "$(QUIET_BUILD)"==""
455 @ls -l $@
456 +.ENDIF
457 .ENDIF # "$(GUI)" == "UNX"
459 .IF "$(GUI)" == "OS2"
460 @@ -2103,7 +2121,11 @@ $(SHL4TARGETN) : \
461 .IF "$(SHL4NOCHECK)"==""
462 $(QUIET_BUILD) -$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
463 $(QUIET_BUILD) $(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
464 - $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
465 +.IF "$(QUIET_BUILD)"==""
466 + $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
467 +.ELSE
468 + $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
469 +.ENDIF
470 .ENDIF # "$(SHL4NOCHECK)"!=""
471 .ENDIF # "$(UPDATER)"=="YES"
472 .ENDIF # "$(OS)"=="MACOSX"
473 @@ -2111,7 +2133,9 @@ $(SHL4TARGETN) : \
474 $(QUIET_BUILD) $(RM) $(LB)$/$(SHL4TARGETN:b)
475 $(QUIET_BUILD) cd $(LB) && ln -s $(SHL4TARGETN:f) $(SHL4TARGETN:b)
476 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
477 +.IF "$(QUIET_BUILD)"==""
478 @ls -l $@
479 +.ENDIF
480 .ENDIF # "$(GUI)" == "UNX"
482 .IF "$(GUI)" == "OS2"
483 @@ -2651,7 +2675,11 @@ $(SHL5TARGETN) : \
484 .IF "$(SHL5NOCHECK)"==""
485 $(QUIET_BUILD) -$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
486 $(QUIET_BUILD) $(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
487 - $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
488 +.IF "$(QUIET_BUILD)"==""
489 + $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
490 +.ELSE
491 + $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
492 +.ENDIF
493 .ENDIF # "$(SHL5NOCHECK)"!=""
494 .ENDIF # "$(UPDATER)"=="YES"
495 .ENDIF # "$(OS)"=="MACOSX"
496 @@ -2659,7 +2687,9 @@ $(SHL5TARGETN) : \
497 $(QUIET_BUILD) $(RM) $(LB)$/$(SHL5TARGETN:b)
498 $(QUIET_BUILD) cd $(LB) && ln -s $(SHL5TARGETN:f) $(SHL5TARGETN:b)
499 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
500 +.IF "$(QUIET_BUILD)"==""
501 @ls -l $@
502 +.ENDIF
503 .ENDIF # "$(GUI)" == "UNX"
505 .IF "$(GUI)" == "OS2"
506 @@ -3199,7 +3229,11 @@ $(SHL6TARGETN) : \
507 .IF "$(SHL6NOCHECK)"==""
508 $(QUIET_BUILD) -$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
509 $(QUIET_BUILD) $(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
510 - $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
511 +.IF "$(QUIET_BUILD)"==""
512 + $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
513 +.ELSE
514 + $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
515 +.ENDIF
516 .ENDIF # "$(SHL6NOCHECK)"!=""
517 .ENDIF # "$(UPDATER)"=="YES"
518 .ENDIF # "$(OS)"=="MACOSX"
519 @@ -3207,7 +3241,9 @@ $(SHL6TARGETN) : \
520 $(QUIET_BUILD) $(RM) $(LB)$/$(SHL6TARGETN:b)
521 $(QUIET_BUILD) cd $(LB) && ln -s $(SHL6TARGETN:f) $(SHL6TARGETN:b)
522 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
523 +.IF "$(QUIET_BUILD)"==""
524 @ls -l $@
525 +.ENDIF
526 .ENDIF # "$(GUI)" == "UNX"
528 .IF "$(GUI)" == "OS2"
529 @@ -3747,7 +3783,11 @@ $(SHL7TARGETN) : \
530 .IF "$(SHL7NOCHECK)"==""
531 $(QUIET_BUILD) -$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
532 $(QUIET_BUILD) $(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
533 - $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
534 +.IF "$(QUIET_BUILD)"==""
535 + $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
536 +.ELSE
537 + $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
538 +.ENDIF
539 .ENDIF # "$(SHL7NOCHECK)"!=""
540 .ENDIF # "$(UPDATER)"=="YES"
541 .ENDIF # "$(OS)"=="MACOSX"
542 @@ -3755,7 +3795,9 @@ $(SHL7TARGETN) : \
543 $(QUIET_BUILD) $(RM) $(LB)$/$(SHL7TARGETN:b)
544 $(QUIET_BUILD) cd $(LB) && ln -s $(SHL7TARGETN:f) $(SHL7TARGETN:b)
545 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
546 +.IF "$(QUIET_BUILD)"==""
547 @ls -l $@
548 +.ENDIF
549 .ENDIF # "$(GUI)" == "UNX"
551 .IF "$(GUI)" == "OS2"
552 @@ -4295,7 +4337,11 @@ $(SHL8TARGETN) : \
553 .IF "$(SHL8NOCHECK)"==""
554 $(QUIET_BUILD) -$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
555 $(QUIET_BUILD) $(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
556 - $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
557 +.IF "$(QUIET_BUILD)"==""
558 + $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
559 +.ELSE
560 + $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
561 +.ENDIF
562 .ENDIF # "$(SHL8NOCHECK)"!=""
563 .ENDIF # "$(UPDATER)"=="YES"
564 .ENDIF # "$(OS)"=="MACOSX"
565 @@ -4303,7 +4349,9 @@ $(SHL8TARGETN) : \
566 $(QUIET_BUILD) $(RM) $(LB)$/$(SHL8TARGETN:b)
567 $(QUIET_BUILD) cd $(LB) && ln -s $(SHL8TARGETN:f) $(SHL8TARGETN:b)
568 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
569 +.IF "$(QUIET_BUILD)"==""
570 @ls -l $@
571 +.ENDIF
572 .ENDIF # "$(GUI)" == "UNX"
574 .IF "$(GUI)" == "OS2"
575 @@ -4843,7 +4891,11 @@ $(SHL9TARGETN) : \
576 .IF "$(SHL9NOCHECK)"==""
577 $(QUIET_BUILD) -$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
578 $(QUIET_BUILD) $(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
579 - $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
580 +.IF "$(QUIET_BUILD)"==""
581 + $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
582 +.ELSE
583 + $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
584 +.ENDIF
585 .ENDIF # "$(SHL9NOCHECK)"!=""
586 .ENDIF # "$(UPDATER)"=="YES"
587 .ENDIF # "$(OS)"=="MACOSX"
588 @@ -4851,7 +4903,9 @@ $(SHL9TARGETN) : \
589 $(QUIET_BUILD) $(RM) $(LB)$/$(SHL9TARGETN:b)
590 $(QUIET_BUILD) cd $(LB) && ln -s $(SHL9TARGETN:f) $(SHL9TARGETN:b)
591 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
592 +.IF "$(QUIET_BUILD)"==""
593 @ls -l $@
594 +.ENDIF
595 .ENDIF # "$(GUI)" == "UNX"
597 .IF "$(GUI)" == "OS2"
598 @@ -5391,7 +5445,11 @@ $(SHL10TARGETN) : \
599 .IF "$(SHL10NOCHECK)"==""
600 $(QUIET_BUILD) -$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
601 $(QUIET_BUILD) $(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
602 - $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
603 +.IF "$(QUIET_BUILD)"==""
604 + $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
605 +.ELSE
606 + $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
607 +.ENDIF
608 .ENDIF # "$(SHL10NOCHECK)"!=""
609 .ENDIF # "$(UPDATER)"=="YES"
610 .ENDIF # "$(OS)"=="MACOSX"
611 @@ -5399,7 +5457,9 @@ $(SHL10TARGETN) : \
612 $(QUIET_BUILD) $(RM) $(LB)$/$(SHL10TARGETN:b)
613 $(QUIET_BUILD) cd $(LB) && ln -s $(SHL10TARGETN:f) $(SHL10TARGETN:b)
614 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
615 +.IF "$(QUIET_BUILD)"==""
616 @ls -l $@
617 +.ENDIF
618 .ENDIF # "$(GUI)" == "UNX"
620 .IF "$(GUI)" == "OS2"
621 diff --git solenv/inc/tg_lib.mk solenv/inc/tg_lib.mk
622 index bc02f97..064f1a0 100644
623 --- solenv/inc/tg_lib.mk
624 +++ solenv/inc/tg_lib.mk
625 @@ -54,14 +54,18 @@ $(LIB$(TNR)ARCHIV) : $(LIB$(TNR)TARGET)
626 .IF "$(OS)" == "MACOSX"
627 @echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
628 .ENDIF
629 +.IF "$(QUIET_BUILD)"==""
630 @cat $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
631 +.ENDIF
632 @+source $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
633 .ELSE # "$(GUI)"=="UNX"
634 .IF "$(GUI)$(COM)"=="WNTGCC"
635 @+-$(RM) $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
636 @+echo $(LIBMGR) $(LIB$(TNR)FLAGS) $(LIBFLAGS) $(LIB$(TNR)ARCHIV) `cat $(LIB$(TNR)TARGET) | sed s#'^'$(ROUT)#$(PRJ)$/$(ROUT)#g` > $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
637 @+echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
638 +.IF "$(QUIET_BUILD)"==""
639 @cat $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
640 +.ENDIF
641 @+source $(MISC)$/$(LIB$(TNR)ARCHIV:b).cmd
642 .ELSE
643 @echo just a dummy > $@
644 @@ -119,7 +123,9 @@ $(LIB$(TNR)TARGET) : $(LIB$(TNR)FILES) \
645 .ENDIF # "$(LIB$(TNR)FILES)"!=""
646 .ELSE # "$(GUI)"=="WNT"
647 @-$(RM) $@
648 +.IF "$(QUIET_BUILD)"==""
649 echo $(LIBMGR) r $@ $(LIB$(TNR)OBJFILES)
650 +.ENDIF
651 $(LIBMGR) r $@ $(LIB$(TNR)OBJFILES) $(LIB$(TNR)FILES) bla.lib
652 .ENDIF # "$(GUI)"=="WNT"
653 .ENDIF # "$(GUI)"=="UNX"
654 diff --git solenv/inc/tg_shl.mk solenv/inc/tg_shl.mk
655 index 489ba05..98b2040 100644
656 --- solenv/inc/tg_shl.mk
657 +++ solenv/inc/tg_shl.mk
658 @@ -492,7 +492,11 @@ $(SHL$(TNR)TARGETN) : \
659 .IF "$(SHL$(TNR)NOCHECK)"==""
660 $(QUIET_BUILD) -$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
661 $(QUIET_BUILD) $(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
662 - $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
663 +.IF "$(QUIET_BUILD)"==""
664 + $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
665 +.ELSE
666 + $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
667 +.ENDIF
668 .ENDIF # "$(SHL$(TNR)NOCHECK)"!=""
669 .ENDIF # "$(UPDATER)"=="YES"
670 .ENDIF # "$(OS)"=="MACOSX"
671 @@ -500,7 +504,9 @@ $(SHL$(TNR)TARGETN) : \
672 $(QUIET_BUILD) $(RM) $(LB)$/$(SHL$(TNR)TARGETN:b)
673 $(QUIET_BUILD) cd $(LB) && ln -s $(SHL$(TNR)TARGETN:f) $(SHL$(TNR)TARGETN:b)
674 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
675 +.IF "$(QUIET_BUILD)"==""
676 @ls -l $@
677 +.ENDIF
678 .ENDIF # "$(GUI)" == "UNX"
680 .IF "$(GUI)" == "OS2"
681 diff --git soltools/checkdll/checkdll.c soltools/checkdll/checkdll.c
682 index 44c554b..10164d1 100644
683 --- soltools/checkdll/checkdll.c
684 +++ soltools/checkdll/checkdll.c
685 @@ -47,33 +47,39 @@ static const char *psymbol = "GetVersionInfo";
687 void usage()
688 {
689 - fprintf(stderr, "usage: %s <dllname>\n", pprog_name);
690 + fprintf(stderr, "usage: %s [-s] <dllname>\n", pprog_name);
691 return;
692 }
694 int main(int argc, char *argv[])
695 {
696 int rc;
697 + int silent=0;
698 void *phandle;
699 char *(*pfun)(void);
701 - if ( argc < 2 || argc > 3) {
702 + if ( argc < 2 || argc > 4) {
703 usage();
704 return 1;
705 }
707 + if ( !strcmp(argv[1],"-s") ) {
708 + silent = 1;
709 + ++argv, --argc;
710 + }
711 +
712 if ( (rc = access( argv[1], R_OK )) == -1 ) {
713 fprintf(stderr, "%s: ERROR: %s: %s\n",
714 - pprog_name, argv[1], strerror(errno));
715 + pprog_name, argv[1], strerror(errno));
716 return 2;
717 }
719 - printf("Checking DLL %s ...", argv[1]);
720 + if (!silent) printf("Checking DLL %s ...", argv[1]);
721 fflush(stdout);
723 if ( (phandle = dlopen(argv[1], RTLD_NOW)) != NULL ) {
724 if ( (pfun = (char *(*)(void))dlsym(phandle, psymbol)) != NULL ) {
725 - printf(": ok\n");
726 + if (!silent) printf(": ok\n");
727 }
728 else
729 {
730 diff --git idlc/source/idlcmain.cxx idlc/source/idlcmain.cxx
731 index 792cd59..f56b945 100644
732 --- idlc/source/idlcmain.cxx
733 +++ idlc/source/idlcmain.cxx
734 @@ -132,11 +132,6 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
735 options.getProgramName().getStr(),
736 sal::static_int_cast< long >(nErrors),
737 options.prepareVersion().getStr());
738 - } else
739 - {
740 - fprintf(stdout, "%s: returned successful%s",
741 - options.getProgramName().getStr(),
742 - options.prepareVersion().getStr());
743 }
744 return nErrors;
745 }
746 diff --git solenv/bin/deliver.pl solenv/bin/deliver.pl
747 index bfd947e..afc5fd2 100755
748 --- solenv/bin/deliver.pl
749 +++ solenv/bin/deliver.pl
750 @@ -399,7 +399,7 @@ sub parse_options
751 {
752 my $arg;
753 my $dontdeletecommon = 0;
754 - $opt_silent = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'FALSE');
755 + $opt_silent = 1 if ( !defined $ENV{VERBOSE} || (defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'FALSE'));
756 $opt_verbose = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'TRUE');
757 while ( $arg = shift @ARGV ) {
758 $arg =~ /^-force$/ and $opt_force = 1 and next;
759 diff --git solenv/inc/target.mk solenv/inc/target.mk
760 index 635da62..75b4802 100644
761 --- solenv/inc/target.mk
762 +++ solenv/inc/target.mk
763 @@ -1395,38 +1395,38 @@ $(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE)
765 makedoc:
766 @@-mkdir $(OUT)$/ucrdoc
767 - $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))
768 + $(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))
769 # -$(UNOIDL) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -Bdoc -P..$/$(PRJNAME)$/$(IDLPACKAGE) -OH$(PRJ)$/..$/unodoc $(DOCIDLFILES) $(IDLFILES)
771 .IF "$(LOCALDBTARGET)"!=""
772 $(LOCALDBTARGET) : $(URDFILES) $(DEPIDLFILES)
773 - $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl))
774 - -$(RM) $@
775 - $(REGMERGE) $@ UCR @$(mktmp $(URDFILES))
776 + $(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl))
777 + @-$(RM) $@
778 + $(QUIET_BUILD) $(REGMERGE) $@ UCR @$(mktmp $(URDFILES))
779 .ENDIF
781 .IF "$(LOCALDOCDBTARGET)"!=""
782 $(LOCALDOCDBTARGET) : $(URDDOCFILES) $(DEPIDLFILES)
783 - $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl))
784 - -$(RM) $@
785 - $(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES))
786 + $(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl))
787 + @-$(RM) $@
788 + $(QUIET_BUILD) $(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES))
789 .ENDIF
791 .IF "$(UNOIDLDBTARGET)"!=""
792 $(UNOIDLDBTARGET) : $(UNOIDLDBFILES) $(UNOIDLDBREGS)
793 - -$(RM) $@
794 - $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
795 + @-$(RM) $@
796 + $(QUIET_BUILD) $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
797 .IF "$(LOCALREGDB)"!=""
798 - $(REGMERGE) $(LOCALREGDB) / $@
799 + $(QUIET_BUILD) $(REGMERGE) $(LOCALREGDB) / $@
800 .ENDIF
801 .ENDIF # "$(UNOIDLDBTARGET)"!=""
803 .IF "$(UNOIDLDBDOCTARGET)"!=""
804 $(UNOIDLDBDOCTARGET) : $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS)
805 - -$(RM) $@
806 - $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
807 + @-$(RM) $@
808 + $(QUIET_BUILD) $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
809 .IF "$(LOCALREGDB)"!=""
810 - $(REGMERGE) $(LOCALREGDB) / $@
811 + $(QUIET_BUILD) $(REGMERGE) $(LOCALREGDB) / $@
812 .ENDIF
813 .ENDIF # "$(UNOIDLDBDOCTARGET)"!=""