?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Update ooo320-m1
[ooovba.git] / applied_patches / 0042-cws-buildverbosity.diff
blob033cf47bcd787fff699c16f22c171a296396e143
1 The quiet build fixes from buildverbosity01 cws
2
3 From: Thorsten Behrens <thb@openoffice.org>
4
5
6 ---
7
8 dmake/make.c | 5
9 dmake/tests/misc-13 | 2
10 dmake/tests/misc-15 | 2
11 dmake/tests/targets-28 | 4
12 idl/inc/command.hxx | 1
13 idl/inc/database.hxx | 7
14 idl/source/prj/command.cxx | 10
15 idl/source/prj/database.cxx | 6
16 idl/source/prj/svidl.cxx | 8
17 idlc/inc/idlc/options.hxx | 4
18 idlc/source/idlcmain.cxx | 31 -
19 idlc/source/options.cxx | 18
20 offapi/util/makefile.mk | 12
21 offapi/util/target.pmk | 4
22 rsc/inc/rscerror.h | 14
23 rsc/source/parser/erscerr.cxx | 13
24 rsc/source/parser/rscyacc.cxx | 2
25 rsc/source/prj/gui.cxx | 16
26 rsc/source/prj/start.cxx | 90 +-
27 rsc/source/rsc/rsc.cxx | 51 +
28 scp2/macros/makefile.mk | 2
29 scp2/source/templates/makefile.mk | 2
30 scp2/source/templates/modules.pl | 3
31 slideshow/util/makefile.mk | 4
32 slideshow/util/makefile.pmk | 4
33 solenv/bin/build.pl | 17
34 solenv/bin/checkdll.sh | 42 -
35 solenv/bin/deliver.pl | 2
36 solenv/bin/mhids.pl | 26 -
37 solenv/inc/_tg_app.mk | 710 ++++++++------
38 solenv/inc/_tg_def.mk | 380 ++++---
39 solenv/inc/_tg_lib.mk | 200 +++-
40 solenv/inc/_tg_rslb.mk | 140 ++-
41 solenv/inc/_tg_scp.mk | 80 +-
42 solenv/inc/_tg_sdi.mk | 110 ++
43 solenv/inc/_tg_shl.mk | 1280 ++++++++++++++-----------
44 solenv/inc/_tg_srs.mk | 60 +
45 solenv/inc/_tg_zip.mk | 620 ++++++------
46 solenv/inc/ant.mk | 2
47 solenv/inc/extension_post.mk | 18
48 solenv/inc/pstrules.mk | 54 +
49 solenv/inc/rules.mk | 448 +++++----
50 solenv/inc/settings.mk | 17
51 solenv/inc/target.mk | 111 +-
52 solenv/inc/tg_app.mk | 71 +
53 solenv/inc/tg_config.mk | 57 +
54 solenv/inc/tg_def.mk | 38 -
55 solenv/inc/tg_dep.mk | 6
56 solenv/inc/tg_ext.mk | 90 +-
57 solenv/inc/tg_jar.mk | 4
58 solenv/inc/tg_java.mk | 4
59 solenv/inc/tg_lib.mk | 20
60 solenv/inc/tg_moz.mk | 8
61 solenv/inc/tg_obj.mk | 22
62 solenv/inc/tg_res.mk | 10
63 solenv/inc/tg_rslb.mk | 14
64 solenv/inc/tg_scp.mk | 8
65 solenv/inc/tg_sdi.mk | 11
66 solenv/inc/tg_shl.mk | 128 +--
67 solenv/inc/tg_slo.mk | 20
68 solenv/inc/tg_srs.mk | 6
69 solenv/inc/tg_wntx64.mk | 68 +
70 solenv/inc/tg_yxx.mk | 18
71 solenv/inc/tg_zip.mk | 62 +
72 solenv/inc/wntmsci11.mk | 11
73 soltools/HIDCompiler/hidclex.l | 67 +
74 soltools/checkdll/checkdll.c | 14
75 soltools/cpp/_cpp.c | 2
76 udkapi/util/target.pmk | 4
77 vcl/source/window/makefile.mk | 6
78 vcl/unx/source/gdi/makefile.mk | 4
79 writerfilter/source/doctok/makefile.mk | 16
80 writerfilter/source/ooxml/makefile.mk | 43 +
81 writerfilter/source/resourcemodel/makefile.mk | 35 -
82 74 files changed, 3191 insertions(+), 2308 deletions(-)
83
84
85 diff --git dmake/make.c dmake/make.c
86 index 0dfad3b..b7bbdfd 100644
87 --- dmake/make.c
88 +++ dmake/make.c
89 @@ -251,8 +251,9 @@ Make_targets()/*
90
91 for( lp = Targets->ce_prq; lp != NIL(LINK); lp = lp->cl_next ) {
92 CELLPTR tgt = lp->cl_prq;
93 - if( !(tgt->ce_attr & A_UPDATED) )
94 - printf( "`%s' is up to date\n", tgt->CE_NAME );
95 + if( !(tgt->ce_attr & A_UPDATED)
96 + && (Verbose & V_MAKE) )
97 + printf( "`%s' is up to date\n", tgt->CE_NAME );
98 }
99
100 DB_RETURN( 0 );
101 diff --git dmake/tests/misc-13 dmake/tests/misc-13
102 index a2381a8..7493e74 100755
103 --- dmake/tests/misc-13
104 +++ dmake/tests/misc-13
105 @@ -38,7 +38,7 @@ TeSt.target :
106
107 EOT
108
109 -output=`eval ${DMAKEPROG} -r -f $file1`
110 +output=`eval ${DMAKEPROG} -vm -r -f $file1`
111 result=$?
112
113 if echo "$output" | grep -v ".target' is up to date" > /dev/null 2>&1 ; then
114 diff --git dmake/tests/misc-15 dmake/tests/misc-15
115 index 1c52324..a213c2d 100755
116 --- dmake/tests/misc-15
117 +++ dmake/tests/misc-15
118 @@ -37,7 +37,7 @@ MYTARGET:=\$(PWD)/target.abc
119
120 EOT
121
122 -output=`eval ${DMAKEPROG} -r -f $file1`
123 +output=`eval ${DMAKEPROG} -vm -r -f $file1`
124 result=$?
125
126 if echo "$output" | grep "target.abc' is up to date" > /dev/null 2>&1 ; then
127 diff --git dmake/tests/targets-28 dmake/tests/targets-28
128 index da202b0..0943eb6 100755
129 --- dmake/tests/targets-28
130 +++ dmake/tests/targets-28
131 @@ -112,10 +112,10 @@ sleep 1
132
133 # This tests that aa.x is not build as the dependency chain is intact with
134 # the virtual target aa.y having the same time stamp as aa.z.
135 -output3=`eval ${DMAKEPROG} -rf $file1 2>&1`
136 +output3=`eval ${DMAKEPROG} -vm -rf $file1 2>&1`
137 result3=$?
138
139 -if test $result3 = 0 -a "$output3" = "\`aa.x' is up to date" ; then
140 +if test $result3 = 0 && echo "$output3" | grep "aa.x' is up to date" > /dev/null 2>&1 ; then
141 echo "Subtest 3: OK"
142 result3=0
143 else
144 diff --git idl/inc/command.hxx idl/inc/command.hxx
145 index b76e856..792039e 100644
146 --- idl/inc/command.hxx
147 +++ idl/inc/command.hxx
148 @@ -65,6 +65,7 @@ public:
149 String aCSVFile;
150 String aExportFile;
151 String aDocuFile;
152 + UINT32 nVerbosity;
153 UINT32 nFlags;
154
155 SvCommand( int argc, char ** argv );
156 diff --git idl/inc/database.hxx idl/inc/database.hxx
157 index 3a3e033..4daa5b9 100644
158 --- idl/inc/database.hxx
159 +++ idl/inc/database.hxx
160 @@ -39,6 +39,8 @@
161 /*************************************************************************
162 *************************************************************************/
163
164 +class SvCommand;
165 +
166 #ifdef IDL_COMPILER
167 /******************** class SvIdlError ***********************************/
168 class SvIdlError
169 @@ -70,6 +72,7 @@ class SvIdlDataBase
170 BOOL bExport;
171 String aExportFile;
172 sal_uInt32 nUniqueId;
173 + sal_uInt32 nVerbosity;
174 String aDataBaseFile;
175 SvFileStream * pStm;
176 BOOL bIsModified;
177 @@ -96,7 +99,7 @@ protected:
178 }
179 #endif
180 public:
181 - SvIdlDataBase();
182 + explicit SvIdlDataBase( const SvCommand& rCmd );
183 ~SvIdlDataBase();
184 static BOOL IsBinaryFormat( SvStream & rInStm );
185
186 @@ -165,7 +168,7 @@ public:
187 class SvIdlWorkingBase : public SvIdlDataBase
188 {
189 public:
190 - SvIdlWorkingBase();
191 + explicit SvIdlWorkingBase( const SvCommand& rCmd );
192
193 BOOL ReadSvIdl( SvTokenStream &, BOOL bImported, const String & rPath );
194 BOOL WriteSvIdl( SvStream & );
195 diff --git idl/source/prj/command.cxx idl/source/prj/command.cxx
196 index 861b809..bbbda71 100644
197 --- idl/source/prj/command.cxx
198 +++ idl/source/prj/command.cxx
199 @@ -258,7 +258,7 @@ static BOOL ResponseFile( StringList * pList, int argc, char ** argv )
200 |* Beschreibung
201 *************************************************************************/
202 SvCommand::SvCommand( int argc, char ** argv )
203 - : nFlags( 0 )
204 + : nVerbosity(1), nFlags( 0 )
205 {
206 StringList aList;
207
208 @@ -353,6 +353,14 @@ SvCommand::SvCommand( int argc, char ** argv )
209 { // Hilfe
210 printf( "%s", CommandLineSyntax );
211 }
212 + else if( aParam.EqualsIgnoreCaseAscii( "quiet" ) )
213 + {
214 + nVerbosity = 0;
215 + }
216 + else if( aParam.EqualsIgnoreCaseAscii( "verbose" ) )
217 + {
218 + nVerbosity = 2;
219 + }
220 else if( aParam.EqualsIgnoreCaseAscii( "syntax" ) )
221 { // Hilfe
222 int j = 0;
223 diff --git idl/source/prj/database.cxx idl/source/prj/database.cxx
224 index 36aeae4..7270423 100644
225 --- idl/source/prj/database.cxx
226 +++ idl/source/prj/database.cxx
227 @@ -58,9 +58,10 @@ void PrimeNumber(){
228 }
229 */
230
231 -SvIdlDataBase::SvIdlDataBase()
232 +SvIdlDataBase::SvIdlDataBase( const SvCommand& rCmd )
233 : bExport( FALSE )
234 , nUniqueId( 0 )
235 + , nVerbosity( rCmd.nVerbosity )
236 , bIsModified( FALSE )
237 , aPersStream( *IDLAPP->pClassMgr, NULL )
238 , pIdTable( NULL )
239 @@ -700,6 +701,7 @@ SvMetaClass * SvIdlDataBase::ReadKnownClass( SvTokenStream & rInStm )
240 void SvIdlDataBase::Write( const ByteString & rText )
241 {
242 #ifndef W31
243 + if( nVerbosity != 0 )
244 fprintf( stdout, "%s", rText.GetBuffer() );
245 #endif
246 }
247 @@ -803,7 +805,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
248 |*
249 |* Beschreibung
250 *************************************************************************/
251 -SvIdlWorkingBase::SvIdlWorkingBase()
252 +SvIdlWorkingBase::SvIdlWorkingBase(const SvCommand& rCmd) : SvIdlDataBase(rCmd)
253 {
254 }
255
256 diff --git idl/source/prj/svidl.cxx idl/source/prj/svidl.cxx
257 index 40ea9f7..6dbd39e 100644
258 --- idl/source/prj/svidl.cxx
259 +++ idl/source/prj/svidl.cxx
260 @@ -112,8 +112,6 @@ int cdecl main ( int argc, char ** argv)
261 {
262 #endif
263
264 - printf( "StarView Interface Definition Language (IDL) Compiler 3.0\n" );
265 -
266 /*
267 pStr = ::ResponseFile( &aCmdLine, argv, argc );
268 if( pStr )
269 @@ -136,8 +134,12 @@ int cdecl main ( int argc, char ** argv)
270 String aTmpDocuFile;
271
272 SvCommand aCommand( argc, argv );
273 +
274 + if( aCommand.nVerbosity != 0 )
275 + printf( "StarView Interface Definition Language (IDL) Compiler 3.0\n" );
276 +
277 Init();
278 - SvIdlWorkingBase * pDataBase = new SvIdlWorkingBase();
279 + SvIdlWorkingBase * pDataBase = new SvIdlWorkingBase(aCommand);
280
281 int nExit = 0;
282 if( aCommand.aExportFile.Len() )
283 diff --git idlc/inc/idlc/options.hxx idlc/inc/idlc/options.hxx
284 index 1e0a6a9..743ce12 100644
285 --- idlc/inc/idlc/options.hxx
286 +++ idlc/inc/idlc/options.hxx
287 @@ -69,11 +69,15 @@ public:
288
289 const StringVector& getInputFiles() const { return m_inputFiles; }
290 bool readStdin() const { return m_stdin; }
291 + bool verbose() const { return m_verbose; }
292 + bool quiet() const { return m_quiet; }
293
294 protected:
295 ::rtl::OString m_program;
296 StringVector m_inputFiles;
297 bool m_stdin;
298 + bool m_verbose;
299 + bool m_quiet;
300 OptionMap m_options;
301 };
302
303 diff --git idlc/source/idlcmain.cxx idlc/source/idlcmain.cxx
304 index 18eb90b..f993707 100644
305 --- idlc/source/idlcmain.cxx
306 +++ idlc/source/idlcmain.cxx
307 @@ -56,11 +56,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
308
309 sal_Int32 nErrors = 0;
310 if (options.readStdin()) {
311 - fprintf(
312 - stdout, "%s: compile stdin...\n",
313 - options.getProgramName().getStr());
314 + if ( !options.quiet() )
315 + fprintf(
316 + stdout, "%s: Compiling stdin\n",
317 + options.getProgramName().getStr());
318 nErrors = compileFile(0);
319 - if (idlc()->getWarningCount() > 0) {
320 + if ( ( idlc()->getWarningCount() > 0 ) && !options.quiet() ) {
321 fprintf(
322 stdout, "%s: detected %lu warnings compiling stdin\n",
323 options.getProgramName().getStr(),
324 @@ -85,16 +86,23 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
325 idlc()->reset();
326 }
327 StringVector const & files = options.getInputFiles();
328 + if ( options.verbose() )
329 + {
330 + fprintf( stdout, "%s: compiling %i source files ... \n",
331 + options.getProgramName().getStr(), (int)files.size() );
332 + fflush( stdout );
333 + }
334 for (StringVector::const_iterator i(files.begin());
335 i != files.end() && nErrors == 0; ++i)
336 {
337 OString sysFileName( convertToAbsoluteSystemPath(*i) );
338
339 - fprintf(stdout, "%s: compile '%s' ... \n",
340 - options.getProgramName().getStr(), (*i).getStr());
341 + if ( !options.quiet() )
342 + fprintf(stdout, "Compiling: %s\n",
343 + (*i).getStr());
344 nErrors = compileFile(&sysFileName);
345
346 - if ( idlc()->getWarningCount() )
347 + if ( idlc()->getWarningCount() && !options.quiet() )
348 fprintf(stdout, "%s: detected %lu warnings compiling file '%s'\n",
349 options.getProgramName().getStr(),
350 sal::static_int_cast< unsigned long >(
351 @@ -128,15 +136,16 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
352
353 if ( nErrors > 0 )
354 {
355 - fprintf(stdout, "%s: detected %ld errors%s",
356 + fprintf(stderr, "%s: detected %ld errors%s",
357 options.getProgramName().getStr(),
358 sal::static_int_cast< long >(nErrors),
359 options.prepareVersion().getStr());
360 } else
361 {
362 - fprintf(stdout, "%s: returned successful%s",
363 - options.getProgramName().getStr(),
364 - options.prepareVersion().getStr());
365 + if ( options.verbose() )
366 + fprintf(stdout, "%s: returned successful%s",
367 + options.getProgramName().getStr(),
368 + options.prepareVersion().getStr());
369 }
370 return nErrors;
371 }
372 diff --git idlc/source/options.cxx idlc/source/options.cxx
373 index efe97bb..35c5f14 100644
374 --- idlc/source/options.cxx
375 +++ idlc/source/options.cxx
376 @@ -37,7 +37,7 @@
377
378 using namespace rtl;
379
380 -Options::Options(): m_stdin(false)
381 +Options::Options(): m_stdin(false), m_verbose(false), m_quiet(false)
382 {
383 }
384
385 @@ -190,6 +190,22 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
386 } else
387 throw IllegalArgument(OString(av[j]) + ", please check your input");
388 break;
389 + case 'v':
390 + if ( 0 == strcmp( &av[j][1], "verbose" ) )
391 + {
392 + m_verbose = true;
393 + }
394 + else
395 + throw IllegalArgument(OString(av[j]) + ", please check your input");
396 + break;
397 + case 'q':
398 + if ( 0 == strcmp( &av[j][1], "quiet" ) )
399 + {
400 + m_quiet = true;
401 + }
402 + else
403 + throw IllegalArgument(OString(av[j]) + ", please check your input");
404 + break;
405 case 'w':
406 if (av[j][2] == 'e' && av[j][3] == '\0') {
407 if (m_options.count("-we") == 0)
408 diff --git offapi/util/makefile.mk offapi/util/makefile.mk
409 index 7093a78..d54d851 100644
410 --- offapi/util/makefile.mk
411 +++ offapi/util/makefile.mk
412 @@ -164,14 +164,14 @@ ALLTAR : $(UCR)$/types.db \
413 $(UNOTYPE_STATISTICS)
414
415 $(UCR)$/types.db : $(UCR)$/offapi.db $(SOLARBINDIR)$/udkapi.rdb
416 - -$(RM) $(REGISTRYCHECKFLAG)
417 - $(GNUCOPY) -f $(UCR)$/offapi.db $@
418 - $(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi.rdb
419 + @-$(RM) $(REGISTRYCHECKFLAG)
420 + @$(GNUCOPY) -f $(UCR)$/offapi.db $@
421 + $(COMMAND_ECHO)$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi.rdb
422
423 $(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udkapi_doc.rdb
424 - -$(RM) $(REGISTRYCHECKFLAG)
425 - $(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@
426 - $(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb
427 + @-$(RM) $(REGISTRYCHECKFLAG)
428 + @$(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@
429 + $(COMMAND_ECHO)$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb
430
431 #JSC: The type library has changed, all temporary not checked types are removed
432 # and will be check from now on.
433 diff --git offapi/util/target.pmk offapi/util/target.pmk
434 index 08912b0..af086d9 100644
435 --- offapi/util/target.pmk
436 +++ offapi/util/target.pmk
437 @@ -30,8 +30,8 @@
438 #*************************************************************************
439
440 $(OUT)$/misc$/$(TARGET).idls: makefile.mk
441 - -$(RM) $@
442 - $(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@
443 + $(COMMAND_ECHO)-$(RM) $@
444 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@
445
446 ALLTAR: $(OUT)$/misc$/$(TARGET).idls
447
448 diff --git rsc/inc/rscerror.h rsc/inc/rscerror.h
449 index 5cc8f96..643d6fb 100644
450 --- rsc/inc/rscerror.h
451 +++ rsc/inc/rscerror.h
452 @@ -120,9 +120,17 @@ public:
453 class RscId;
454 class RscTop;
455
456 +enum RscVerbosity
457 +{
458 + RscVerbositySilent = 0,
459 + RscVerbosityNormal = 1,
460 + RscVerbosityVerbose = 2
461 +};
462 +
463 class RscError
464 {
465 FILE * fListing;
466 + RscVerbosity m_verbosity;
467
468 void WriteError( const ERRTYPE& rError, const char * pMessage );
469 void StdLstOut( const char * pStr );
470 @@ -131,9 +139,10 @@ class RscError
471 const RscId & aId );
472 public:
473 sal_uInt32 nErrors;// Anzahl der Fehler
474 - RscError(){
475 + RscError( RscVerbosity _verbosity ) {
476 fListing = NULL;
477 nErrors = 0;
478 + m_verbosity = _verbosity;
479 };
480 void SetListFile( FILE * fList ){
481 fListing = fList;
482 @@ -141,7 +150,8 @@ public:
483 FILE * GetListFile(){
484 return fListing;
485 };
486 - virtual void StdOut( const char * );
487 + RscVerbosity GetVerbosity() const { return m_verbosity; }
488 + virtual void StdOut( const char *, const RscVerbosity _verbosityLevel = RscVerbosityNormal );
489 virtual void StdErr( const char * );
490 virtual void LstOut( const char * );
491 virtual void Error( const ERRTYPE& rError, RscTop* pClass, const RscId &aId,
492 diff --git rsc/source/parser/erscerr.cxx rsc/source/parser/erscerr.cxx
493 index 0027666..0dc33e9 100644
494 --- rsc/source/parser/erscerr.cxx
495 +++ rsc/source/parser/erscerr.cxx
496 @@ -69,14 +69,15 @@ ERRTYPE& ERRTYPE::operator = ( const ERRTYPE & rError )
497 |* Letzte Aenderung MM 06.05.91
498 |*
499 *************************************************************************/
500 -void RscError::StdOut( const char * pStr )
501 +void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel )
502 {
503 -#ifndef WIN
504 - if( pStr ){
505 - printf( "%s", pStr );
506 - fflush( stdout );
507 + if ( m_verbosity >= _verbosityLevel )
508 + {
509 + if( pStr ){
510 + printf( "%s", pStr );
511 + fflush( stdout );
512 + }
513 }
514 -#endif
515 }
516
517 /*************************************************************************
518 diff --git rsc/source/parser/rscyacc.cxx rsc/source/parser/rscyacc.cxx
519 index af8b0a3..590aba6 100644
520 --- rsc/source/parser/rscyacc.cxx
521 +++ rsc/source/parser/rscyacc.cxx
522 @@ -190,7 +190,7 @@ BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember )
523
524 ObjNode * pNode = new ObjNode( aName1, S.Top().pData,
525 pFI->GetFileIndex() );
526 - pTC->pEH->StdOut( "." );
527 + pTC->pEH->StdOut( ".", RscVerbosityVerbose );
528
529 if( !aName1.IsId() )
530 pTC->pEH->Error( ERR_IDEXPECTED, pHeader->pClass, aName1 );
531 diff --git rsc/source/prj/gui.cxx rsc/source/prj/gui.cxx
532 index 066e0d4..742e440 100644
533 --- rsc/source/prj/gui.cxx
534 +++ rsc/source/prj/gui.cxx
535 @@ -57,6 +57,20 @@ static RscCompiler * pRscCompiler = NULL;
536 delete pRscCompiler;
537 }
538
539 +RscVerbosity lcl_determineVerbosity( int argc, char ** argv )
540 +{
541 + for ( int i = 0; i < argc; ++i )
542 + {
543 + if ( argv[i] == NULL )
544 + continue;
545 + if ( rsc_stricmp( argv[i], "-verbose" ) == 0 )
546 + return RscVerbosityVerbose;
547 + if ( rsc_stricmp( argv[i], "-quiet" ) == 0 )
548 + return RscVerbositySilent;
549 + }
550 + return RscVerbosityNormal;
551 +}
552 +
553 #if defined( UNX ) || ( defined( OS2 ) && ( defined( CSET ) || defined ( GCC ))) || defined (WTC) || defined(ICC) || defined(__MINGW32__)
554 int main ( int argc, char ** argv) {
555 #else
556 @@ -80,7 +94,7 @@ int cdecl main ( int argc, char ** argv) {
557 ERRTYPE aError;
558
559 InitRscCompiler();
560 - RscError* pErrHdl = new RscError();
561 + RscError* pErrHdl = new RscError( lcl_determineVerbosity( argc, argv ) );
562 #ifdef MTW
563 RscCmdLine* pCmdLine = new RscCmdLine( argc, (char **)argv, pErrHdl );
564 #else
565 diff --git rsc/source/prj/start.cxx rsc/source/prj/start.cxx
566 index 42ff95c..4b8dcc3 100644
567 --- rsc/source/prj/start.cxx
568 +++ rsc/source/prj/start.cxx
569 @@ -56,6 +56,7 @@
570
571 #endif // UNX
572 #include <rsctools.hxx>
573 +#include <rscerror.h>
574 #include <tools/fsys.hxx>
575
576 /*************** C O D E ************************************************/
577 @@ -111,25 +112,38 @@ static BOOL CallPrePro( const ByteString& rPrePro,
578
579 if( !fRspFile )
580 aNewCmdL.Append( rsc_strdup( rPrePro.GetBuffer() ) );
581 - for( i = 1; i < int(pCmdLine->GetCount() -1); i++ ){
582 - if( !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-u", 2 )
583 - || !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-i", 2 )
584 - || !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-d", 2 ) )
585 +
586 + bool bVerbose = false;
587 + for( i = 1; i < int(pCmdLine->GetCount() -1); i++ )
588 + {
589 + if ( 0 == rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-verbose" ) )
590 {
591 + bVerbose = true;
592 + continue;
593 + }
594 + if ( !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-u", 2 )
595 + || !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-i", 2 )
596 + || !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-d", 2 )
597 + )
598 + {
599 aNewCmdL.Append( rsc_strdup( (char *)pCmdLine->GetEntry( i ) ) );
600 }
601 - };
602 + }
603 +
604 aNewCmdL.Append( rsc_strdup( rInput.GetBuffer() ) );
605 aNewCmdL.Append( rsc_strdup( rOutput.GetBuffer() ) );
606 aNewCmdL.Append( (void *)0 );
607
608 - printf( "Preprocessor commandline: " );
609 - for( i = 0; i < (int)(pCmdL->GetCount() -1); i++ )
610 + if ( bVerbose )
611 {
612 - printf( " " );
613 - printf( "%s", (const char *)pCmdL->GetEntry( i ) );
614 + printf( "Preprocessor commandline: " );
615 + for( i = 0; i < (int)(pCmdL->GetCount() -1); i++ )
616 + {
617 + printf( " " );
618 + printf( "%s", (const char *)pCmdL->GetEntry( i ) );
619 + }
620 + printf( "\n" );
621 }
622 - printf( "\n" );
623
624 if( fRspFile )
625 {
626 @@ -150,13 +164,16 @@ static BOOL CallPrePro( const ByteString& rPrePro,
627 }
628 fclose( fRspFile );
629
630 - printf( "Preprocessor startline: " );
631 - for( i = 0; i < (int)(pCmdL->GetCount() -1); i++ )
632 + if ( bVerbose )
633 {
634 - printf( " " );
635 - printf( "%s", (const char *)pCmdL->GetEntry( i ) );
636 + printf( "Preprocessor startline: " );
637 + for( i = 0; i < (int)(pCmdL->GetCount() -1); i++ )
638 + {
639 + printf( " " );
640 + printf( "%s", (const char *)pCmdL->GetEntry( i ) );
641 + }
642 + printf( "\n" );
643 }
644 - printf( "\n" );
645 }
646
647 #if ((defined OS2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2
648 @@ -194,7 +211,6 @@ static BOOL CallRsc2( ByteString aRsc2Name,
649 ByteString aSrsName,
650 RscPtrPtr * pCmdLine )
651 {
652 - RscPtrPtr aNewCmdL; // Kommandozeile
653 int i, nExit;
654 ByteString* pString;
655 ByteString aRspFileName; // Response-Datei
656 @@ -203,22 +219,22 @@ static BOOL CallRsc2( ByteString aRsc2Name,
657 aRspFileName = ::GetTmpFileName();
658 fRspFile = fopen( aRspFileName.GetBuffer(), "w" );
659
660 - printf( "Rsc2 commandline: " );
661 - aNewCmdL.Append( rsc_strdup( aRsc2Name.GetBuffer() ) );
662 - printf( "%s", (const char *)aNewCmdL.GetEntry( aNewCmdL.GetCount() -1 ) );
663 - printf( " " );
664 - ByteString aTmpStr( '@' );
665 - aTmpStr += aRspFileName;
666 - aNewCmdL.Append( rsc_strdup( aTmpStr.GetBuffer() ) );
667 - printf( "%s", (const char *)aNewCmdL.GetEntry( aNewCmdL.GetCount() -1 ) );
668 - aNewCmdL.Append( (void *)0 );
669 - printf( "\n" );
670 -
671 + RscVerbosity eVerbosity = RscVerbosityNormal;
672 if( fRspFile )
673 {
674 for( i = 1; i < (int)(pCmdLine->GetCount() -1); i++ )
675 {
676 - if( !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-fp=", 4 )
677 + if ( !rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-verbose" ) )
678 + {
679 + eVerbosity = RscVerbosityVerbose;
680 + continue;
681 + }
682 + if ( !rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-quiet" ) )
683 + {
684 + eVerbosity = RscVerbositySilent;
685 + continue;
686 + }
687 + if( !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-fp=", 4 )
688 || !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-fo=", 4 )
689 || !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-pp=", 4 )
690 || !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-rsc2=", 6 )
691 @@ -261,6 +277,22 @@ static BOOL CallRsc2( ByteString aRsc2Name,
692 fclose( fRspFile );
693 };
694
695 + RscPtrPtr aNewCmdL; // Kommandozeile
696 + aNewCmdL.Append( rsc_strdup( aRsc2Name.GetBuffer() ) );
697 + ByteString aTmpStr( '@' );
698 + aTmpStr += aRspFileName;
699 + aNewCmdL.Append( rsc_strdup( aTmpStr.GetBuffer() ) );
700 + aNewCmdL.Append( (void *)0 );
701 +
702 + if ( eVerbosity >= RscVerbosityVerbose )
703 + {
704 + printf( "Rsc2 commandline: " );
705 + printf( "%s", (const char *)aNewCmdL.GetEntry( 0 ) );
706 + printf( " " );
707 + printf( "%s", (const char *)aNewCmdL.GetEntry( 1 ) );
708 + printf( "\n" );
709 + }
710 +
711 #if ((defined OS2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2
712 nExit = spawnvp( P_WAIT, aRsc2Name.GetBuffer(), (char* const*)aNewCmdL.GetBlock() );
713 #elif defined CSET
714 @@ -328,8 +360,6 @@ int cdecl main ( int argc, char ** argv)
715 aRsc2Name += aDelim;
716 aRsc2Name += ByteString("rsc2");
717
718 - printf( "VCL Resource Compiler 3.0\n" );
719 -
720 pStr = ::ResponseFile( &aCmdLine, argv, argc );
721 if( pStr )
722 {
723 diff --git rsc/source/rsc/rsc.cxx rsc/source/rsc/rsc.cxx
724 index 876882e..0068dd8 100644
725 --- rsc/source/rsc/rsc.cxx
726 +++ rsc/source/rsc/rsc.cxx
727 @@ -520,15 +520,18 @@ printf( "khg\n" );
728 }
729 };
730
731 - pTC->pEH->StdOut( "Files: " );
732 - pFName = pTC->aFileTab.First();
733 - while( pFName )
734 + if ( pTC->pEH->GetVerbosity() >= RscVerbosityVerbose )
735 {
736 - pTC->pEH->StdOut( pFName->aFileName.GetBuffer() );
737 - pTC->pEH->StdOut( " " );
738 - pFName = pTC->aFileTab.Next();
739 - };
740 - pTC->pEH->StdOut( "\n" );
741 + pTC->pEH->StdOut( "Files: " );
742 + pFName = pTC->aFileTab.First();
743 + while( pFName )
744 + {
745 + pTC->pEH->StdOut( pFName->aFileName.GetBuffer() );
746 + pTC->pEH->StdOut( " " );
747 + pFName = pTC->aFileTab.Next();
748 + };
749 + pTC->pEH->StdOut( "\n" );
750 + }
751
752 if( aError.IsOk() )
753 aError = Link();
754 @@ -554,9 +557,9 @@ void RscCompiler::EndCompile()
755 {
756 if( pCL->aOutputSrs.Len() && (pCL->nCommands & NOLINK_FLAG) )
757 {
758 - pTC->pEH->StdOut( "Writing file " );
759 - pTC->pEH->StdOut( pCL->aOutputSrs.GetBuffer() );
760 - pTC->pEH->StdOut( ".\n" );
761 + pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
762 + pTC->pEH->StdOut( pCL->aOutputSrs.GetBuffer(), RscVerbosityVerbose );
763 + pTC->pEH->StdOut( ".\n", RscVerbosityVerbose );
764
765 // kopiere von TMP auf richtigen Namen
766 unlink( pCL->aOutputSrs.GetBuffer() ); // Zieldatei loeschen
767 @@ -588,9 +591,9 @@ void RscCompiler::EndCompile()
768
769 if ( aTmpOutputHxx.Len() )
770 {
771 - pTC->pEH->StdOut( "Writing file " );
772 - pTC->pEH->StdOut( pCL->aOutputHxx.GetBuffer() );
773 - pTC->pEH->StdOut( ".\n" );
774 + pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
775 + pTC->pEH->StdOut( pCL->aOutputHxx.GetBuffer(), RscVerbosityVerbose );
776 + pTC->pEH->StdOut( ".\n", RscVerbosityVerbose );
777
778 // kopiere von TMP auf richtigen Namen
779 unlink( pCL->aOutputHxx.GetBuffer() ); // Zieldatei loeschen
780 @@ -601,9 +604,9 @@ void RscCompiler::EndCompile()
781
782 if( aTmpOutputCxx.Len() )
783 {
784 - pTC->pEH->StdOut( "Writing file " );
785 - pTC->pEH->StdOut( pCL->aOutputCxx.GetBuffer() );
786 - pTC->pEH->StdOut( ".\n" );
787 + pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
788 + pTC->pEH->StdOut( pCL->aOutputCxx.GetBuffer(), RscVerbosityVerbose );
789 + pTC->pEH->StdOut( ".\n", RscVerbosityVerbose );
790
791 // kopiere von TMP auf richtigen Namen
792 unlink( pCL->aOutputCxx.GetBuffer() ); // Zieldatei loeschen
793 @@ -614,9 +617,9 @@ void RscCompiler::EndCompile()
794
795 if( aTmpOutputRcCtor.Len() )
796 {
797 - pTC->pEH->StdOut( "Writing file " );
798 - pTC->pEH->StdOut( pCL->aOutputRcCtor.GetBuffer() );
799 - pTC->pEH->StdOut( ".\n" );
800 + pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
801 + pTC->pEH->StdOut( pCL->aOutputRcCtor.GetBuffer(), RscVerbosityVerbose );
802 + pTC->pEH->StdOut( ".\n", RscVerbosityVerbose );
803
804 // kopiere von TMP auf richtigen Namen
805 unlink( pCL->aOutputRcCtor.GetBuffer() ); // Zieldatei loeschen
806 @@ -776,14 +779,14 @@ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey,
807 {
808 RscFileInst aFileInst( pTC, lFileKey, lFileKey, finput );
809
810 - pTC->pEH->StdOut( "reading file " );
811 - pTC->pEH->StdOut( aParseFile.GetBuffer() );
812 - pTC->pEH->StdOut( " " );
813 + pTC->pEH->StdOut( "reading file ", RscVerbosityVerbose );
814 + pTC->pEH->StdOut( aParseFile.GetBuffer(), RscVerbosityVerbose );
815 + pTC->pEH->StdOut( " ", RscVerbosityVerbose );
816
817 aError = ::parser( &aFileInst );
818 if( aError.IsError() )
819 pTC->Delete( lFileKey );//Resourceobjekte loeschen
820 - pTC->pEH->StdOut( "\n" );
821 + pTC->pEH->StdOut( "\n", RscVerbosityVerbose );
822 fclose( finput );
823 };
824
825 diff --git scp2/macros/makefile.mk scp2/macros/makefile.mk
826 index 52a0ac1..7a35c21 100644
827 --- scp2/macros/makefile.mk
828 +++ scp2/macros/makefile.mk
829 @@ -50,4 +50,4 @@ ALLTAR : $(INCCOM)$/langmacros.inc
830 @echo ------------------------------
831 @echo Making: $@
832 @@-$(RENAME) $@ $@.tmp
833 - $(PERL) macro.pl -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
834 + $(COMMAND_ECHO)$(PERL) macro.pl $(VERBOSITY) -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
835 diff --git scp2/source/templates/makefile.mk scp2/source/templates/makefile.mk
836 index 03b3590..aacc369 100755
837 --- scp2/source/templates/makefile.mk
838 +++ scp2/source/templates/makefile.mk
839 @@ -52,5 +52,5 @@ PHONYTEMPL=.PHONY
840 .ENDIF # "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
841 $(INCCOM)$/alllangmodules%.inc $(PHONYTEMPL) : module_langpack%.sct
842 @@-$(RENAME) $@ $@.tmp
843 - $(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
844 + $(COMMAND_ECHO)$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
845 @echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_lang_track.mk
846 diff --git scp2/source/templates/modules.pl scp2/source/templates/modules.pl
847 index 4287e0e..ad75aca 100755
848 --- scp2/source/templates/modules.pl
849 +++ scp2/source/templates/modules.pl
850 @@ -36,6 +36,7 @@ my $infile = "";
851 my @infile = ();
852 my $globalcounter = 0;
853 my $globallinecounter = 0;
854 +my $verbose = 0;
855
856 if ( !defined $completelangiso_var) {
857 print STDERR "ERROR: No language defined!\n";
858 @@ -168,6 +169,6 @@ sub startup_check
859 sub usage
860 {
861 print STDERR "Generate language modules from language script particle template (*.sct file)\n";
862 - print STDERR "perl $0 -o outputfile -i inputfile\n";
863 + print STDERR "perl $0 [-verbose] -o outputfile -i inputfile\n";
864 exit 1;
865 }
866 diff --git slideshow/util/makefile.mk slideshow/util/makefile.mk
867 index 4b40086..aba4094 100644
868 --- slideshow/util/makefile.mk
869 +++ slideshow/util/makefile.mk
870 @@ -41,8 +41,8 @@ ENABLE_EXCEPTIONS=TRUE
871
872 # --- Common ----------------------------------------------------------
873
874 -.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
875 -CDEFS+= -DVERBOSE
876 +.IF "$(VERBOSE)"=="TRUE"
877 +CDEFS+=-DVERBOSE
878 .ENDIF
879
880 SHL1DLLPRE=
881 diff --git slideshow/util/makefile.pmk slideshow/util/makefile.pmk
882 index 5aef116..362e7f8 100644
883 --- slideshow/util/makefile.pmk
884 +++ slideshow/util/makefile.pmk
885 @@ -29,8 +29,8 @@
886 #
887 #*************************************************************************
888
889 -.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
890 -CDEFS+= -DVERBOSE
891 +.IF "$(VERBOSE)"=="TRUE"
892 +CDEFS+=-DVERBOSE
893 .ENDIF
894
895 .IF "$(debug)"!="" || "$(DEBUG)"!=""
896 diff --git solenv/bin/build.pl solenv/bin/build.pl
897 index d3be214..8ec9add 100755
898 --- solenv/bin/build.pl
899 +++ solenv/bin/build.pl
900 @@ -55,6 +55,10 @@
901 require GenInfoParser; import GenInfoParser;
902 require IO::Handle; import IO::Handle;
903 };
904 + my $verbose_mode = 0;
905 + if (defined $ENV{verbose} || defined $ENV{VERBOSE}) {
906 + $verbose_mode = ($ENV{verbose} =~ /^t\S*$/i);
907 + }
908 my $enable_multiprocessing = 1;
909 my $cygwin = 0;
910 $cygwin++ if ($^O eq 'cygwin');
911 @@ -590,7 +594,7 @@ sub dmake_dir {
912 print "$dmake\n";
913 print $check_error_string;
914 } else {
915 - print "$BuildDir\n";
916 + print "\nEntering $BuildDir\n";
917 };
918 RemoveFromDependencies($BuildDir, \%LocalDepsHash) if (!$child);
919 return if ($cmd_file || $show);
920 @@ -1391,6 +1395,9 @@ sub get_options {
921 # Default build modes(for OpenOffice.org)
922 $ENV{BUILD_TYPE} = 'OOo EXT' if (!defined $ENV{BUILD_TYPE});
923 @ARGV = @dmake_args;
924 + foreach $arg (@dmake_args) {
925 + $arg =~ /^verbose=(\S+)$/i and $verbose_mode = ($1 =~ /^t\S*$/i);
926 + }
927 };
928
929 sub get_module_and_buildlist_paths {
930 @@ -1569,7 +1576,7 @@ sub clear_from_child {
931 $running_children{$folders_hashes{$child_nick}}--;
932 delete $processes_hash{$pid};
933 $only_dependent = 0;
934 - print 'Running processes: ' . children_number() . "\n";
935 + $verbose_mode && print 'Running processes: ' . children_number() . "\n";
936 };
937
938 #
939 @@ -1660,7 +1667,7 @@ sub start_child {
940 select $oldfh;
941 $processes_hash{$pid} = $job_dir;
942 $children_running = children_number();
943 - print 'Running processes: ', $children_running, "\n";
944 + $verbose_mode && print 'Running processes: ', $children_running, "\n";
945 $maximal_processes = $children_running if ($children_running > $maximal_processes);
946 $folders_hashes{$job_dir} = $dependencies_hash;
947 $running_children{$dependencies_hash}++;
948 @@ -3052,7 +3059,7 @@ sub run_server {
949 delete $clients_times{$pid};
950 clear_from_child($pid);
951 delete $clients_jobs{$pid};
952 - print 'Running processes: ', children_number(), "\n";
953 + $verbose_mode && print 'Running processes: ', children_number(), "\n";
954 # Actually, next 3 strings are only for even distribution
955 # of clients if there are more than one build server running
956 print $new_socket_obj 'No job';
957 @@ -3077,7 +3084,7 @@ sub run_server {
958 $clients_jobs{$pid} = $job_string;
959 $clients_times{$pid} = time;
960 $children_running = children_number();
961 - print 'Running processes: ', $children_running, "\n";
962 + $verbose_mode && print 'Running processes: ', $children_running, "\n";
963 $maximal_processes = $children_running if ($children_running > $maximal_processes);
964 } else {
965 print $new_socket_obj 'No job';
966 diff --git solenv/bin/checkdll.sh solenv/bin/checkdll.sh
967 index f553bcf..8390e37 100755
968 --- solenv/bin/checkdll.sh
969 +++ solenv/bin/checkdll.sh
970 @@ -42,42 +42,42 @@ checkdll="$SOLARVERSION/$INPATH/bin$UPDMINOREXT/checkdll"
971 if [ -x $checkdll ]; then
972 while :
973 do
974 - case $1 in
975 - -L) shift; option=$1;;
976 - --) break;;
977 - esac
978 - case "${libpath+X}" in
979 - X) libpath=$libpath:$option;;
980 - *) libpath=$option;;
981 - esac
982 - shift
983 + case $1 in
984 + -L) shift; option=$1;;
985 + --) break;;
986 + esac
987 + case "${libpath+X}" in
988 + X) libpath=$libpath:$option;;
989 + *) libpath=$option;;
990 + esac
991 + shift
992 done
993 shift # remove the trailing ---
994
995 case `uname -s` in
996 Darwin) case "${DYLD_LIBRARY_PATH+X}" in
997 - X) DYLD_LIBRARY_PATH=$libpath:$DYLD_LIBRARY_PATH;;
998 - *) DYLD_LIBRARY_PATH=$libpath;;
999 + X) DYLD_LIBRARY_PATH=$libpath:$DYLD_LIBRARY_PATH;;
1000 + *) DYLD_LIBRARY_PATH=$libpath;;
1001 esac
1002 export DYLD_LIBRARY_PATH;;
1003 IRIX) case "${LD_LIBRARYN32_PATH+X}" in
1004 - X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;;
1005 - *) LD_LIBRARYN32_PATH=$libpath;;
1006 - esac
1007 + X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;;
1008 + *) LD_LIBRARYN32_PATH=$libpath;;
1009 + esac
1010 export LD_LIBRARYN32_PATH;;
1011 IRIX64) case "${LD_LIBRARYN32_PATH+X}" in
1012 - X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;;
1013 - *) LD_LIBRARYN32_PATH=$libpath;;
1014 - esac
1015 + X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;;
1016 + *) LD_LIBRARYN32_PATH=$libpath;;
1017 + esac
1018 export LD_LIBRARYN32_PATH;;
1019 - *) case "${LD_LIBRARY_PATH+X}" in
1020 - X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;;
1021 - *) LD_LIBRARY_PATH=$libpath;;
1022 + *) case "${LD_LIBRARY_PATH+X}" in
1023 + X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;;
1024 + *) LD_LIBRARY_PATH=$libpath;;
1025 esac
1026 export LD_LIBRARY_PATH;;
1027 esac
1028
1029 - $checkdll "$*"
1030 + $checkdll "$@"
1031 if [ $? -ne 0 ]; then exit 1 ; fi
1032
1033 for parameter in $*; do
1034 diff --git solenv/bin/deliver.pl solenv/bin/deliver.pl
1035 index ce55dd9..a004497 100755
1036 --- solenv/bin/deliver.pl
1037 +++ solenv/bin/deliver.pl
1038 @@ -402,7 +402,7 @@ sub parse_options
1039 {
1040 my $arg;
1041 my $dontdeletecommon = 0;
1042 - $opt_silent = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'FALSE');
1043 + $opt_silent = 1 if ( !defined $ENV{VERBOSE} || (defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'FALSE'));
1044 $opt_verbose = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'TRUE');
1045 while ( $arg = shift @ARGV ) {
1046 $arg =~ /^-force$/ and $opt_force = 1 and next;
1047 diff --git solenv/bin/mhids.pl solenv/bin/mhids.pl
1048 index 1fd0f3b..5226980 100644
1049 --- solenv/bin/mhids.pl
1050 +++ solenv/bin/mhids.pl
1051 @@ -37,6 +37,7 @@ my $srs;
1052 my $prjname;
1053 my $defs;
1054 my $solarincludes;
1055 +my $verbose = 0;
1056
1057 my $debug = 0;
1058 my $filebase;
1059 @@ -109,9 +110,24 @@ sub setcompiler
1060 }
1061
1062 #---------------------------------------------------
1063 -$filename = shift @ARGV;
1064 -$srs = shift @ARGV;
1065 -$prjname = shift @ARGV;
1066 +$filename = undef;
1067 +$srs = undef;
1068 +$prjname = undef;
1069 +
1070 +my @expectedArgs = ( \$filename, \$srs, \$prjname );
1071 +my $expectedArgsIndex = 0;
1072 +while ( ( $#ARGV >= 0 ) && ( $expectedArgsIndex < 3 ) )
1073 +{
1074 + $_ = shift @ARGV;
1075 + if ( /^-verbose$/ )
1076 + {
1077 + $verbose = 1;
1078 + next;
1079 + }
1080 + ${$expectedArgs[ $expectedArgsIndex ]} = $_;
1081 + ++$expectedArgsIndex;
1082 +}
1083 +
1084 $defs = join " ",@ARGV if ($#ARGV);
1085
1086 if ( !defined $prjname ) { die "ERROR - check usage\n"; }
1087 @@ -144,7 +160,7 @@ $workfile = "$tmpdir/${filebase}_".$$;
1088 # now get $workfile ready for shell usage...
1089 $shell_workfile = $workfile;
1090
1091 -print "workfile: $workfile\n";
1092 +print "workfile: $workfile\n" if $verbose;
1093
1094 #remove old objects which remained in place by a former bug
1095 unlink "$workfile.obj";
1096 @@ -226,7 +242,7 @@ if ( $outobj_flag ne "" )
1097 {
1098 $outobj_param = "$outobj_flag${shell_workfile}$objext";
1099 }
1100 -print "$compiler $solarincludes $defs ${shell_workfile}.c $outobj_param $outbin_flag${shell_workfile}$appext \n";
1101 +print "$compiler $solarincludes $defs ${shell_workfile}.c $outobj_param $outbin_flag${shell_workfile}$appext \n" if $verbose;
1102 $ret = system "$compiler $solarincludes $defs ${shell_workfile}.c $outobj_param $outbin_flag${shell_workfile}$appext";
1103 if ( $ret ) {
1104 push @cleanuplist, "$appext";
1105 diff --git solenv/inc/_tg_app.mk solenv/inc/_tg_app.mk
1106 index cdb592d..7ea8ca9 100644
1107 --- solenv/inc/_tg_app.mk
1108 +++ solenv/inc/_tg_app.mk
1109 @@ -86,7 +86,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
1110 $(APP1IMP_ORD) \
1111 $(APP1ICON) $(APP1DEPN) $(USE_APP1DEF)
1112 @echo ------------------------------
1113 - @echo Making: $@
1114 + @echo "Making: " $(@:f)
1115 .IF "$(GUI)"=="UNX"
1116 .IF "$(OS)"=="MACOSX"
1117 @echo unx
1118 @@ -100,7 +100,9 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
1119 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
1120 `cat $(MISC)/$(TARGET).$(@:b)_1.cmd` \
1121 >> $(MISC)/$(TARGET).$(@:b)_1.cmd
1122 + .IF "$(VERBOSE)" == "TRUE"
1123 @cat $(MISC)/$(TARGET).$(@:b)_1.cmd
1124 + .ENDIF
1125 @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
1126 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
1127 # libraries at runtime
1128 @@ -110,7 +112,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
1129 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
1130 app $(APP1RPATH) $@
1131 .IF "$(TARGETTYPE)"=="GUI"
1132 - @echo "Making: $@.app"
1133 + @echo "Making: " $(@:f).app
1134 @macosx-create-bundle $@
1135 .ENDIF # "$(TARGETTYPE)"=="GUI"
1136 .ELSE # "$(OS)"=="MACOSX"
1137 @@ -120,9 +122,13 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
1138 $(APP1OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_1.cmd
1139 @cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_1.cmd
1140 @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)/$(TARGET).$(@:b)_1.cmd
1141 - cat $(MISC)/$(TARGET).$(@:b)_1.cmd
1142 + .IF "$(VERBOSE)" == "TRUE"
1143 + @cat $(MISC)/$(TARGET).$(@:b)_1.cmd
1144 + .ENDIF
1145 @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
1146 + .IF "$(VERBOSE)" == "TRUE"
1147 @ls -l $@
1148 + .ENDIF
1149 .ENDIF # "$(OS)"=="MACOSX"
1150 .ENDIF
1151 .IF "$(GUI)" == "WNT"
1152 @@ -136,7 +142,7 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
1153 @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP1LINKRES:b).rc
1154 @-echo $(EMQ)#include $(EMQ)"$(APP1VERINFO)$(EMQ)" >> $(MISC)/$(APP1LINKRES:b).rc
1155 .ENDIF # "$(APP1VERINFO)" != ""
1156 - $(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc
1157 + $(COMMAND_ECHO)$(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc
1158 .ENDIF # "$(APP1LINKRES)" != ""
1159 .IF "$(COM)" == "GCC"
1160 @echo mingw
1161 @@ -144,19 +150,22 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
1162 @cat $(APP1LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) > $(MISC)/$(@:b)_all.res
1163 windres $(MISC)/$(@:b)_all.res $(APP1RESO)
1164 .ENDIF
1165 - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
1166 + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
1167 $(APP1BASEX) $(APP1STACKN) -o $@ $(APP1OBJS) \
1168 -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP1RESO) \
1169 `$(TYPE) /dev/null $(APP1LIBS) | sed s#$(ROUT)#$(OUT)#g` \
1170 - $(APP_LINKTYPE) $(APP1LIBSALCPPRT) \
1171 - -Wl,--start-group $(APP1STDLIBS) -Wl,--end-group $(APP1STDLIB) \
1172 - $(STDLIB1) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_1.cmd
1173 + $(APP_LINKTYPE) $(APP1LIBSALCPPRT) \
1174 + -Wl,--start-group $(APP1STDLIBS) -Wl,--end-group $(APP1STDLIB) \
1175 + $(STDLIB1) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_1.cmd
1176 + # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
1177 + .IF "$(VERBOSE)" == "TRUE"
1178 @$(TYPE) $(MISC)/$(TARGET).$(@:b)_1.cmd
1179 + .ENDIF
1180 @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
1181 @ls -l $@
1182 .ELSE # "$(COM)" == "GCC"
1183 .IF "$(linkinc)" == ""
1184 - $(APP1LINKER) @$(mktmp \
1185 + $(COMMAND_ECHO)$(APP1LINKER) @$(mktmp \
1186 $(APP1LINKFLAGS) \
1187 $(LINKFLAGSAPP) $(APP1BASEX) \
1188 $(APP1STACKN) \
1189 @@ -172,17 +181,17 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
1190 )
1191 @-echo linking $@.manifest ...
1192 .IF "$(VISTA_MANIFEST)"!=""
1193 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
1194 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
1195 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
1196 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
1197 .ELSE
1198 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
1199 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
1200 .ENDIF # "$(VISTA_MANIFEST)"!=""
1201 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
1202 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
1203 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
1204 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
1205 .ELSE
1206 - -$(RM) $(MISC)\$(APP1TARGET).lnk
1207 - -$(RM) $(MISC)\$(APP1TARGET).lst
1208 - -$(RM) $(MISC)\linkobj.lst
1209 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP1TARGET).lnk
1210 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP1TARGET).lst
1211 + $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
1212 for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
1213 type $(mktmp,$(MISC)\$(APP1TARGET).lst
1214 $(APP1LINKFLAGS) \
1215 @@ -196,16 +205,16 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
1216 $(APP1LIBS) \
1217 $(APP1STDLIBS) \
1218 $(APP1STDLIB) $(STDLIB1))
1219 - $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP1TARGETN:b)_linkobj.lst >> $(MISC)\$(APP1TARGET).lst
1220 - $(IFEXIST) $(MISC)/$(APP1TARGET).lst $(THEN) type $(MISC)/$(APP1TARGET).lst >> $(MISC)/$(APP1TARGET).lnk $(FI)
1221 - $(APP1LINKER) @$(MISC)\$(APP1TARGET).lnk
1222 + $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP1TARGETN:b)_linkobj.lst >> $(MISC)\$(APP1TARGET).lst
1223 + $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP1TARGET).lst $(THEN) type $(MISC)/$(APP1TARGET).lst >> $(MISC)/$(APP1TARGET).lnk $(FI)
1224 + $(COMMAND_ECHO)$(SED)$(APP1LINKER) @$(MISC)\$(APP1TARGET).lnk
1225 .ENDIF # "$(linkinc)" == ""
1226 .ENDIF # "$(COM)" == "GCC"
1227 .IF "$(APP1TARGET)" == "loader"
1228 - $(PERL) loader.pl $@
1229 - $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1230 - $(RM) $@
1231 - $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1232 + $(COMMAND_ECHO)$(PERL) loader.pl $@
1233 + $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1234 + $(COMMAND_ECHO)$(RM) $@
1235 + $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1236 .ENDIF # "$(TARGET)" == "setup"
1237
1238 .ENDIF # "$(GUI)" == "WNT"
1239 @@ -221,13 +230,14 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
1240 @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP1LINKRES:b).rc
1241 @-+echo $(EMQ)#include $(EMQ)"$(APP1VERINFO)$(EMQ)" >> $(MISC)/$(APP1LINKRES:b).rc
1242 .ENDIF # "$(APP1VERINFO)" != ""
1243 - $(RC) -r -DOS2 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc
1244 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc
1245 .ENDIF # "$(APP1LINKRES)" != ""
1246
1247 .IF "$(TARGETTYPE)" == "GUI"
1248 @echo NAME $(APP1TARGET) WINDOWAPI > $(MISC)/$(APP1TARGET).def
1249 .ENDIF
1250
1251 + .IF "$(VERBOSE)" == "TRUE"
1252 @+echo $(APP1LINKFLAGS) \
1253 $(LINKFLAGSAPP) $(APP1BASEX) \
1254 $(APP1STACKN) \
1255 @@ -242,7 +252,8 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
1256 $(APP1LIBS) \
1257 $(APP1STDLIBS:^"-l") \
1258 $(APP1STDLIB:^"-l") $(STDLIB1:^"-l")
1259 - $(APP1LINKER) -v \
1260 + .ENDIF
1261 + $(COMMAND_ECHO)$(APP1LINKER) -v \
1262 $(APP1LINKFLAGS) \
1263 $(LINKFLAGSAPP) $(APP1BASEX) \
1264 $(APP1STACKN) \
1265 @@ -260,10 +271,10 @@ $(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
1266
1267
1268 .IF "$(APP1TARGET)" == "loader"
1269 - +$(PERL) loader.pl $@
1270 - +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1271 - +$(RM) $@
1272 - +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1273 + $(COMMAND_ECHO)+$(PERL) loader.pl $@
1274 + $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1275 + $(COMMAND_ECHO)+$(RM) $@
1276 + $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1277 .ENDIF # "$(TARGET)" == "setup"
1278
1279 .ENDIF # "$(GUI)" == "OS2"
1280 @@ -360,7 +371,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
1281 $(APP2IMP_ORD) \
1282 $(APP2ICON) $(APP2DEPN) $(USE_APP2DEF)
1283 @echo ------------------------------
1284 - @echo Making: $@
1285 + @echo "Making: " $(@:f)
1286 .IF "$(GUI)"=="UNX"
1287 .IF "$(OS)"=="MACOSX"
1288 @echo unx
1289 @@ -374,7 +385,9 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
1290 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
1291 `cat $(MISC)/$(TARGET).$(@:b)_2.cmd` \
1292 >> $(MISC)/$(TARGET).$(@:b)_2.cmd
1293 + .IF "$(VERBOSE)" == "TRUE"
1294 @cat $(MISC)/$(TARGET).$(@:b)_2.cmd
1295 + .ENDIF
1296 @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
1297 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
1298 # libraries at runtime
1299 @@ -384,7 +397,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
1300 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
1301 app $(APP2RPATH) $@
1302 .IF "$(TARGETTYPE)"=="GUI"
1303 - @echo "Making: $@.app"
1304 + @echo "Making: " $(@:f).app
1305 @macosx-create-bundle $@
1306 .ENDIF # "$(TARGETTYPE)"=="GUI"
1307 .ELSE # "$(OS)"=="MACOSX"
1308 @@ -394,9 +407,13 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
1309 $(APP2OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_2.cmd
1310 @cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_2.cmd
1311 @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)/$(TARGET).$(@:b)_2.cmd
1312 - cat $(MISC)/$(TARGET).$(@:b)_2.cmd
1313 + .IF "$(VERBOSE)" == "TRUE"
1314 + @cat $(MISC)/$(TARGET).$(@:b)_2.cmd
1315 + .ENDIF
1316 @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
1317 + .IF "$(VERBOSE)" == "TRUE"
1318 @ls -l $@
1319 + .ENDIF
1320 .ENDIF # "$(OS)"=="MACOSX"
1321 .ENDIF
1322 .IF "$(GUI)" == "WNT"
1323 @@ -410,7 +427,7 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
1324 @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP2LINKRES:b).rc
1325 @-echo $(EMQ)#include $(EMQ)"$(APP2VERINFO)$(EMQ)" >> $(MISC)/$(APP2LINKRES:b).rc
1326 .ENDIF # "$(APP2VERINFO)" != ""
1327 - $(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc
1328 + $(COMMAND_ECHO)$(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc
1329 .ENDIF # "$(APP2LINKRES)" != ""
1330 .IF "$(COM)" == "GCC"
1331 @echo mingw
1332 @@ -418,19 +435,22 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
1333 @cat $(APP2LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) > $(MISC)/$(@:b)_all.res
1334 windres $(MISC)/$(@:b)_all.res $(APP2RESO)
1335 .ENDIF
1336 - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
1337 + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
1338 $(APP2BASEX) $(APP2STACKN) -o $@ $(APP2OBJS) \
1339 -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP2RESO) \
1340 `$(TYPE) /dev/null $(APP2LIBS) | sed s#$(ROUT)#$(OUT)#g` \
1341 - $(APP_LINKTYPE) $(APP2LIBSALCPPRT) \
1342 - -Wl,--start-group $(APP2STDLIBS) -Wl,--end-group $(APP2STDLIB) \
1343 - $(STDLIB2) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_2.cmd
1344 + $(APP_LINKTYPE) $(APP2LIBSALCPPRT) \
1345 + -Wl,--start-group $(APP2STDLIBS) -Wl,--end-group $(APP2STDLIB) \
1346 + $(STDLIB2) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_2.cmd
1347 + # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
1348 + .IF "$(VERBOSE)" == "TRUE"
1349 @$(TYPE) $(MISC)/$(TARGET).$(@:b)_2.cmd
1350 + .ENDIF
1351 @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
1352 @ls -l $@
1353 .ELSE # "$(COM)" == "GCC"
1354 .IF "$(linkinc)" == ""
1355 - $(APP2LINKER) @$(mktmp \
1356 + $(COMMAND_ECHO)$(APP2LINKER) @$(mktmp \
1357 $(APP2LINKFLAGS) \
1358 $(LINKFLAGSAPP) $(APP2BASEX) \
1359 $(APP2STACKN) \
1360 @@ -446,17 +466,17 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
1361 )
1362 @-echo linking $@.manifest ...
1363 .IF "$(VISTA_MANIFEST)"!=""
1364 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
1365 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
1366 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
1367 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
1368 .ELSE
1369 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
1370 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
1371 .ENDIF # "$(VISTA_MANIFEST)"!=""
1372 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
1373 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
1374 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
1375 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
1376 .ELSE
1377 - -$(RM) $(MISC)\$(APP2TARGET).lnk
1378 - -$(RM) $(MISC)\$(APP2TARGET).lst
1379 - -$(RM) $(MISC)\linkobj.lst
1380 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP2TARGET).lnk
1381 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP2TARGET).lst
1382 + $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
1383 for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
1384 type $(mktmp,$(MISC)\$(APP2TARGET).lst
1385 $(APP2LINKFLAGS) \
1386 @@ -470,16 +490,16 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
1387 $(APP2LIBS) \
1388 $(APP2STDLIBS) \
1389 $(APP2STDLIB) $(STDLIB2))
1390 - $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP2TARGETN:b)_linkobj.lst >> $(MISC)\$(APP2TARGET).lst
1391 - $(IFEXIST) $(MISC)/$(APP2TARGET).lst $(THEN) type $(MISC)/$(APP2TARGET).lst >> $(MISC)/$(APP2TARGET).lnk $(FI)
1392 - $(APP2LINKER) @$(MISC)\$(APP2TARGET).lnk
1393 + $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP2TARGETN:b)_linkobj.lst >> $(MISC)\$(APP2TARGET).lst
1394 + $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP2TARGET).lst $(THEN) type $(MISC)/$(APP2TARGET).lst >> $(MISC)/$(APP2TARGET).lnk $(FI)
1395 + $(COMMAND_ECHO)$(SED)$(APP2LINKER) @$(MISC)\$(APP2TARGET).lnk
1396 .ENDIF # "$(linkinc)" == ""
1397 .ENDIF # "$(COM)" == "GCC"
1398 .IF "$(APP2TARGET)" == "loader"
1399 - $(PERL) loader.pl $@
1400 - $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1401 - $(RM) $@
1402 - $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1403 + $(COMMAND_ECHO)$(PERL) loader.pl $@
1404 + $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1405 + $(COMMAND_ECHO)$(RM) $@
1406 + $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1407 .ENDIF # "$(TARGET)" == "setup"
1408
1409 .ENDIF # "$(GUI)" == "WNT"
1410 @@ -495,13 +515,14 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
1411 @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP2LINKRES:b).rc
1412 @-+echo $(EMQ)#include $(EMQ)"$(APP2VERINFO)$(EMQ)" >> $(MISC)/$(APP2LINKRES:b).rc
1413 .ENDIF # "$(APP2VERINFO)" != ""
1414 - $(RC) -r -DOS2 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc
1415 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc
1416 .ENDIF # "$(APP2LINKRES)" != ""
1417
1418 .IF "$(TARGETTYPE)" == "GUI"
1419 @echo NAME $(APP2TARGET) WINDOWAPI > $(MISC)/$(APP2TARGET).def
1420 .ENDIF
1421
1422 + .IF "$(VERBOSE)" == "TRUE"
1423 @+echo $(APP2LINKFLAGS) \
1424 $(LINKFLAGSAPP) $(APP2BASEX) \
1425 $(APP2STACKN) \
1426 @@ -516,7 +537,8 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
1427 $(APP2LIBS) \
1428 $(APP2STDLIBS:^"-l") \
1429 $(APP2STDLIB:^"-l") $(STDLIB2:^"-l")
1430 - $(APP2LINKER) -v \
1431 + .ENDIF
1432 + $(COMMAND_ECHO)$(APP2LINKER) -v \
1433 $(APP2LINKFLAGS) \
1434 $(LINKFLAGSAPP) $(APP2BASEX) \
1435 $(APP2STACKN) \
1436 @@ -534,10 +556,10 @@ $(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
1437
1438
1439 .IF "$(APP2TARGET)" == "loader"
1440 - +$(PERL) loader.pl $@
1441 - +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1442 - +$(RM) $@
1443 - +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1444 + $(COMMAND_ECHO)+$(PERL) loader.pl $@
1445 + $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1446 + $(COMMAND_ECHO)+$(RM) $@
1447 + $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1448 .ENDIF # "$(TARGET)" == "setup"
1449
1450 .ENDIF # "$(GUI)" == "OS2"
1451 @@ -634,7 +656,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
1452 $(APP3IMP_ORD) \
1453 $(APP3ICON) $(APP3DEPN) $(USE_APP3DEF)
1454 @echo ------------------------------
1455 - @echo Making: $@
1456 + @echo "Making: " $(@:f)
1457 .IF "$(GUI)"=="UNX"
1458 .IF "$(OS)"=="MACOSX"
1459 @echo unx
1460 @@ -648,7 +670,9 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
1461 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
1462 `cat $(MISC)/$(TARGET).$(@:b)_3.cmd` \
1463 >> $(MISC)/$(TARGET).$(@:b)_3.cmd
1464 + .IF "$(VERBOSE)" == "TRUE"
1465 @cat $(MISC)/$(TARGET).$(@:b)_3.cmd
1466 + .ENDIF
1467 @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
1468 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
1469 # libraries at runtime
1470 @@ -658,7 +682,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
1471 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
1472 app $(APP3RPATH) $@
1473 .IF "$(TARGETTYPE)"=="GUI"
1474 - @echo "Making: $@.app"
1475 + @echo "Making: " $(@:f).app
1476 @macosx-create-bundle $@
1477 .ENDIF # "$(TARGETTYPE)"=="GUI"
1478 .ELSE # "$(OS)"=="MACOSX"
1479 @@ -668,9 +692,13 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
1480 $(APP3OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_3.cmd
1481 @cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_3.cmd
1482 @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)/$(TARGET).$(@:b)_3.cmd
1483 - cat $(MISC)/$(TARGET).$(@:b)_3.cmd
1484 + .IF "$(VERBOSE)" == "TRUE"
1485 + @cat $(MISC)/$(TARGET).$(@:b)_3.cmd
1486 + .ENDIF
1487 @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
1488 + .IF "$(VERBOSE)" == "TRUE"
1489 @ls -l $@
1490 + .ENDIF
1491 .ENDIF # "$(OS)"=="MACOSX"
1492 .ENDIF
1493 .IF "$(GUI)" == "WNT"
1494 @@ -684,7 +712,7 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
1495 @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP3LINKRES:b).rc
1496 @-echo $(EMQ)#include $(EMQ)"$(APP3VERINFO)$(EMQ)" >> $(MISC)/$(APP3LINKRES:b).rc
1497 .ENDIF # "$(APP3VERINFO)" != ""
1498 - $(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc
1499 + $(COMMAND_ECHO)$(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc
1500 .ENDIF # "$(APP3LINKRES)" != ""
1501 .IF "$(COM)" == "GCC"
1502 @echo mingw
1503 @@ -692,19 +720,22 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
1504 @cat $(APP3LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) > $(MISC)/$(@:b)_all.res
1505 windres $(MISC)/$(@:b)_all.res $(APP3RESO)
1506 .ENDIF
1507 - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
1508 + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
1509 $(APP3BASEX) $(APP3STACKN) -o $@ $(APP3OBJS) \
1510 -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP3RESO) \
1511 `$(TYPE) /dev/null $(APP3LIBS) | sed s#$(ROUT)#$(OUT)#g` \
1512 - $(APP_LINKTYPE) $(APP3LIBSALCPPRT) \
1513 - -Wl,--start-group $(APP3STDLIBS) -Wl,--end-group $(APP3STDLIB) \
1514 - $(STDLIB3) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_3.cmd
1515 + $(APP_LINKTYPE) $(APP3LIBSALCPPRT) \
1516 + -Wl,--start-group $(APP3STDLIBS) -Wl,--end-group $(APP3STDLIB) \
1517 + $(STDLIB3) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_3.cmd
1518 + # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
1519 + .IF "$(VERBOSE)" == "TRUE"
1520 @$(TYPE) $(MISC)/$(TARGET).$(@:b)_3.cmd
1521 + .ENDIF
1522 @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
1523 @ls -l $@
1524 .ELSE # "$(COM)" == "GCC"
1525 .IF "$(linkinc)" == ""
1526 - $(APP3LINKER) @$(mktmp \
1527 + $(COMMAND_ECHO)$(APP3LINKER) @$(mktmp \
1528 $(APP3LINKFLAGS) \
1529 $(LINKFLAGSAPP) $(APP3BASEX) \
1530 $(APP3STACKN) \
1531 @@ -720,17 +751,17 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
1532 )
1533 @-echo linking $@.manifest ...
1534 .IF "$(VISTA_MANIFEST)"!=""
1535 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
1536 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
1537 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
1538 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
1539 .ELSE
1540 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
1541 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
1542 .ENDIF # "$(VISTA_MANIFEST)"!=""
1543 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
1544 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
1545 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
1546 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
1547 .ELSE
1548 - -$(RM) $(MISC)\$(APP3TARGET).lnk
1549 - -$(RM) $(MISC)\$(APP3TARGET).lst
1550 - -$(RM) $(MISC)\linkobj.lst
1551 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP3TARGET).lnk
1552 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP3TARGET).lst
1553 + $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
1554 for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
1555 type $(mktmp,$(MISC)\$(APP3TARGET).lst
1556 $(APP3LINKFLAGS) \
1557 @@ -744,16 +775,16 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
1558 $(APP3LIBS) \
1559 $(APP3STDLIBS) \
1560 $(APP3STDLIB) $(STDLIB3))
1561 - $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP3TARGETN:b)_linkobj.lst >> $(MISC)\$(APP3TARGET).lst
1562 - $(IFEXIST) $(MISC)/$(APP3TARGET).lst $(THEN) type $(MISC)/$(APP3TARGET).lst >> $(MISC)/$(APP3TARGET).lnk $(FI)
1563 - $(APP3LINKER) @$(MISC)\$(APP3TARGET).lnk
1564 + $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP3TARGETN:b)_linkobj.lst >> $(MISC)\$(APP3TARGET).lst
1565 + $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP3TARGET).lst $(THEN) type $(MISC)/$(APP3TARGET).lst >> $(MISC)/$(APP3TARGET).lnk $(FI)
1566 + $(COMMAND_ECHO)$(SED)$(APP3LINKER) @$(MISC)\$(APP3TARGET).lnk
1567 .ENDIF # "$(linkinc)" == ""
1568 .ENDIF # "$(COM)" == "GCC"
1569 .IF "$(APP3TARGET)" == "loader"
1570 - $(PERL) loader.pl $@
1571 - $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1572 - $(RM) $@
1573 - $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1574 + $(COMMAND_ECHO)$(PERL) loader.pl $@
1575 + $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1576 + $(COMMAND_ECHO)$(RM) $@
1577 + $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1578 .ENDIF # "$(TARGET)" == "setup"
1579
1580 .ENDIF # "$(GUI)" == "WNT"
1581 @@ -769,13 +800,14 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
1582 @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP3LINKRES:b).rc
1583 @-+echo $(EMQ)#include $(EMQ)"$(APP3VERINFO)$(EMQ)" >> $(MISC)/$(APP3LINKRES:b).rc
1584 .ENDIF # "$(APP3VERINFO)" != ""
1585 - $(RC) -r -DOS2 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc
1586 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc
1587 .ENDIF # "$(APP3LINKRES)" != ""
1588
1589 .IF "$(TARGETTYPE)" == "GUI"
1590 @echo NAME $(APP3TARGET) WINDOWAPI > $(MISC)/$(APP3TARGET).def
1591 .ENDIF
1592
1593 + .IF "$(VERBOSE)" == "TRUE"
1594 @+echo $(APP3LINKFLAGS) \
1595 $(LINKFLAGSAPP) $(APP3BASEX) \
1596 $(APP3STACKN) \
1597 @@ -790,7 +822,8 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
1598 $(APP3LIBS) \
1599 $(APP3STDLIBS:^"-l") \
1600 $(APP3STDLIB:^"-l") $(STDLIB3:^"-l")
1601 - $(APP3LINKER) -v \
1602 + .ENDIF
1603 + $(COMMAND_ECHO)$(APP3LINKER) -v \
1604 $(APP3LINKFLAGS) \
1605 $(LINKFLAGSAPP) $(APP3BASEX) \
1606 $(APP3STACKN) \
1607 @@ -808,10 +841,10 @@ $(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
1608
1609
1610 .IF "$(APP3TARGET)" == "loader"
1611 - +$(PERL) loader.pl $@
1612 - +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1613 - +$(RM) $@
1614 - +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1615 + $(COMMAND_ECHO)+$(PERL) loader.pl $@
1616 + $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1617 + $(COMMAND_ECHO)+$(RM) $@
1618 + $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1619 .ENDIF # "$(TARGET)" == "setup"
1620
1621 .ENDIF # "$(GUI)" == "OS2"
1622 @@ -908,7 +941,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
1623 $(APP4IMP_ORD) \
1624 $(APP4ICON) $(APP4DEPN) $(USE_APP4DEF)
1625 @echo ------------------------------
1626 - @echo Making: $@
1627 + @echo "Making: " $(@:f)
1628 .IF "$(GUI)"=="UNX"
1629 .IF "$(OS)"=="MACOSX"
1630 @echo unx
1631 @@ -922,7 +955,9 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
1632 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
1633 `cat $(MISC)/$(TARGET).$(@:b)_4.cmd` \
1634 >> $(MISC)/$(TARGET).$(@:b)_4.cmd
1635 + .IF "$(VERBOSE)" == "TRUE"
1636 @cat $(MISC)/$(TARGET).$(@:b)_4.cmd
1637 + .ENDIF
1638 @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
1639 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
1640 # libraries at runtime
1641 @@ -932,7 +967,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
1642 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
1643 app $(APP4RPATH) $@
1644 .IF "$(TARGETTYPE)"=="GUI"
1645 - @echo "Making: $@.app"
1646 + @echo "Making: " $(@:f).app
1647 @macosx-create-bundle $@
1648 .ENDIF # "$(TARGETTYPE)"=="GUI"
1649 .ELSE # "$(OS)"=="MACOSX"
1650 @@ -942,9 +977,13 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
1651 $(APP4OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_4.cmd
1652 @cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_4.cmd
1653 @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)/$(TARGET).$(@:b)_4.cmd
1654 - cat $(MISC)/$(TARGET).$(@:b)_4.cmd
1655 + .IF "$(VERBOSE)" == "TRUE"
1656 + @cat $(MISC)/$(TARGET).$(@:b)_4.cmd
1657 + .ENDIF
1658 @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
1659 + .IF "$(VERBOSE)" == "TRUE"
1660 @ls -l $@
1661 + .ENDIF
1662 .ENDIF # "$(OS)"=="MACOSX"
1663 .ENDIF
1664 .IF "$(GUI)" == "WNT"
1665 @@ -958,7 +997,7 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
1666 @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP4LINKRES:b).rc
1667 @-echo $(EMQ)#include $(EMQ)"$(APP4VERINFO)$(EMQ)" >> $(MISC)/$(APP4LINKRES:b).rc
1668 .ENDIF # "$(APP4VERINFO)" != ""
1669 - $(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc
1670 + $(COMMAND_ECHO)$(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc
1671 .ENDIF # "$(APP4LINKRES)" != ""
1672 .IF "$(COM)" == "GCC"
1673 @echo mingw
1674 @@ -966,19 +1005,22 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
1675 @cat $(APP4LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) > $(MISC)/$(@:b)_all.res
1676 windres $(MISC)/$(@:b)_all.res $(APP4RESO)
1677 .ENDIF
1678 - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
1679 + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
1680 $(APP4BASEX) $(APP4STACKN) -o $@ $(APP4OBJS) \
1681 -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP4RESO) \
1682 `$(TYPE) /dev/null $(APP4LIBS) | sed s#$(ROUT)#$(OUT)#g` \
1683 - $(APP_LINKTYPE) $(APP4LIBSALCPPRT) \
1684 - -Wl,--start-group $(APP4STDLIBS) -Wl,--end-group $(APP4STDLIB) \
1685 - $(STDLIB4) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_4.cmd
1686 + $(APP_LINKTYPE) $(APP4LIBSALCPPRT) \
1687 + -Wl,--start-group $(APP4STDLIBS) -Wl,--end-group $(APP4STDLIB) \
1688 + $(STDLIB4) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_4.cmd
1689 + # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
1690 + .IF "$(VERBOSE)" == "TRUE"
1691 @$(TYPE) $(MISC)/$(TARGET).$(@:b)_4.cmd
1692 + .ENDIF
1693 @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
1694 @ls -l $@
1695 .ELSE # "$(COM)" == "GCC"
1696 .IF "$(linkinc)" == ""
1697 - $(APP4LINKER) @$(mktmp \
1698 + $(COMMAND_ECHO)$(APP4LINKER) @$(mktmp \
1699 $(APP4LINKFLAGS) \
1700 $(LINKFLAGSAPP) $(APP4BASEX) \
1701 $(APP4STACKN) \
1702 @@ -994,17 +1036,17 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
1703 )
1704 @-echo linking $@.manifest ...
1705 .IF "$(VISTA_MANIFEST)"!=""
1706 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
1707 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
1708 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
1709 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
1710 .ELSE
1711 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
1712 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
1713 .ENDIF # "$(VISTA_MANIFEST)"!=""
1714 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
1715 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
1716 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
1717 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
1718 .ELSE
1719 - -$(RM) $(MISC)\$(APP4TARGET).lnk
1720 - -$(RM) $(MISC)\$(APP4TARGET).lst
1721 - -$(RM) $(MISC)\linkobj.lst
1722 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP4TARGET).lnk
1723 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP4TARGET).lst
1724 + $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
1725 for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
1726 type $(mktmp,$(MISC)\$(APP4TARGET).lst
1727 $(APP4LINKFLAGS) \
1728 @@ -1018,16 +1060,16 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
1729 $(APP4LIBS) \
1730 $(APP4STDLIBS) \
1731 $(APP4STDLIB) $(STDLIB4))
1732 - $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP4TARGETN:b)_linkobj.lst >> $(MISC)\$(APP4TARGET).lst
1733 - $(IFEXIST) $(MISC)/$(APP4TARGET).lst $(THEN) type $(MISC)/$(APP4TARGET).lst >> $(MISC)/$(APP4TARGET).lnk $(FI)
1734 - $(APP4LINKER) @$(MISC)\$(APP4TARGET).lnk
1735 + $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP4TARGETN:b)_linkobj.lst >> $(MISC)\$(APP4TARGET).lst
1736 + $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP4TARGET).lst $(THEN) type $(MISC)/$(APP4TARGET).lst >> $(MISC)/$(APP4TARGET).lnk $(FI)
1737 + $(COMMAND_ECHO)$(SED)$(APP4LINKER) @$(MISC)\$(APP4TARGET).lnk
1738 .ENDIF # "$(linkinc)" == ""
1739 .ENDIF # "$(COM)" == "GCC"
1740 .IF "$(APP4TARGET)" == "loader"
1741 - $(PERL) loader.pl $@
1742 - $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1743 - $(RM) $@
1744 - $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1745 + $(COMMAND_ECHO)$(PERL) loader.pl $@
1746 + $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1747 + $(COMMAND_ECHO)$(RM) $@
1748 + $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1749 .ENDIF # "$(TARGET)" == "setup"
1750
1751 .ENDIF # "$(GUI)" == "WNT"
1752 @@ -1043,13 +1085,14 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
1753 @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP4LINKRES:b).rc
1754 @-+echo $(EMQ)#include $(EMQ)"$(APP4VERINFO)$(EMQ)" >> $(MISC)/$(APP4LINKRES:b).rc
1755 .ENDIF # "$(APP4VERINFO)" != ""
1756 - $(RC) -r -DOS2 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc
1757 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc
1758 .ENDIF # "$(APP4LINKRES)" != ""
1759
1760 .IF "$(TARGETTYPE)" == "GUI"
1761 @echo NAME $(APP4TARGET) WINDOWAPI > $(MISC)/$(APP4TARGET).def
1762 .ENDIF
1763
1764 + .IF "$(VERBOSE)" == "TRUE"
1765 @+echo $(APP4LINKFLAGS) \
1766 $(LINKFLAGSAPP) $(APP4BASEX) \
1767 $(APP4STACKN) \
1768 @@ -1064,7 +1107,8 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
1769 $(APP4LIBS) \
1770 $(APP4STDLIBS:^"-l") \
1771 $(APP4STDLIB:^"-l") $(STDLIB4:^"-l")
1772 - $(APP4LINKER) -v \
1773 + .ENDIF
1774 + $(COMMAND_ECHO)$(APP4LINKER) -v \
1775 $(APP4LINKFLAGS) \
1776 $(LINKFLAGSAPP) $(APP4BASEX) \
1777 $(APP4STACKN) \
1778 @@ -1082,10 +1126,10 @@ $(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
1779
1780
1781 .IF "$(APP4TARGET)" == "loader"
1782 - +$(PERL) loader.pl $@
1783 - +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1784 - +$(RM) $@
1785 - +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1786 + $(COMMAND_ECHO)+$(PERL) loader.pl $@
1787 + $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1788 + $(COMMAND_ECHO)+$(RM) $@
1789 + $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1790 .ENDIF # "$(TARGET)" == "setup"
1791
1792 .ENDIF # "$(GUI)" == "OS2"
1793 @@ -1182,7 +1226,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
1794 $(APP5IMP_ORD) \
1795 $(APP5ICON) $(APP5DEPN) $(USE_APP5DEF)
1796 @echo ------------------------------
1797 - @echo Making: $@
1798 + @echo "Making: " $(@:f)
1799 .IF "$(GUI)"=="UNX"
1800 .IF "$(OS)"=="MACOSX"
1801 @echo unx
1802 @@ -1196,7 +1240,9 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
1803 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
1804 `cat $(MISC)/$(TARGET).$(@:b)_5.cmd` \
1805 >> $(MISC)/$(TARGET).$(@:b)_5.cmd
1806 + .IF "$(VERBOSE)" == "TRUE"
1807 @cat $(MISC)/$(TARGET).$(@:b)_5.cmd
1808 + .ENDIF
1809 @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
1810 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
1811 # libraries at runtime
1812 @@ -1206,7 +1252,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
1813 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
1814 app $(APP5RPATH) $@
1815 .IF "$(TARGETTYPE)"=="GUI"
1816 - @echo "Making: $@.app"
1817 + @echo "Making: " $(@:f).app
1818 @macosx-create-bundle $@
1819 .ENDIF # "$(TARGETTYPE)"=="GUI"
1820 .ELSE # "$(OS)"=="MACOSX"
1821 @@ -1216,9 +1262,13 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
1822 $(APP5OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_5.cmd
1823 @cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_5.cmd
1824 @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)/$(TARGET).$(@:b)_5.cmd
1825 - cat $(MISC)/$(TARGET).$(@:b)_5.cmd
1826 + .IF "$(VERBOSE)" == "TRUE"
1827 + @cat $(MISC)/$(TARGET).$(@:b)_5.cmd
1828 + .ENDIF
1829 @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
1830 + .IF "$(VERBOSE)" == "TRUE"
1831 @ls -l $@
1832 + .ENDIF
1833 .ENDIF # "$(OS)"=="MACOSX"
1834 .ENDIF
1835 .IF "$(GUI)" == "WNT"
1836 @@ -1232,7 +1282,7 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
1837 @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP5LINKRES:b).rc
1838 @-echo $(EMQ)#include $(EMQ)"$(APP5VERINFO)$(EMQ)" >> $(MISC)/$(APP5LINKRES:b).rc
1839 .ENDIF # "$(APP5VERINFO)" != ""
1840 - $(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc
1841 + $(COMMAND_ECHO)$(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc
1842 .ENDIF # "$(APP5LINKRES)" != ""
1843 .IF "$(COM)" == "GCC"
1844 @echo mingw
1845 @@ -1240,19 +1290,22 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
1846 @cat $(APP5LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) > $(MISC)/$(@:b)_all.res
1847 windres $(MISC)/$(@:b)_all.res $(APP5RESO)
1848 .ENDIF
1849 - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
1850 + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
1851 $(APP5BASEX) $(APP5STACKN) -o $@ $(APP5OBJS) \
1852 -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP5RESO) \
1853 `$(TYPE) /dev/null $(APP5LIBS) | sed s#$(ROUT)#$(OUT)#g` \
1854 - $(APP_LINKTYPE) $(APP5LIBSALCPPRT) \
1855 - -Wl,--start-group $(APP5STDLIBS) -Wl,--end-group $(APP5STDLIB) \
1856 - $(STDLIB5) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_5.cmd
1857 + $(APP_LINKTYPE) $(APP5LIBSALCPPRT) \
1858 + -Wl,--start-group $(APP5STDLIBS) -Wl,--end-group $(APP5STDLIB) \
1859 + $(STDLIB5) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_5.cmd
1860 + # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
1861 + .IF "$(VERBOSE)" == "TRUE"
1862 @$(TYPE) $(MISC)/$(TARGET).$(@:b)_5.cmd
1863 + .ENDIF
1864 @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
1865 @ls -l $@
1866 .ELSE # "$(COM)" == "GCC"
1867 .IF "$(linkinc)" == ""
1868 - $(APP5LINKER) @$(mktmp \
1869 + $(COMMAND_ECHO)$(APP5LINKER) @$(mktmp \
1870 $(APP5LINKFLAGS) \
1871 $(LINKFLAGSAPP) $(APP5BASEX) \
1872 $(APP5STACKN) \
1873 @@ -1268,17 +1321,17 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
1874 )
1875 @-echo linking $@.manifest ...
1876 .IF "$(VISTA_MANIFEST)"!=""
1877 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
1878 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
1879 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
1880 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
1881 .ELSE
1882 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
1883 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
1884 .ENDIF # "$(VISTA_MANIFEST)"!=""
1885 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
1886 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
1887 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
1888 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
1889 .ELSE
1890 - -$(RM) $(MISC)\$(APP5TARGET).lnk
1891 - -$(RM) $(MISC)\$(APP5TARGET).lst
1892 - -$(RM) $(MISC)\linkobj.lst
1893 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP5TARGET).lnk
1894 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP5TARGET).lst
1895 + $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
1896 for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
1897 type $(mktmp,$(MISC)\$(APP5TARGET).lst
1898 $(APP5LINKFLAGS) \
1899 @@ -1292,16 +1345,16 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
1900 $(APP5LIBS) \
1901 $(APP5STDLIBS) \
1902 $(APP5STDLIB) $(STDLIB5))
1903 - $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP5TARGETN:b)_linkobj.lst >> $(MISC)\$(APP5TARGET).lst
1904 - $(IFEXIST) $(MISC)/$(APP5TARGET).lst $(THEN) type $(MISC)/$(APP5TARGET).lst >> $(MISC)/$(APP5TARGET).lnk $(FI)
1905 - $(APP5LINKER) @$(MISC)\$(APP5TARGET).lnk
1906 + $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP5TARGETN:b)_linkobj.lst >> $(MISC)\$(APP5TARGET).lst
1907 + $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP5TARGET).lst $(THEN) type $(MISC)/$(APP5TARGET).lst >> $(MISC)/$(APP5TARGET).lnk $(FI)
1908 + $(COMMAND_ECHO)$(SED)$(APP5LINKER) @$(MISC)\$(APP5TARGET).lnk
1909 .ENDIF # "$(linkinc)" == ""
1910 .ENDIF # "$(COM)" == "GCC"
1911 .IF "$(APP5TARGET)" == "loader"
1912 - $(PERL) loader.pl $@
1913 - $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1914 - $(RM) $@
1915 - $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1916 + $(COMMAND_ECHO)$(PERL) loader.pl $@
1917 + $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1918 + $(COMMAND_ECHO)$(RM) $@
1919 + $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1920 .ENDIF # "$(TARGET)" == "setup"
1921
1922 .ENDIF # "$(GUI)" == "WNT"
1923 @@ -1317,13 +1370,14 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
1924 @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP5LINKRES:b).rc
1925 @-+echo $(EMQ)#include $(EMQ)"$(APP5VERINFO)$(EMQ)" >> $(MISC)/$(APP5LINKRES:b).rc
1926 .ENDIF # "$(APP5VERINFO)" != ""
1927 - $(RC) -r -DOS2 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc
1928 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc
1929 .ENDIF # "$(APP5LINKRES)" != ""
1930
1931 .IF "$(TARGETTYPE)" == "GUI"
1932 @echo NAME $(APP5TARGET) WINDOWAPI > $(MISC)/$(APP5TARGET).def
1933 .ENDIF
1934
1935 + .IF "$(VERBOSE)" == "TRUE"
1936 @+echo $(APP5LINKFLAGS) \
1937 $(LINKFLAGSAPP) $(APP5BASEX) \
1938 $(APP5STACKN) \
1939 @@ -1338,7 +1392,8 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
1940 $(APP5LIBS) \
1941 $(APP5STDLIBS:^"-l") \
1942 $(APP5STDLIB:^"-l") $(STDLIB5:^"-l")
1943 - $(APP5LINKER) -v \
1944 + .ENDIF
1945 + $(COMMAND_ECHO)$(APP5LINKER) -v \
1946 $(APP5LINKFLAGS) \
1947 $(LINKFLAGSAPP) $(APP5BASEX) \
1948 $(APP5STACKN) \
1949 @@ -1356,10 +1411,10 @@ $(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
1950
1951
1952 .IF "$(APP5TARGET)" == "loader"
1953 - +$(PERL) loader.pl $@
1954 - +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1955 - +$(RM) $@
1956 - +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1957 + $(COMMAND_ECHO)+$(PERL) loader.pl $@
1958 + $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
1959 + $(COMMAND_ECHO)+$(RM) $@
1960 + $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
1961 .ENDIF # "$(TARGET)" == "setup"
1962
1963 .ENDIF # "$(GUI)" == "OS2"
1964 @@ -1456,7 +1511,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
1965 $(APP6IMP_ORD) \
1966 $(APP6ICON) $(APP6DEPN) $(USE_APP6DEF)
1967 @echo ------------------------------
1968 - @echo Making: $@
1969 + @echo "Making: " $(@:f)
1970 .IF "$(GUI)"=="UNX"
1971 .IF "$(OS)"=="MACOSX"
1972 @echo unx
1973 @@ -1470,7 +1525,9 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
1974 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
1975 `cat $(MISC)/$(TARGET).$(@:b)_6.cmd` \
1976 >> $(MISC)/$(TARGET).$(@:b)_6.cmd
1977 + .IF "$(VERBOSE)" == "TRUE"
1978 @cat $(MISC)/$(TARGET).$(@:b)_6.cmd
1979 + .ENDIF
1980 @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
1981 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
1982 # libraries at runtime
1983 @@ -1480,7 +1537,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
1984 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
1985 app $(APP6RPATH) $@
1986 .IF "$(TARGETTYPE)"=="GUI"
1987 - @echo "Making: $@.app"
1988 + @echo "Making: " $(@:f).app
1989 @macosx-create-bundle $@
1990 .ENDIF # "$(TARGETTYPE)"=="GUI"
1991 .ELSE # "$(OS)"=="MACOSX"
1992 @@ -1490,9 +1547,13 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
1993 $(APP6OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_6.cmd
1994 @cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_6.cmd
1995 @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)/$(TARGET).$(@:b)_6.cmd
1996 - cat $(MISC)/$(TARGET).$(@:b)_6.cmd
1997 + .IF "$(VERBOSE)" == "TRUE"
1998 + @cat $(MISC)/$(TARGET).$(@:b)_6.cmd
1999 + .ENDIF
2000 @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
2001 + .IF "$(VERBOSE)" == "TRUE"
2002 @ls -l $@
2003 + .ENDIF
2004 .ENDIF # "$(OS)"=="MACOSX"
2005 .ENDIF
2006 .IF "$(GUI)" == "WNT"
2007 @@ -1506,7 +1567,7 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
2008 @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP6LINKRES:b).rc
2009 @-echo $(EMQ)#include $(EMQ)"$(APP6VERINFO)$(EMQ)" >> $(MISC)/$(APP6LINKRES:b).rc
2010 .ENDIF # "$(APP6VERINFO)" != ""
2011 - $(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc
2012 + $(COMMAND_ECHO)$(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc
2013 .ENDIF # "$(APP6LINKRES)" != ""
2014 .IF "$(COM)" == "GCC"
2015 @echo mingw
2016 @@ -1514,19 +1575,22 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
2017 @cat $(APP6LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) > $(MISC)/$(@:b)_all.res
2018 windres $(MISC)/$(@:b)_all.res $(APP6RESO)
2019 .ENDIF
2020 - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
2021 + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
2022 $(APP6BASEX) $(APP6STACKN) -o $@ $(APP6OBJS) \
2023 -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP6RESO) \
2024 `$(TYPE) /dev/null $(APP6LIBS) | sed s#$(ROUT)#$(OUT)#g` \
2025 - $(APP_LINKTYPE) $(APP6LIBSALCPPRT) \
2026 - -Wl,--start-group $(APP6STDLIBS) -Wl,--end-group $(APP6STDLIB) \
2027 - $(STDLIB6) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_6.cmd
2028 + $(APP_LINKTYPE) $(APP6LIBSALCPPRT) \
2029 + -Wl,--start-group $(APP6STDLIBS) -Wl,--end-group $(APP6STDLIB) \
2030 + $(STDLIB6) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_6.cmd
2031 + # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
2032 + .IF "$(VERBOSE)" == "TRUE"
2033 @$(TYPE) $(MISC)/$(TARGET).$(@:b)_6.cmd
2034 + .ENDIF
2035 @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
2036 @ls -l $@
2037 .ELSE # "$(COM)" == "GCC"
2038 .IF "$(linkinc)" == ""
2039 - $(APP6LINKER) @$(mktmp \
2040 + $(COMMAND_ECHO)$(APP6LINKER) @$(mktmp \
2041 $(APP6LINKFLAGS) \
2042 $(LINKFLAGSAPP) $(APP6BASEX) \
2043 $(APP6STACKN) \
2044 @@ -1542,17 +1606,17 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
2045 )
2046 @-echo linking $@.manifest ...
2047 .IF "$(VISTA_MANIFEST)"!=""
2048 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
2049 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
2050 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
2051 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
2052 .ELSE
2053 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
2054 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
2055 .ENDIF # "$(VISTA_MANIFEST)"!=""
2056 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
2057 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
2058 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
2059 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
2060 .ELSE
2061 - -$(RM) $(MISC)\$(APP6TARGET).lnk
2062 - -$(RM) $(MISC)\$(APP6TARGET).lst
2063 - -$(RM) $(MISC)\linkobj.lst
2064 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP6TARGET).lnk
2065 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP6TARGET).lst
2066 + $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
2067 for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
2068 type $(mktmp,$(MISC)\$(APP6TARGET).lst
2069 $(APP6LINKFLAGS) \
2070 @@ -1566,16 +1630,16 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
2071 $(APP6LIBS) \
2072 $(APP6STDLIBS) \
2073 $(APP6STDLIB) $(STDLIB6))
2074 - $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP6TARGETN:b)_linkobj.lst >> $(MISC)\$(APP6TARGET).lst
2075 - $(IFEXIST) $(MISC)/$(APP6TARGET).lst $(THEN) type $(MISC)/$(APP6TARGET).lst >> $(MISC)/$(APP6TARGET).lnk $(FI)
2076 - $(APP6LINKER) @$(MISC)\$(APP6TARGET).lnk
2077 + $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP6TARGETN:b)_linkobj.lst >> $(MISC)\$(APP6TARGET).lst
2078 + $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP6TARGET).lst $(THEN) type $(MISC)/$(APP6TARGET).lst >> $(MISC)/$(APP6TARGET).lnk $(FI)
2079 + $(COMMAND_ECHO)$(SED)$(APP6LINKER) @$(MISC)\$(APP6TARGET).lnk
2080 .ENDIF # "$(linkinc)" == ""
2081 .ENDIF # "$(COM)" == "GCC"
2082 .IF "$(APP6TARGET)" == "loader"
2083 - $(PERL) loader.pl $@
2084 - $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2085 - $(RM) $@
2086 - $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2087 + $(COMMAND_ECHO)$(PERL) loader.pl $@
2088 + $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2089 + $(COMMAND_ECHO)$(RM) $@
2090 + $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2091 .ENDIF # "$(TARGET)" == "setup"
2092
2093 .ENDIF # "$(GUI)" == "WNT"
2094 @@ -1591,13 +1655,14 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
2095 @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP6LINKRES:b).rc
2096 @-+echo $(EMQ)#include $(EMQ)"$(APP6VERINFO)$(EMQ)" >> $(MISC)/$(APP6LINKRES:b).rc
2097 .ENDIF # "$(APP6VERINFO)" != ""
2098 - $(RC) -r -DOS2 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc
2099 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc
2100 .ENDIF # "$(APP6LINKRES)" != ""
2101
2102 .IF "$(TARGETTYPE)" == "GUI"
2103 @echo NAME $(APP6TARGET) WINDOWAPI > $(MISC)/$(APP6TARGET).def
2104 .ENDIF
2105
2106 + .IF "$(VERBOSE)" == "TRUE"
2107 @+echo $(APP6LINKFLAGS) \
2108 $(LINKFLAGSAPP) $(APP6BASEX) \
2109 $(APP6STACKN) \
2110 @@ -1612,7 +1677,8 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
2111 $(APP6LIBS) \
2112 $(APP6STDLIBS:^"-l") \
2113 $(APP6STDLIB:^"-l") $(STDLIB6:^"-l")
2114 - $(APP6LINKER) -v \
2115 + .ENDIF
2116 + $(COMMAND_ECHO)$(APP6LINKER) -v \
2117 $(APP6LINKFLAGS) \
2118 $(LINKFLAGSAPP) $(APP6BASEX) \
2119 $(APP6STACKN) \
2120 @@ -1630,10 +1696,10 @@ $(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
2121
2122
2123 .IF "$(APP6TARGET)" == "loader"
2124 - +$(PERL) loader.pl $@
2125 - +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2126 - +$(RM) $@
2127 - +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2128 + $(COMMAND_ECHO)+$(PERL) loader.pl $@
2129 + $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2130 + $(COMMAND_ECHO)+$(RM) $@
2131 + $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2132 .ENDIF # "$(TARGET)" == "setup"
2133
2134 .ENDIF # "$(GUI)" == "OS2"
2135 @@ -1730,7 +1796,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
2136 $(APP7IMP_ORD) \
2137 $(APP7ICON) $(APP7DEPN) $(USE_APP7DEF)
2138 @echo ------------------------------
2139 - @echo Making: $@
2140 + @echo "Making: " $(@:f)
2141 .IF "$(GUI)"=="UNX"
2142 .IF "$(OS)"=="MACOSX"
2143 @echo unx
2144 @@ -1744,7 +1810,9 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
2145 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
2146 `cat $(MISC)/$(TARGET).$(@:b)_7.cmd` \
2147 >> $(MISC)/$(TARGET).$(@:b)_7.cmd
2148 + .IF "$(VERBOSE)" == "TRUE"
2149 @cat $(MISC)/$(TARGET).$(@:b)_7.cmd
2150 + .ENDIF
2151 @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
2152 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
2153 # libraries at runtime
2154 @@ -1754,7 +1822,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
2155 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
2156 app $(APP7RPATH) $@
2157 .IF "$(TARGETTYPE)"=="GUI"
2158 - @echo "Making: $@.app"
2159 + @echo "Making: " $(@:f).app
2160 @macosx-create-bundle $@
2161 .ENDIF # "$(TARGETTYPE)"=="GUI"
2162 .ELSE # "$(OS)"=="MACOSX"
2163 @@ -1764,9 +1832,13 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
2164 $(APP7OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_7.cmd
2165 @cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_7.cmd
2166 @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)/$(TARGET).$(@:b)_7.cmd
2167 - cat $(MISC)/$(TARGET).$(@:b)_7.cmd
2168 + .IF "$(VERBOSE)" == "TRUE"
2169 + @cat $(MISC)/$(TARGET).$(@:b)_7.cmd
2170 + .ENDIF
2171 @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
2172 + .IF "$(VERBOSE)" == "TRUE"
2173 @ls -l $@
2174 + .ENDIF
2175 .ENDIF # "$(OS)"=="MACOSX"
2176 .ENDIF
2177 .IF "$(GUI)" == "WNT"
2178 @@ -1780,7 +1852,7 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
2179 @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP7LINKRES:b).rc
2180 @-echo $(EMQ)#include $(EMQ)"$(APP7VERINFO)$(EMQ)" >> $(MISC)/$(APP7LINKRES:b).rc
2181 .ENDIF # "$(APP7VERINFO)" != ""
2182 - $(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc
2183 + $(COMMAND_ECHO)$(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc
2184 .ENDIF # "$(APP7LINKRES)" != ""
2185 .IF "$(COM)" == "GCC"
2186 @echo mingw
2187 @@ -1788,19 +1860,22 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
2188 @cat $(APP7LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) > $(MISC)/$(@:b)_all.res
2189 windres $(MISC)/$(@:b)_all.res $(APP7RESO)
2190 .ENDIF
2191 - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
2192 + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
2193 $(APP7BASEX) $(APP7STACKN) -o $@ $(APP7OBJS) \
2194 -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP7RESO) \
2195 `$(TYPE) /dev/null $(APP7LIBS) | sed s#$(ROUT)#$(OUT)#g` \
2196 - $(APP_LINKTYPE) $(APP7LIBSALCPPRT) \
2197 - -Wl,--start-group $(APP7STDLIBS) -Wl,--end-group $(APP7STDLIB) \
2198 - $(STDLIB7) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_7.cmd
2199 + $(APP_LINKTYPE) $(APP7LIBSALCPPRT) \
2200 + -Wl,--start-group $(APP7STDLIBS) -Wl,--end-group $(APP7STDLIB) \
2201 + $(STDLIB7) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_7.cmd
2202 + # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
2203 + .IF "$(VERBOSE)" == "TRUE"
2204 @$(TYPE) $(MISC)/$(TARGET).$(@:b)_7.cmd
2205 + .ENDIF
2206 @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
2207 @ls -l $@
2208 .ELSE # "$(COM)" == "GCC"
2209 .IF "$(linkinc)" == ""
2210 - $(APP7LINKER) @$(mktmp \
2211 + $(COMMAND_ECHO)$(APP7LINKER) @$(mktmp \
2212 $(APP7LINKFLAGS) \
2213 $(LINKFLAGSAPP) $(APP7BASEX) \
2214 $(APP7STACKN) \
2215 @@ -1816,17 +1891,17 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
2216 )
2217 @-echo linking $@.manifest ...
2218 .IF "$(VISTA_MANIFEST)"!=""
2219 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
2220 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
2221 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
2222 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
2223 .ELSE
2224 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
2225 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
2226 .ENDIF # "$(VISTA_MANIFEST)"!=""
2227 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
2228 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
2229 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
2230 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
2231 .ELSE
2232 - -$(RM) $(MISC)\$(APP7TARGET).lnk
2233 - -$(RM) $(MISC)\$(APP7TARGET).lst
2234 - -$(RM) $(MISC)\linkobj.lst
2235 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP7TARGET).lnk
2236 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP7TARGET).lst
2237 + $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
2238 for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
2239 type $(mktmp,$(MISC)\$(APP7TARGET).lst
2240 $(APP7LINKFLAGS) \
2241 @@ -1840,16 +1915,16 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
2242 $(APP7LIBS) \
2243 $(APP7STDLIBS) \
2244 $(APP7STDLIB) $(STDLIB7))
2245 - $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP7TARGETN:b)_linkobj.lst >> $(MISC)\$(APP7TARGET).lst
2246 - $(IFEXIST) $(MISC)/$(APP7TARGET).lst $(THEN) type $(MISC)/$(APP7TARGET).lst >> $(MISC)/$(APP7TARGET).lnk $(FI)
2247 - $(APP7LINKER) @$(MISC)\$(APP7TARGET).lnk
2248 + $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP7TARGETN:b)_linkobj.lst >> $(MISC)\$(APP7TARGET).lst
2249 + $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP7TARGET).lst $(THEN) type $(MISC)/$(APP7TARGET).lst >> $(MISC)/$(APP7TARGET).lnk $(FI)
2250 + $(COMMAND_ECHO)$(SED)$(APP7LINKER) @$(MISC)\$(APP7TARGET).lnk
2251 .ENDIF # "$(linkinc)" == ""
2252 .ENDIF # "$(COM)" == "GCC"
2253 .IF "$(APP7TARGET)" == "loader"
2254 - $(PERL) loader.pl $@
2255 - $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2256 - $(RM) $@
2257 - $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2258 + $(COMMAND_ECHO)$(PERL) loader.pl $@
2259 + $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2260 + $(COMMAND_ECHO)$(RM) $@
2261 + $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2262 .ENDIF # "$(TARGET)" == "setup"
2263
2264 .ENDIF # "$(GUI)" == "WNT"
2265 @@ -1865,13 +1940,14 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
2266 @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP7LINKRES:b).rc
2267 @-+echo $(EMQ)#include $(EMQ)"$(APP7VERINFO)$(EMQ)" >> $(MISC)/$(APP7LINKRES:b).rc
2268 .ENDIF # "$(APP7VERINFO)" != ""
2269 - $(RC) -r -DOS2 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc
2270 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc
2271 .ENDIF # "$(APP7LINKRES)" != ""
2272
2273 .IF "$(TARGETTYPE)" == "GUI"
2274 @echo NAME $(APP7TARGET) WINDOWAPI > $(MISC)/$(APP7TARGET).def
2275 .ENDIF
2276
2277 + .IF "$(VERBOSE)" == "TRUE"
2278 @+echo $(APP7LINKFLAGS) \
2279 $(LINKFLAGSAPP) $(APP7BASEX) \
2280 $(APP7STACKN) \
2281 @@ -1886,7 +1962,8 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
2282 $(APP7LIBS) \
2283 $(APP7STDLIBS:^"-l") \
2284 $(APP7STDLIB:^"-l") $(STDLIB7:^"-l")
2285 - $(APP7LINKER) -v \
2286 + .ENDIF
2287 + $(COMMAND_ECHO)$(APP7LINKER) -v \
2288 $(APP7LINKFLAGS) \
2289 $(LINKFLAGSAPP) $(APP7BASEX) \
2290 $(APP7STACKN) \
2291 @@ -1904,10 +1981,10 @@ $(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
2292
2293
2294 .IF "$(APP7TARGET)" == "loader"
2295 - +$(PERL) loader.pl $@
2296 - +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2297 - +$(RM) $@
2298 - +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2299 + $(COMMAND_ECHO)+$(PERL) loader.pl $@
2300 + $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2301 + $(COMMAND_ECHO)+$(RM) $@
2302 + $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2303 .ENDIF # "$(TARGET)" == "setup"
2304
2305 .ENDIF # "$(GUI)" == "OS2"
2306 @@ -2004,7 +2081,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
2307 $(APP8IMP_ORD) \
2308 $(APP8ICON) $(APP8DEPN) $(USE_APP8DEF)
2309 @echo ------------------------------
2310 - @echo Making: $@
2311 + @echo "Making: " $(@:f)
2312 .IF "$(GUI)"=="UNX"
2313 .IF "$(OS)"=="MACOSX"
2314 @echo unx
2315 @@ -2018,7 +2095,9 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
2316 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
2317 `cat $(MISC)/$(TARGET).$(@:b)_8.cmd` \
2318 >> $(MISC)/$(TARGET).$(@:b)_8.cmd
2319 + .IF "$(VERBOSE)" == "TRUE"
2320 @cat $(MISC)/$(TARGET).$(@:b)_8.cmd
2321 + .ENDIF
2322 @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
2323 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
2324 # libraries at runtime
2325 @@ -2028,7 +2107,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
2326 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
2327 app $(APP8RPATH) $@
2328 .IF "$(TARGETTYPE)"=="GUI"
2329 - @echo "Making: $@.app"
2330 + @echo "Making: " $(@:f).app
2331 @macosx-create-bundle $@
2332 .ENDIF # "$(TARGETTYPE)"=="GUI"
2333 .ELSE # "$(OS)"=="MACOSX"
2334 @@ -2038,9 +2117,13 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
2335 $(APP8OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_8.cmd
2336 @cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_8.cmd
2337 @echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)/$(TARGET).$(@:b)_8.cmd
2338 - cat $(MISC)/$(TARGET).$(@:b)_8.cmd
2339 + .IF "$(VERBOSE)" == "TRUE"
2340 + @cat $(MISC)/$(TARGET).$(@:b)_8.cmd
2341 + .ENDIF
2342 @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
2343 + .IF "$(VERBOSE)" == "TRUE"
2344 @ls -l $@
2345 + .ENDIF
2346 .ENDIF # "$(OS)"=="MACOSX"
2347 .ENDIF
2348 .IF "$(GUI)" == "WNT"
2349 @@ -2054,7 +2137,7 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
2350 @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP8LINKRES:b).rc
2351 @-echo $(EMQ)#include $(EMQ)"$(APP8VERINFO)$(EMQ)" >> $(MISC)/$(APP8LINKRES:b).rc
2352 .ENDIF # "$(APP8VERINFO)" != ""
2353 - $(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc
2354 + $(COMMAND_ECHO)$(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc
2355 .ENDIF # "$(APP8LINKRES)" != ""
2356 .IF "$(COM)" == "GCC"
2357 @echo mingw
2358 @@ -2062,19 +2145,22 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
2359 @cat $(APP8LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) > $(MISC)/$(@:b)_all.res
2360 windres $(MISC)/$(@:b)_all.res $(APP8RESO)
2361 .ENDIF
2362 - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
2363 + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
2364 $(APP8BASEX) $(APP8STACKN) -o $@ $(APP8OBJS) \
2365 -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP8RESO) \
2366 `$(TYPE) /dev/null $(APP8LIBS) | sed s#$(ROUT)#$(OUT)#g` \
2367 - $(APP_LINKTYPE) $(APP8LIBSALCPPRT) \
2368 - -Wl,--start-group $(APP8STDLIBS) -Wl,--end-group $(APP8STDLIB) \
2369 - $(STDLIB8) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_8.cmd
2370 + $(APP_LINKTYPE) $(APP8LIBSALCPPRT) \
2371 + -Wl,--start-group $(APP8STDLIBS) -Wl,--end-group $(APP8STDLIB) \
2372 + $(STDLIB8) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_8.cmd
2373 + # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
2374 + .IF "$(VERBOSE)" == "TRUE"
2375 @$(TYPE) $(MISC)/$(TARGET).$(@:b)_8.cmd
2376 + .ENDIF
2377 @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
2378 @ls -l $@
2379 .ELSE # "$(COM)" == "GCC"
2380 .IF "$(linkinc)" == ""
2381 - $(APP8LINKER) @$(mktmp \
2382 + $(COMMAND_ECHO)$(APP8LINKER) @$(mktmp \
2383 $(APP8LINKFLAGS) \
2384 $(LINKFLAGSAPP) $(APP8BASEX) \
2385 $(APP8STACKN) \
2386 @@ -2090,17 +2176,17 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
2387 )
2388 @-echo linking $@.manifest ...
2389 .IF "$(VISTA_MANIFEST)"!=""
2390 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
2391 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
2392 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
2393 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
2394 .ELSE
2395 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
2396 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
2397 .ENDIF # "$(VISTA_MANIFEST)"!=""
2398 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
2399 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
2400 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
2401 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
2402 .ELSE
2403 - -$(RM) $(MISC)\$(APP8TARGET).lnk
2404 - -$(RM) $(MISC)\$(APP8TARGET).lst
2405 - -$(RM) $(MISC)\linkobj.lst
2406 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP8TARGET).lnk
2407 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP8TARGET).lst
2408 + $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
2409 for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
2410 type $(mktmp,$(MISC)\$(APP8TARGET).lst
2411 $(APP8LINKFLAGS) \
2412 @@ -2114,16 +2200,16 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
2413 $(APP8LIBS) \
2414 $(APP8STDLIBS) \
2415 $(APP8STDLIB) $(STDLIB8))
2416 - $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP8TARGETN:b)_linkobj.lst >> $(MISC)\$(APP8TARGET).lst
2417 - $(IFEXIST) $(MISC)/$(APP8TARGET).lst $(THEN) type $(MISC)/$(APP8TARGET).lst >> $(MISC)/$(APP8TARGET).lnk $(FI)
2418 - $(APP8LINKER) @$(MISC)\$(APP8TARGET).lnk
2419 + $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP8TARGETN:b)_linkobj.lst >> $(MISC)\$(APP8TARGET).lst
2420 + $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP8TARGET).lst $(THEN) type $(MISC)/$(APP8TARGET).lst >> $(MISC)/$(APP8TARGET).lnk $(FI)
2421 + $(COMMAND_ECHO)$(SED)$(APP8LINKER) @$(MISC)\$(APP8TARGET).lnk
2422 .ENDIF # "$(linkinc)" == ""
2423 .ENDIF # "$(COM)" == "GCC"
2424 .IF "$(APP8TARGET)" == "loader"
2425 - $(PERL) loader.pl $@
2426 - $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2427 - $(RM) $@
2428 - $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2429 + $(COMMAND_ECHO)$(PERL) loader.pl $@
2430 + $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2431 + $(COMMAND_ECHO)$(RM) $@
2432 + $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2433 .ENDIF # "$(TARGET)" == "setup"
2434
2435 .ENDIF # "$(GUI)" == "WNT"
2436 @@ -2139,13 +2225,14 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
2437 @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP8LINKRES:b).rc
2438 @-+echo $(EMQ)#include $(EMQ)"$(APP8VERINFO)$(EMQ)" >> $(MISC)/$(APP8LINKRES:b).rc
2439 .ENDIF # "$(APP8VERINFO)" != ""
2440 - $(RC) -r -DOS2 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc
2441 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc
2442 .ENDIF # "$(APP8LINKRES)" != ""
2443
2444 .IF "$(TARGETTYPE)" == "GUI"
2445 @echo NAME $(APP8TARGET) WINDOWAPI > $(MISC)/$(APP8TARGET).def
2446 .ENDIF
2447
2448 + .IF "$(VERBOSE)" == "TRUE"
2449 @+echo $(APP8LINKFLAGS) \
2450 $(LINKFLAGSAPP) $(APP8BASEX) \
2451 $(APP8STACKN) \
2452 @@ -2160,7 +2247,8 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
2453 $(APP8LIBS) \
2454 $(APP8STDLIBS:^"-l") \
2455 $(APP8STDLIB:^"-l") $(STDLIB8:^"-l")
2456 - $(APP8LINKER) -v \
2457 + .ENDIF
2458 + $(COMMAND_ECHO)$(APP8LINKER) -v \
2459 $(APP8LINKFLAGS) \
2460 $(LINKFLAGSAPP) $(APP8BASEX) \
2461 $(APP8STACKN) \
2462 @@ -2178,10 +2266,10 @@ $(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
2463
2464
2465 .IF "$(APP8TARGET)" == "loader"
2466 - +$(PERL) loader.pl $@
2467 - +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2468 - +$(RM) $@
2469 - +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2470 + $(COMMAND_ECHO)+$(PERL) loader.pl $@
2471 + $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2472 + $(COMMAND_ECHO)+$(RM) $@
2473 + $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2474 .ENDIF # "$(TARGET)" == "setup"
2475
2476 .ENDIF # "$(GUI)" == "OS2"
2477 @@ -2278,7 +2366,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
2478 $(APP9IMP_ORD) \
2479 $(APP9ICON) $(APP9DEPN) $(USE_APP9DEF)
2480 @echo ------------------------------
2481 - @echo Making: $@
2482 + @echo "Making: " $(@:f)
2483 .IF "$(GUI)"=="UNX"
2484 .IF "$(OS)"=="MACOSX"
2485 @echo unx
2486 @@ -2292,7 +2380,9 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
2487 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
2488 `cat $(MISC)/$(TARGET).$(@:b)_9.cmd` \
2489 >> $(MISC)/$(TARGET).$(@:b)_9.cmd
2490 + .IF "$(VERBOSE)" == "TRUE"
2491 @cat $(MISC)/$(TARGET).$(@:b)_9.cmd
2492 + .ENDIF
2493 @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
2494 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
2495 # libraries at runtime
2496 @@ -2302,7 +2392,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
2497 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
2498 app $(APP9RPATH) $@
2499 .IF "$(TARGETTYPE)"=="GUI"
2500 - @echo "Making: $@.app"
2501 + @echo "Making: " $(@:f).app
2502 @macosx-create-bundle $@
2503 .ENDIF # "$(TARGETTYPE)"=="GUI"
2504 .ELSE # "$(OS)"=="MACOSX"
2505 @@ -2312,9 +2402,13 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
2506 $(APP9OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_9.cmd
2507 @cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_9.cmd
2508 @echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)/$(TARGET).$(@:b)_9.cmd
2509 - cat $(MISC)/$(TARGET).$(@:b)_9.cmd
2510 + .IF "$(VERBOSE)" == "TRUE"
2511 + @cat $(MISC)/$(TARGET).$(@:b)_9.cmd
2512 + .ENDIF
2513 @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
2514 + .IF "$(VERBOSE)" == "TRUE"
2515 @ls -l $@
2516 + .ENDIF
2517 .ENDIF # "$(OS)"=="MACOSX"
2518 .ENDIF
2519 .IF "$(GUI)" == "WNT"
2520 @@ -2328,7 +2422,7 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
2521 @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP9LINKRES:b).rc
2522 @-echo $(EMQ)#include $(EMQ)"$(APP9VERINFO)$(EMQ)" >> $(MISC)/$(APP9LINKRES:b).rc
2523 .ENDIF # "$(APP9VERINFO)" != ""
2524 - $(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc
2525 + $(COMMAND_ECHO)$(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc
2526 .ENDIF # "$(APP9LINKRES)" != ""
2527 .IF "$(COM)" == "GCC"
2528 @echo mingw
2529 @@ -2336,19 +2430,22 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
2530 @cat $(APP9LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) > $(MISC)/$(@:b)_all.res
2531 windres $(MISC)/$(@:b)_all.res $(APP9RESO)
2532 .ENDIF
2533 - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
2534 + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
2535 $(APP9BASEX) $(APP9STACKN) -o $@ $(APP9OBJS) \
2536 -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP9RESO) \
2537 `$(TYPE) /dev/null $(APP9LIBS) | sed s#$(ROUT)#$(OUT)#g` \
2538 - $(APP_LINKTYPE) $(APP9LIBSALCPPRT) \
2539 - -Wl,--start-group $(APP9STDLIBS) -Wl,--end-group $(APP9STDLIB) \
2540 - $(STDLIB9) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_9.cmd
2541 + $(APP_LINKTYPE) $(APP9LIBSALCPPRT) \
2542 + -Wl,--start-group $(APP9STDLIBS) -Wl,--end-group $(APP9STDLIB) \
2543 + $(STDLIB9) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_9.cmd
2544 + # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
2545 + .IF "$(VERBOSE)" == "TRUE"
2546 @$(TYPE) $(MISC)/$(TARGET).$(@:b)_9.cmd
2547 + .ENDIF
2548 @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
2549 @ls -l $@
2550 .ELSE # "$(COM)" == "GCC"
2551 .IF "$(linkinc)" == ""
2552 - $(APP9LINKER) @$(mktmp \
2553 + $(COMMAND_ECHO)$(APP9LINKER) @$(mktmp \
2554 $(APP9LINKFLAGS) \
2555 $(LINKFLAGSAPP) $(APP9BASEX) \
2556 $(APP9STACKN) \
2557 @@ -2364,17 +2461,17 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
2558 )
2559 @-echo linking $@.manifest ...
2560 .IF "$(VISTA_MANIFEST)"!=""
2561 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
2562 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
2563 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
2564 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
2565 .ELSE
2566 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
2567 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
2568 .ENDIF # "$(VISTA_MANIFEST)"!=""
2569 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
2570 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
2571 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
2572 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
2573 .ELSE
2574 - -$(RM) $(MISC)\$(APP9TARGET).lnk
2575 - -$(RM) $(MISC)\$(APP9TARGET).lst
2576 - -$(RM) $(MISC)\linkobj.lst
2577 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP9TARGET).lnk
2578 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP9TARGET).lst
2579 + $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
2580 for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
2581 type $(mktmp,$(MISC)\$(APP9TARGET).lst
2582 $(APP9LINKFLAGS) \
2583 @@ -2388,16 +2485,16 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
2584 $(APP9LIBS) \
2585 $(APP9STDLIBS) \
2586 $(APP9STDLIB) $(STDLIB9))
2587 - $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP9TARGETN:b)_linkobj.lst >> $(MISC)\$(APP9TARGET).lst
2588 - $(IFEXIST) $(MISC)/$(APP9TARGET).lst $(THEN) type $(MISC)/$(APP9TARGET).lst >> $(MISC)/$(APP9TARGET).lnk $(FI)
2589 - $(APP9LINKER) @$(MISC)\$(APP9TARGET).lnk
2590 + $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP9TARGETN:b)_linkobj.lst >> $(MISC)\$(APP9TARGET).lst
2591 + $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP9TARGET).lst $(THEN) type $(MISC)/$(APP9TARGET).lst >> $(MISC)/$(APP9TARGET).lnk $(FI)
2592 + $(COMMAND_ECHO)$(SED)$(APP9LINKER) @$(MISC)\$(APP9TARGET).lnk
2593 .ENDIF # "$(linkinc)" == ""
2594 .ENDIF # "$(COM)" == "GCC"
2595 .IF "$(APP9TARGET)" == "loader"
2596 - $(PERL) loader.pl $@
2597 - $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2598 - $(RM) $@
2599 - $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2600 + $(COMMAND_ECHO)$(PERL) loader.pl $@
2601 + $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2602 + $(COMMAND_ECHO)$(RM) $@
2603 + $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2604 .ENDIF # "$(TARGET)" == "setup"
2605
2606 .ENDIF # "$(GUI)" == "WNT"
2607 @@ -2413,13 +2510,14 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
2608 @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP9LINKRES:b).rc
2609 @-+echo $(EMQ)#include $(EMQ)"$(APP9VERINFO)$(EMQ)" >> $(MISC)/$(APP9LINKRES:b).rc
2610 .ENDIF # "$(APP9VERINFO)" != ""
2611 - $(RC) -r -DOS2 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc
2612 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc
2613 .ENDIF # "$(APP9LINKRES)" != ""
2614
2615 .IF "$(TARGETTYPE)" == "GUI"
2616 @echo NAME $(APP9TARGET) WINDOWAPI > $(MISC)/$(APP9TARGET).def
2617 .ENDIF
2618
2619 + .IF "$(VERBOSE)" == "TRUE"
2620 @+echo $(APP9LINKFLAGS) \
2621 $(LINKFLAGSAPP) $(APP9BASEX) \
2622 $(APP9STACKN) \
2623 @@ -2434,7 +2532,8 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
2624 $(APP9LIBS) \
2625 $(APP9STDLIBS:^"-l") \
2626 $(APP9STDLIB:^"-l") $(STDLIB9:^"-l")
2627 - $(APP9LINKER) -v \
2628 + .ENDIF
2629 + $(COMMAND_ECHO)$(APP9LINKER) -v \
2630 $(APP9LINKFLAGS) \
2631 $(LINKFLAGSAPP) $(APP9BASEX) \
2632 $(APP9STACKN) \
2633 @@ -2452,10 +2551,10 @@ $(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
2634
2635
2636 .IF "$(APP9TARGET)" == "loader"
2637 - +$(PERL) loader.pl $@
2638 - +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2639 - +$(RM) $@
2640 - +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2641 + $(COMMAND_ECHO)+$(PERL) loader.pl $@
2642 + $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2643 + $(COMMAND_ECHO)+$(RM) $@
2644 + $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2645 .ENDIF # "$(TARGET)" == "setup"
2646
2647 .ENDIF # "$(GUI)" == "OS2"
2648 @@ -2552,7 +2651,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
2649 $(APP10IMP_ORD) \
2650 $(APP10ICON) $(APP10DEPN) $(USE_APP10DEF)
2651 @echo ------------------------------
2652 - @echo Making: $@
2653 + @echo "Making: " $(@:f)
2654 .IF "$(GUI)"=="UNX"
2655 .IF "$(OS)"=="MACOSX"
2656 @echo unx
2657 @@ -2566,7 +2665,9 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
2658 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
2659 `cat $(MISC)/$(TARGET).$(@:b)_10.cmd` \
2660 >> $(MISC)/$(TARGET).$(@:b)_10.cmd
2661 + .IF "$(VERBOSE)" == "TRUE"
2662 @cat $(MISC)/$(TARGET).$(@:b)_10.cmd
2663 + .ENDIF
2664 @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
2665 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
2666 # libraries at runtime
2667 @@ -2576,7 +2677,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
2668 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
2669 app $(APP10RPATH) $@
2670 .IF "$(TARGETTYPE)"=="GUI"
2671 - @echo "Making: $@.app"
2672 + @echo "Making: " $(@:f).app
2673 @macosx-create-bundle $@
2674 .ENDIF # "$(TARGETTYPE)"=="GUI"
2675 .ELSE # "$(OS)"=="MACOSX"
2676 @@ -2586,9 +2687,13 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
2677 $(APP10OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_10.cmd
2678 @cat $(mktmp /dev/null $(APP10LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_10.cmd
2679 @echo $(APP10LINKTYPEFLAG) $(APP10LIBSALCPPRT) $(APP10STDLIBS) $(APP10STDLIB) $(STDLIB10) -o $@ >> $(MISC)/$(TARGET).$(@:b)_10.cmd
2680 - cat $(MISC)/$(TARGET).$(@:b)_10.cmd
2681 + .IF "$(VERBOSE)" == "TRUE"
2682 + @cat $(MISC)/$(TARGET).$(@:b)_10.cmd
2683 + .ENDIF
2684 @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
2685 + .IF "$(VERBOSE)" == "TRUE"
2686 @ls -l $@
2687 + .ENDIF
2688 .ENDIF # "$(OS)"=="MACOSX"
2689 .ENDIF
2690 .IF "$(GUI)" == "WNT"
2691 @@ -2602,7 +2707,7 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
2692 @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP10LINKRES:b).rc
2693 @-echo $(EMQ)#include $(EMQ)"$(APP10VERINFO)$(EMQ)" >> $(MISC)/$(APP10LINKRES:b).rc
2694 .ENDIF # "$(APP10VERINFO)" != ""
2695 - $(RC) -DWIN32 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc
2696 + $(COMMAND_ECHO)$(RC) -DWIN32 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc
2697 .ENDIF # "$(APP10LINKRES)" != ""
2698 .IF "$(COM)" == "GCC"
2699 @echo mingw
2700 @@ -2610,19 +2715,22 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
2701 @cat $(APP10LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP10RES)) > $(MISC)/$(@:b)_all.res
2702 windres $(MISC)/$(@:b)_all.res $(APP10RESO)
2703 .ENDIF
2704 - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
2705 + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
2706 $(APP10BASEX) $(APP10STACKN) -o $@ $(APP10OBJS) \
2707 -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP10RESO) \
2708 `$(TYPE) /dev/null $(APP10LIBS) | sed s#$(ROUT)#$(OUT)#g` \
2709 - $(APP_LINKTYPE) $(APP10LIBSALCPPRT) \
2710 - -Wl,--start-group $(APP10STDLIBS) -Wl,--end-group $(APP10STDLIB) \
2711 - $(STDLIB10) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_10.cmd
2712 + $(APP_LINKTYPE) $(APP10LIBSALCPPRT) \
2713 + -Wl,--start-group $(APP10STDLIBS) -Wl,--end-group $(APP10STDLIB) \
2714 + $(STDLIB10) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_10.cmd
2715 + # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
2716 + .IF "$(VERBOSE)" == "TRUE"
2717 @$(TYPE) $(MISC)/$(TARGET).$(@:b)_10.cmd
2718 + .ENDIF
2719 @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
2720 @ls -l $@
2721 .ELSE # "$(COM)" == "GCC"
2722 .IF "$(linkinc)" == ""
2723 - $(APP10LINKER) @$(mktmp \
2724 + $(COMMAND_ECHO)$(APP10LINKER) @$(mktmp \
2725 $(APP10LINKFLAGS) \
2726 $(LINKFLAGSAPP) $(APP10BASEX) \
2727 $(APP10STACKN) \
2728 @@ -2638,17 +2746,17 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
2729 )
2730 @-echo linking $@.manifest ...
2731 .IF "$(VISTA_MANIFEST)"!=""
2732 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
2733 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
2734 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
2735 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
2736 .ELSE
2737 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
2738 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
2739 .ENDIF # "$(VISTA_MANIFEST)"!=""
2740 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
2741 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
2742 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
2743 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
2744 .ELSE
2745 - -$(RM) $(MISC)\$(APP10TARGET).lnk
2746 - -$(RM) $(MISC)\$(APP10TARGET).lst
2747 - -$(RM) $(MISC)\linkobj.lst
2748 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP10TARGET).lnk
2749 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP10TARGET).lst
2750 + $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
2751 for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
2752 type $(mktmp,$(MISC)\$(APP10TARGET).lst
2753 $(APP10LINKFLAGS) \
2754 @@ -2662,16 +2770,16 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
2755 $(APP10LIBS) \
2756 $(APP10STDLIBS) \
2757 $(APP10STDLIB) $(STDLIB10))
2758 - $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP10TARGETN:b)_linkobj.lst >> $(MISC)\$(APP10TARGET).lst
2759 - $(IFEXIST) $(MISC)/$(APP10TARGET).lst $(THEN) type $(MISC)/$(APP10TARGET).lst >> $(MISC)/$(APP10TARGET).lnk $(FI)
2760 - $(APP10LINKER) @$(MISC)\$(APP10TARGET).lnk
2761 + $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP10TARGETN:b)_linkobj.lst >> $(MISC)\$(APP10TARGET).lst
2762 + $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP10TARGET).lst $(THEN) type $(MISC)/$(APP10TARGET).lst >> $(MISC)/$(APP10TARGET).lnk $(FI)
2763 + $(COMMAND_ECHO)$(SED)$(APP10LINKER) @$(MISC)\$(APP10TARGET).lnk
2764 .ENDIF # "$(linkinc)" == ""
2765 .ENDIF # "$(COM)" == "GCC"
2766 .IF "$(APP10TARGET)" == "loader"
2767 - $(PERL) loader.pl $@
2768 - $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2769 - $(RM) $@
2770 - $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2771 + $(COMMAND_ECHO)$(PERL) loader.pl $@
2772 + $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2773 + $(COMMAND_ECHO)$(RM) $@
2774 + $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2775 .ENDIF # "$(TARGET)" == "setup"
2776
2777 .ENDIF # "$(GUI)" == "WNT"
2778 @@ -2687,13 +2795,14 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
2779 @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP10LINKRES:b).rc
2780 @-+echo $(EMQ)#include $(EMQ)"$(APP10VERINFO)$(EMQ)" >> $(MISC)/$(APP10LINKRES:b).rc
2781 .ENDIF # "$(APP10VERINFO)" != ""
2782 - $(RC) -r -DOS2 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc
2783 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP10PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP10LINKRES:b).rc
2784 .ENDIF # "$(APP10LINKRES)" != ""
2785
2786 .IF "$(TARGETTYPE)" == "GUI"
2787 @echo NAME $(APP10TARGET) WINDOWAPI > $(MISC)/$(APP10TARGET).def
2788 .ENDIF
2789
2790 + .IF "$(VERBOSE)" == "TRUE"
2791 @+echo $(APP10LINKFLAGS) \
2792 $(LINKFLAGSAPP) $(APP10BASEX) \
2793 $(APP10STACKN) \
2794 @@ -2708,7 +2817,8 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
2795 $(APP10LIBS) \
2796 $(APP10STDLIBS:^"-l") \
2797 $(APP10STDLIB:^"-l") $(STDLIB10:^"-l")
2798 - $(APP10LINKER) -v \
2799 + .ENDIF
2800 + $(COMMAND_ECHO)$(APP10LINKER) -v \
2801 $(APP10LINKFLAGS) \
2802 $(LINKFLAGSAPP) $(APP10BASEX) \
2803 $(APP10STACKN) \
2804 @@ -2726,10 +2836,10 @@ $(APP10TARGETN): $(APP10OBJS) $(APP10LIBS) \
2805
2806
2807 .IF "$(APP10TARGET)" == "loader"
2808 - +$(PERL) loader.pl $@
2809 - +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2810 - +$(RM) $@
2811 - +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2812 + $(COMMAND_ECHO)+$(PERL) loader.pl $@
2813 + $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
2814 + $(COMMAND_ECHO)+$(RM) $@
2815 + $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
2816 .ENDIF # "$(TARGET)" == "setup"
2817
2818 .ENDIF # "$(GUI)" == "OS2"
2819 diff --git solenv/inc/_tg_def.mk solenv/inc/_tg_def.mk
2820 index cae6cd4..aac2ac3 100644
2821 --- solenv/inc/_tg_def.mk
2822 +++ solenv/inc/_tg_def.mk
2823 @@ -20,18 +20,18 @@ $(DEF1EXPORTFILE) : $(SHL1OBJS) $(SHL1LIBS)
2824 .ENDIF # .IF "$(COM)"=="GCC"
2825
2826 $(DEF1EXPORTFILE) : $(SHL1VERSIONMAP)
2827 - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
2828 + $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
2829 .IF "$(COM)"=="GCC"
2830 - -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
2831 - -$(GREP) "\*\|?" $@ > $@.symbols-regexp
2832 + $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
2833 + $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
2834 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
2835 # Extract RTTI symbols from all the objects that will be used to build a shared library
2836 - nm -gP $(SHL1OBJS) \
2837 - `$(TYPE) /dev/null $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
2838 - | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
2839 + $(COMMAND_ECHO)nm -gP $(SHL1OBJS) \
2840 + `$(TYPE) /dev/null $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
2841 + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
2842 # overwrite the map file generate into the local output tree with the generated
2843 # exported symbols list
2844 - $(RENAME) $@.exported-symbols $@
2845 + $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
2846 .ENDIF # .IF "$(COM)"=="GCC"
2847
2848 .ENDIF # "$(GUI)"=="WNT"
2849 @@ -63,8 +63,10 @@ $(DEF1TARGETN) : \
2850 $(DEF1TARGETN) .PHONY :
2851 .ENDIF # "$(link_always)"==""
2852 @-$(RM) $@.tmpfile
2853 +.IF "$(VERBOSE)" == "TRUE"
2854 @echo ------------------------------
2855 - @echo Making Module-Definitionfile : $@
2856 +.ENDIF
2857 + @echo "Making: module definition file" $(@:f)
2858 @echo LIBRARY $(EMQ)"$(SHL1TARGETN:f)$(EMQ)" >$@.tmpfile
2859 .IF "$(COM)"!="GCC"
2860 @echo HEAPSIZE 0 >>$@.tmpfile
2861 @@ -77,16 +79,16 @@ $(DEF1TARGETN) .PHONY :
2862 .IF "$(DEFLIB1NAME)"!=""
2863 .IF "$(COM)"=="GCC"
2864 @-$(RM) $(MISC)/$(SHL1TARGET).exp
2865 - dlltool --output-def $(MISC)/$(SHL1TARGET).exp --export-all-symbols \
2866 + $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL1TARGET).exp --export-all-symbols \
2867 `$(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
2868 - tail --lines +3 $(MISC)/$(SHL1TARGET).exp | sed '/^;/d' >>$@.tmpfile
2869 + $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL1TARGET).exp | sed '/^;/d' >>$@.tmpfile
2870 @-$(RM) $(MISC)/$(SHL1TARGET).exp
2871 .ELSE
2872 .IF "$(SHL1USE_EXPORTS)"==""
2873 @-$(RMHACK1) $(MISC)/$(SHL1TARGET).exp
2874 @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL1TARGET).exp $(SLB)/$(DEFLIB1NAME).lib
2875 @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL1TARGET).flt $(MISC)/$(SHL1TARGET).exp >>$@.tmpfile
2876 - $(RMHACK1) $(MISC)/$(SHL1TARGET).exp
2877 + $(COMMAND_ECHO)$(RMHACK1) $(MISC)/$(SHL1TARGET).exp
2878 .ELSE # "$(SHL1USE_EXPORTS)"==""
2879 @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL1TARGET).direct
2880 @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF1FILTER) $(MISC)/$(SHL1TARGET).direct >>$@.tmpfile
2881 @@ -155,9 +157,9 @@ $(DEF1TARGETN) .PHONY :
2882 .ENDIF
2883 .IF "$(DEF1EXPORTFILE)"!=""
2884 .IF "$(COM)"=="GCC"
2885 - $(TYPE) $(DEF1EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
2886 + $(COMMAND_ECHO)$(TYPE) $(DEF1EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
2887 .ELSE
2888 - $(TYPE) $(DEF1EXPORTFILE) >> $@.tmpfile
2889 + $(COMMAND_ECHO)$(TYPE) $(DEF1EXPORTFILE) >> $@.tmpfile
2890 .ENDIF
2891 .ENDIF
2892 @-$(RM) $@
2893 @@ -181,8 +183,10 @@ $(DEF1TARGETN) : \
2894 $(DEF1TARGETN) .PHONY :
2895 .ENDIF # "$(link_always)"==""
2896 @+-$(RM) $@.tmpfile
2897 +.IF "$(VERBOSE)" == "TRUE"
2898 @echo ------------------------------
2899 - @echo Making Module-Definitionfile : $@
2900 +.ENDIF
2901 + @echo "Making: module definition file" $(@:f)
2902 @echo LIBRARY $(SHL1TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
2903 @echo DATA MULTIPLE >>$@.tmpfile
2904 @echo DESCRIPTION 'StarView 3.00 $(DEF1DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
2905 @@ -263,11 +267,11 @@ $(DEF1TARGETN) .PHONY :
2906 @sort < $@.tmp_ord | uniq > $@.exptmpfile
2907 @fix_def_ord < $@.exptmpfile >> $@.tmpfile
2908 @+-$(RM) $@
2909 - +$(RENAME) $@.tmpfile $@
2910 + $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
2911 @+-$(RM) $@.tmp_ord
2912 @+-$(RM) $@.exptmpfile
2913 - +$(IMPLIB) $(IMPLIBFLAGS) $(SHL1IMPLIBN:s/.lib/.a/) $@
2914 - +emxomf -o $(SHL1IMPLIBN) $(SHL1IMPLIBN:s/.lib/.a/)
2915 + $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL1IMPLIBN:s/.lib/.a/) $@
2916 + $(COMMAND_ECHO)+emxomf -o $(SHL1IMPLIBN) $(SHL1IMPLIBN:s/.lib/.a/)
2917
2918 .ENDIF # "$(GUI)"=="OS2"
2919
2920 @@ -303,18 +307,18 @@ $(DEF2EXPORTFILE) : $(SHL2OBJS) $(SHL2LIBS)
2921 .ENDIF # .IF "$(COM)"=="GCC"
2922
2923 $(DEF2EXPORTFILE) : $(SHL2VERSIONMAP)
2924 - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
2925 + $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
2926 .IF "$(COM)"=="GCC"
2927 - -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
2928 - -$(GREP) "\*\|?" $@ > $@.symbols-regexp
2929 + $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
2930 + $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
2931 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
2932 # Extract RTTI symbols from all the objects that will be used to build a shared library
2933 - nm -gP $(SHL2OBJS) \
2934 - `$(TYPE) /dev/null $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
2935 - | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
2936 + $(COMMAND_ECHO)nm -gP $(SHL2OBJS) \
2937 + `$(TYPE) /dev/null $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
2938 + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
2939 # overwrite the map file generate into the local output tree with the generated
2940 # exported symbols list
2941 - $(RENAME) $@.exported-symbols $@
2942 + $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
2943 .ENDIF # .IF "$(COM)"=="GCC"
2944
2945 .ENDIF # "$(GUI)"=="WNT"
2946 @@ -346,8 +350,10 @@ $(DEF2TARGETN) : \
2947 $(DEF2TARGETN) .PHONY :
2948 .ENDIF # "$(link_always)"==""
2949 @-$(RM) $@.tmpfile
2950 +.IF "$(VERBOSE)" == "TRUE"
2951 @echo ------------------------------
2952 - @echo Making Module-Definitionfile : $@
2953 +.ENDIF
2954 + @echo "Making: module definition file" $(@:f)
2955 @echo LIBRARY $(EMQ)"$(SHL2TARGETN:f)$(EMQ)" >$@.tmpfile
2956 .IF "$(COM)"!="GCC"
2957 @echo HEAPSIZE 0 >>$@.tmpfile
2958 @@ -360,16 +366,16 @@ $(DEF2TARGETN) .PHONY :
2959 .IF "$(DEFLIB2NAME)"!=""
2960 .IF "$(COM)"=="GCC"
2961 @-$(RM) $(MISC)/$(SHL2TARGET).exp
2962 - dlltool --output-def $(MISC)/$(SHL2TARGET).exp --export-all-symbols \
2963 + $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL2TARGET).exp --export-all-symbols \
2964 `$(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
2965 - tail --lines +3 $(MISC)/$(SHL2TARGET).exp | sed '/^;/d' >>$@.tmpfile
2966 + $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL2TARGET).exp | sed '/^;/d' >>$@.tmpfile
2967 @-$(RM) $(MISC)/$(SHL2TARGET).exp
2968 .ELSE
2969 .IF "$(SHL2USE_EXPORTS)"==""
2970 @-$(RMHACK2) $(MISC)/$(SHL2TARGET).exp
2971 @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL2TARGET).exp $(SLB)/$(DEFLIB2NAME).lib
2972 @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL2TARGET).flt $(MISC)/$(SHL2TARGET).exp >>$@.tmpfile
2973 - $(RMHACK2) $(MISC)/$(SHL2TARGET).exp
2974 + $(COMMAND_ECHO)$(RMHACK2) $(MISC)/$(SHL2TARGET).exp
2975 .ELSE # "$(SHL2USE_EXPORTS)"==""
2976 @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL2TARGET).direct
2977 @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF2FILTER) $(MISC)/$(SHL2TARGET).direct >>$@.tmpfile
2978 @@ -438,9 +444,9 @@ $(DEF2TARGETN) .PHONY :
2979 .ENDIF
2980 .IF "$(DEF2EXPORTFILE)"!=""
2981 .IF "$(COM)"=="GCC"
2982 - $(TYPE) $(DEF2EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
2983 + $(COMMAND_ECHO)$(TYPE) $(DEF2EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
2984 .ELSE
2985 - $(TYPE) $(DEF2EXPORTFILE) >> $@.tmpfile
2986 + $(COMMAND_ECHO)$(TYPE) $(DEF2EXPORTFILE) >> $@.tmpfile
2987 .ENDIF
2988 .ENDIF
2989 @-$(RM) $@
2990 @@ -464,8 +470,10 @@ $(DEF2TARGETN) : \
2991 $(DEF2TARGETN) .PHONY :
2992 .ENDIF # "$(link_always)"==""
2993 @+-$(RM) $@.tmpfile
2994 +.IF "$(VERBOSE)" == "TRUE"
2995 @echo ------------------------------
2996 - @echo Making Module-Definitionfile : $@
2997 +.ENDIF
2998 + @echo "Making: module definition file" $(@:f)
2999 @echo LIBRARY $(SHL2TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
3000 @echo DATA MULTIPLE >>$@.tmpfile
3001 @echo DESCRIPTION 'StarView 3.00 $(DEF2DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
3002 @@ -546,11 +554,11 @@ $(DEF2TARGETN) .PHONY :
3003 @sort < $@.tmp_ord | uniq > $@.exptmpfile
3004 @fix_def_ord < $@.exptmpfile >> $@.tmpfile
3005 @+-$(RM) $@
3006 - +$(RENAME) $@.tmpfile $@
3007 + $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
3008 @+-$(RM) $@.tmp_ord
3009 @+-$(RM) $@.exptmpfile
3010 - +$(IMPLIB) $(IMPLIBFLAGS) $(SHL2IMPLIBN:s/.lib/.a/) $@
3011 - +emxomf -o $(SHL2IMPLIBN) $(SHL2IMPLIBN:s/.lib/.a/)
3012 + $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL2IMPLIBN:s/.lib/.a/) $@
3013 + $(COMMAND_ECHO)+emxomf -o $(SHL2IMPLIBN) $(SHL2IMPLIBN:s/.lib/.a/)
3014
3015 .ENDIF # "$(GUI)"=="OS2"
3016
3017 @@ -586,18 +594,18 @@ $(DEF3EXPORTFILE) : $(SHL3OBJS) $(SHL3LIBS)
3018 .ENDIF # .IF "$(COM)"=="GCC"
3019
3020 $(DEF3EXPORTFILE) : $(SHL3VERSIONMAP)
3021 - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3022 + $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3023 .IF "$(COM)"=="GCC"
3024 - -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3025 - -$(GREP) "\*\|?" $@ > $@.symbols-regexp
3026 + $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3027 + $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
3028 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
3029 # Extract RTTI symbols from all the objects that will be used to build a shared library
3030 - nm -gP $(SHL3OBJS) \
3031 - `$(TYPE) /dev/null $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3032 - | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3033 + $(COMMAND_ECHO)nm -gP $(SHL3OBJS) \
3034 + `$(TYPE) /dev/null $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3035 + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3036 # overwrite the map file generate into the local output tree with the generated
3037 # exported symbols list
3038 - $(RENAME) $@.exported-symbols $@
3039 + $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
3040 .ENDIF # .IF "$(COM)"=="GCC"
3041
3042 .ENDIF # "$(GUI)"=="WNT"
3043 @@ -629,8 +637,10 @@ $(DEF3TARGETN) : \
3044 $(DEF3TARGETN) .PHONY :
3045 .ENDIF # "$(link_always)"==""
3046 @-$(RM) $@.tmpfile
3047 +.IF "$(VERBOSE)" == "TRUE"
3048 @echo ------------------------------
3049 - @echo Making Module-Definitionfile : $@
3050 +.ENDIF
3051 + @echo "Making: module definition file" $(@:f)
3052 @echo LIBRARY $(EMQ)"$(SHL3TARGETN:f)$(EMQ)" >$@.tmpfile
3053 .IF "$(COM)"!="GCC"
3054 @echo HEAPSIZE 0 >>$@.tmpfile
3055 @@ -643,16 +653,16 @@ $(DEF3TARGETN) .PHONY :
3056 .IF "$(DEFLIB3NAME)"!=""
3057 .IF "$(COM)"=="GCC"
3058 @-$(RM) $(MISC)/$(SHL3TARGET).exp
3059 - dlltool --output-def $(MISC)/$(SHL3TARGET).exp --export-all-symbols \
3060 + $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL3TARGET).exp --export-all-symbols \
3061 `$(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
3062 - tail --lines +3 $(MISC)/$(SHL3TARGET).exp | sed '/^;/d' >>$@.tmpfile
3063 + $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL3TARGET).exp | sed '/^;/d' >>$@.tmpfile
3064 @-$(RM) $(MISC)/$(SHL3TARGET).exp
3065 .ELSE
3066 .IF "$(SHL3USE_EXPORTS)"==""
3067 @-$(RMHACK3) $(MISC)/$(SHL3TARGET).exp
3068 @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL3TARGET).exp $(SLB)/$(DEFLIB3NAME).lib
3069 @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL3TARGET).flt $(MISC)/$(SHL3TARGET).exp >>$@.tmpfile
3070 - $(RMHACK3) $(MISC)/$(SHL3TARGET).exp
3071 + $(COMMAND_ECHO)$(RMHACK3) $(MISC)/$(SHL3TARGET).exp
3072 .ELSE # "$(SHL3USE_EXPORTS)"==""
3073 @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL3TARGET).direct
3074 @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF3FILTER) $(MISC)/$(SHL3TARGET).direct >>$@.tmpfile
3075 @@ -721,9 +731,9 @@ $(DEF3TARGETN) .PHONY :
3076 .ENDIF
3077 .IF "$(DEF3EXPORTFILE)"!=""
3078 .IF "$(COM)"=="GCC"
3079 - $(TYPE) $(DEF3EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3080 + $(COMMAND_ECHO)$(TYPE) $(DEF3EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3081 .ELSE
3082 - $(TYPE) $(DEF3EXPORTFILE) >> $@.tmpfile
3083 + $(COMMAND_ECHO)$(TYPE) $(DEF3EXPORTFILE) >> $@.tmpfile
3084 .ENDIF
3085 .ENDIF
3086 @-$(RM) $@
3087 @@ -747,8 +757,10 @@ $(DEF3TARGETN) : \
3088 $(DEF3TARGETN) .PHONY :
3089 .ENDIF # "$(link_always)"==""
3090 @+-$(RM) $@.tmpfile
3091 +.IF "$(VERBOSE)" == "TRUE"
3092 @echo ------------------------------
3093 - @echo Making Module-Definitionfile : $@
3094 +.ENDIF
3095 + @echo "Making: module definition file" $(@:f)
3096 @echo LIBRARY $(SHL3TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
3097 @echo DATA MULTIPLE >>$@.tmpfile
3098 @echo DESCRIPTION 'StarView 3.00 $(DEF3DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
3099 @@ -829,11 +841,11 @@ $(DEF3TARGETN) .PHONY :
3100 @sort < $@.tmp_ord | uniq > $@.exptmpfile
3101 @fix_def_ord < $@.exptmpfile >> $@.tmpfile
3102 @+-$(RM) $@
3103 - +$(RENAME) $@.tmpfile $@
3104 + $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
3105 @+-$(RM) $@.tmp_ord
3106 @+-$(RM) $@.exptmpfile
3107 - +$(IMPLIB) $(IMPLIBFLAGS) $(SHL3IMPLIBN:s/.lib/.a/) $@
3108 - +emxomf -o $(SHL3IMPLIBN) $(SHL3IMPLIBN:s/.lib/.a/)
3109 + $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL3IMPLIBN:s/.lib/.a/) $@
3110 + $(COMMAND_ECHO)+emxomf -o $(SHL3IMPLIBN) $(SHL3IMPLIBN:s/.lib/.a/)
3111
3112 .ENDIF # "$(GUI)"=="OS2"
3113
3114 @@ -869,18 +881,18 @@ $(DEF4EXPORTFILE) : $(SHL4OBJS) $(SHL4LIBS)
3115 .ENDIF # .IF "$(COM)"=="GCC"
3116
3117 $(DEF4EXPORTFILE) : $(SHL4VERSIONMAP)
3118 - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3119 + $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3120 .IF "$(COM)"=="GCC"
3121 - -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3122 - -$(GREP) "\*\|?" $@ > $@.symbols-regexp
3123 + $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3124 + $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
3125 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
3126 # Extract RTTI symbols from all the objects that will be used to build a shared library
3127 - nm -gP $(SHL4OBJS) \
3128 - `$(TYPE) /dev/null $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3129 - | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3130 + $(COMMAND_ECHO)nm -gP $(SHL4OBJS) \
3131 + `$(TYPE) /dev/null $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3132 + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3133 # overwrite the map file generate into the local output tree with the generated
3134 # exported symbols list
3135 - $(RENAME) $@.exported-symbols $@
3136 + $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
3137 .ENDIF # .IF "$(COM)"=="GCC"
3138
3139 .ENDIF # "$(GUI)"=="WNT"
3140 @@ -912,8 +924,10 @@ $(DEF4TARGETN) : \
3141 $(DEF4TARGETN) .PHONY :
3142 .ENDIF # "$(link_always)"==""
3143 @-$(RM) $@.tmpfile
3144 +.IF "$(VERBOSE)" == "TRUE"
3145 @echo ------------------------------
3146 - @echo Making Module-Definitionfile : $@
3147 +.ENDIF
3148 + @echo "Making: module definition file" $(@:f)
3149 @echo LIBRARY $(EMQ)"$(SHL4TARGETN:f)$(EMQ)" >$@.tmpfile
3150 .IF "$(COM)"!="GCC"
3151 @echo HEAPSIZE 0 >>$@.tmpfile
3152 @@ -926,16 +940,16 @@ $(DEF4TARGETN) .PHONY :
3153 .IF "$(DEFLIB4NAME)"!=""
3154 .IF "$(COM)"=="GCC"
3155 @-$(RM) $(MISC)/$(SHL4TARGET).exp
3156 - dlltool --output-def $(MISC)/$(SHL4TARGET).exp --export-all-symbols \
3157 + $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL4TARGET).exp --export-all-symbols \
3158 `$(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
3159 - tail --lines +3 $(MISC)/$(SHL4TARGET).exp | sed '/^;/d' >>$@.tmpfile
3160 + $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL4TARGET).exp | sed '/^;/d' >>$@.tmpfile
3161 @-$(RM) $(MISC)/$(SHL4TARGET).exp
3162 .ELSE
3163 .IF "$(SHL4USE_EXPORTS)"==""
3164 @-$(RMHACK4) $(MISC)/$(SHL4TARGET).exp
3165 @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL4TARGET).exp $(SLB)/$(DEFLIB4NAME).lib
3166 @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL4TARGET).flt $(MISC)/$(SHL4TARGET).exp >>$@.tmpfile
3167 - $(RMHACK4) $(MISC)/$(SHL4TARGET).exp
3168 + $(COMMAND_ECHO)$(RMHACK4) $(MISC)/$(SHL4TARGET).exp
3169 .ELSE # "$(SHL4USE_EXPORTS)"==""
3170 @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL4TARGET).direct
3171 @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF4FILTER) $(MISC)/$(SHL4TARGET).direct >>$@.tmpfile
3172 @@ -1004,9 +1018,9 @@ $(DEF4TARGETN) .PHONY :
3173 .ENDIF
3174 .IF "$(DEF4EXPORTFILE)"!=""
3175 .IF "$(COM)"=="GCC"
3176 - $(TYPE) $(DEF4EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3177 + $(COMMAND_ECHO)$(TYPE) $(DEF4EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3178 .ELSE
3179 - $(TYPE) $(DEF4EXPORTFILE) >> $@.tmpfile
3180 + $(COMMAND_ECHO)$(TYPE) $(DEF4EXPORTFILE) >> $@.tmpfile
3181 .ENDIF
3182 .ENDIF
3183 @-$(RM) $@
3184 @@ -1030,8 +1044,10 @@ $(DEF4TARGETN) : \
3185 $(DEF4TARGETN) .PHONY :
3186 .ENDIF # "$(link_always)"==""
3187 @+-$(RM) $@.tmpfile
3188 +.IF "$(VERBOSE)" == "TRUE"
3189 @echo ------------------------------
3190 - @echo Making Module-Definitionfile : $@
3191 +.ENDIF
3192 + @echo "Making: module definition file" $(@:f)
3193 @echo LIBRARY $(SHL4TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
3194 @echo DATA MULTIPLE >>$@.tmpfile
3195 @echo DESCRIPTION 'StarView 3.00 $(DEF4DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
3196 @@ -1112,11 +1128,11 @@ $(DEF4TARGETN) .PHONY :
3197 @sort < $@.tmp_ord | uniq > $@.exptmpfile
3198 @fix_def_ord < $@.exptmpfile >> $@.tmpfile
3199 @+-$(RM) $@
3200 - +$(RENAME) $@.tmpfile $@
3201 + $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
3202 @+-$(RM) $@.tmp_ord
3203 @+-$(RM) $@.exptmpfile
3204 - +$(IMPLIB) $(IMPLIBFLAGS) $(SHL4IMPLIBN:s/.lib/.a/) $@
3205 - +emxomf -o $(SHL4IMPLIBN) $(SHL4IMPLIBN:s/.lib/.a/)
3206 + $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL4IMPLIBN:s/.lib/.a/) $@
3207 + $(COMMAND_ECHO)+emxomf -o $(SHL4IMPLIBN) $(SHL4IMPLIBN:s/.lib/.a/)
3208
3209 .ENDIF # "$(GUI)"=="OS2"
3210
3211 @@ -1152,18 +1168,18 @@ $(DEF5EXPORTFILE) : $(SHL5OBJS) $(SHL5LIBS)
3212 .ENDIF # .IF "$(COM)"=="GCC"
3213
3214 $(DEF5EXPORTFILE) : $(SHL5VERSIONMAP)
3215 - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3216 + $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3217 .IF "$(COM)"=="GCC"
3218 - -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3219 - -$(GREP) "\*\|?" $@ > $@.symbols-regexp
3220 + $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3221 + $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
3222 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
3223 # Extract RTTI symbols from all the objects that will be used to build a shared library
3224 - nm -gP $(SHL5OBJS) \
3225 - `$(TYPE) /dev/null $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3226 - | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3227 + $(COMMAND_ECHO)nm -gP $(SHL5OBJS) \
3228 + `$(TYPE) /dev/null $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3229 + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3230 # overwrite the map file generate into the local output tree with the generated
3231 # exported symbols list
3232 - $(RENAME) $@.exported-symbols $@
3233 + $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
3234 .ENDIF # .IF "$(COM)"=="GCC"
3235
3236 .ENDIF # "$(GUI)"=="WNT"
3237 @@ -1195,8 +1211,10 @@ $(DEF5TARGETN) : \
3238 $(DEF5TARGETN) .PHONY :
3239 .ENDIF # "$(link_always)"==""
3240 @-$(RM) $@.tmpfile
3241 +.IF "$(VERBOSE)" == "TRUE"
3242 @echo ------------------------------
3243 - @echo Making Module-Definitionfile : $@
3244 +.ENDIF
3245 + @echo "Making: module definition file" $(@:f)
3246 @echo LIBRARY $(EMQ)"$(SHL5TARGETN:f)$(EMQ)" >$@.tmpfile
3247 .IF "$(COM)"!="GCC"
3248 @echo HEAPSIZE 0 >>$@.tmpfile
3249 @@ -1209,16 +1227,16 @@ $(DEF5TARGETN) .PHONY :
3250 .IF "$(DEFLIB5NAME)"!=""
3251 .IF "$(COM)"=="GCC"
3252 @-$(RM) $(MISC)/$(SHL5TARGET).exp
3253 - dlltool --output-def $(MISC)/$(SHL5TARGET).exp --export-all-symbols \
3254 + $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL5TARGET).exp --export-all-symbols \
3255 `$(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
3256 - tail --lines +3 $(MISC)/$(SHL5TARGET).exp | sed '/^;/d' >>$@.tmpfile
3257 + $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL5TARGET).exp | sed '/^;/d' >>$@.tmpfile
3258 @-$(RM) $(MISC)/$(SHL5TARGET).exp
3259 .ELSE
3260 .IF "$(SHL5USE_EXPORTS)"==""
3261 @-$(RMHACK5) $(MISC)/$(SHL5TARGET).exp
3262 @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL5TARGET).exp $(SLB)/$(DEFLIB5NAME).lib
3263 @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL5TARGET).flt $(MISC)/$(SHL5TARGET).exp >>$@.tmpfile
3264 - $(RMHACK5) $(MISC)/$(SHL5TARGET).exp
3265 + $(COMMAND_ECHO)$(RMHACK5) $(MISC)/$(SHL5TARGET).exp
3266 .ELSE # "$(SHL5USE_EXPORTS)"==""
3267 @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL5TARGET).direct
3268 @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF5FILTER) $(MISC)/$(SHL5TARGET).direct >>$@.tmpfile
3269 @@ -1287,9 +1305,9 @@ $(DEF5TARGETN) .PHONY :
3270 .ENDIF
3271 .IF "$(DEF5EXPORTFILE)"!=""
3272 .IF "$(COM)"=="GCC"
3273 - $(TYPE) $(DEF5EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3274 + $(COMMAND_ECHO)$(TYPE) $(DEF5EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3275 .ELSE
3276 - $(TYPE) $(DEF5EXPORTFILE) >> $@.tmpfile
3277 + $(COMMAND_ECHO)$(TYPE) $(DEF5EXPORTFILE) >> $@.tmpfile
3278 .ENDIF
3279 .ENDIF
3280 @-$(RM) $@
3281 @@ -1313,8 +1331,10 @@ $(DEF5TARGETN) : \
3282 $(DEF5TARGETN) .PHONY :
3283 .ENDIF # "$(link_always)"==""
3284 @+-$(RM) $@.tmpfile
3285 +.IF "$(VERBOSE)" == "TRUE"
3286 @echo ------------------------------
3287 - @echo Making Module-Definitionfile : $@
3288 +.ENDIF
3289 + @echo "Making: module definition file" $(@:f)
3290 @echo LIBRARY $(SHL5TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
3291 @echo DATA MULTIPLE >>$@.tmpfile
3292 @echo DESCRIPTION 'StarView 3.00 $(DEF5DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
3293 @@ -1395,11 +1415,11 @@ $(DEF5TARGETN) .PHONY :
3294 @sort < $@.tmp_ord | uniq > $@.exptmpfile
3295 @fix_def_ord < $@.exptmpfile >> $@.tmpfile
3296 @+-$(RM) $@
3297 - +$(RENAME) $@.tmpfile $@
3298 + $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
3299 @+-$(RM) $@.tmp_ord
3300 @+-$(RM) $@.exptmpfile
3301 - +$(IMPLIB) $(IMPLIBFLAGS) $(SHL5IMPLIBN:s/.lib/.a/) $@
3302 - +emxomf -o $(SHL5IMPLIBN) $(SHL5IMPLIBN:s/.lib/.a/)
3303 + $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL5IMPLIBN:s/.lib/.a/) $@
3304 + $(COMMAND_ECHO)+emxomf -o $(SHL5IMPLIBN) $(SHL5IMPLIBN:s/.lib/.a/)
3305
3306 .ENDIF # "$(GUI)"=="OS2"
3307
3308 @@ -1435,18 +1455,18 @@ $(DEF6EXPORTFILE) : $(SHL6OBJS) $(SHL6LIBS)
3309 .ENDIF # .IF "$(COM)"=="GCC"
3310
3311 $(DEF6EXPORTFILE) : $(SHL6VERSIONMAP)
3312 - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3313 + $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3314 .IF "$(COM)"=="GCC"
3315 - -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3316 - -$(GREP) "\*\|?" $@ > $@.symbols-regexp
3317 + $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3318 + $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
3319 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
3320 # Extract RTTI symbols from all the objects that will be used to build a shared library
3321 - nm -gP $(SHL6OBJS) \
3322 - `$(TYPE) /dev/null $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3323 - | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3324 + $(COMMAND_ECHO)nm -gP $(SHL6OBJS) \
3325 + `$(TYPE) /dev/null $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3326 + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3327 # overwrite the map file generate into the local output tree with the generated
3328 # exported symbols list
3329 - $(RENAME) $@.exported-symbols $@
3330 + $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
3331 .ENDIF # .IF "$(COM)"=="GCC"
3332
3333 .ENDIF # "$(GUI)"=="WNT"
3334 @@ -1478,8 +1498,10 @@ $(DEF6TARGETN) : \
3335 $(DEF6TARGETN) .PHONY :
3336 .ENDIF # "$(link_always)"==""
3337 @-$(RM) $@.tmpfile
3338 +.IF "$(VERBOSE)" == "TRUE"
3339 @echo ------------------------------
3340 - @echo Making Module-Definitionfile : $@
3341 +.ENDIF
3342 + @echo "Making: module definition file" $(@:f)
3343 @echo LIBRARY $(EMQ)"$(SHL6TARGETN:f)$(EMQ)" >$@.tmpfile
3344 .IF "$(COM)"!="GCC"
3345 @echo HEAPSIZE 0 >>$@.tmpfile
3346 @@ -1492,16 +1514,16 @@ $(DEF6TARGETN) .PHONY :
3347 .IF "$(DEFLIB6NAME)"!=""
3348 .IF "$(COM)"=="GCC"
3349 @-$(RM) $(MISC)/$(SHL6TARGET).exp
3350 - dlltool --output-def $(MISC)/$(SHL6TARGET).exp --export-all-symbols \
3351 + $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL6TARGET).exp --export-all-symbols \
3352 `$(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
3353 - tail --lines +3 $(MISC)/$(SHL6TARGET).exp | sed '/^;/d' >>$@.tmpfile
3354 + $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL6TARGET).exp | sed '/^;/d' >>$@.tmpfile
3355 @-$(RM) $(MISC)/$(SHL6TARGET).exp
3356 .ELSE
3357 .IF "$(SHL6USE_EXPORTS)"==""
3358 @-$(RMHACK6) $(MISC)/$(SHL6TARGET).exp
3359 @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL6TARGET).exp $(SLB)/$(DEFLIB6NAME).lib
3360 @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL6TARGET).flt $(MISC)/$(SHL6TARGET).exp >>$@.tmpfile
3361 - $(RMHACK6) $(MISC)/$(SHL6TARGET).exp
3362 + $(COMMAND_ECHO)$(RMHACK6) $(MISC)/$(SHL6TARGET).exp
3363 .ELSE # "$(SHL6USE_EXPORTS)"==""
3364 @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL6TARGET).direct
3365 @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF6FILTER) $(MISC)/$(SHL6TARGET).direct >>$@.tmpfile
3366 @@ -1570,9 +1592,9 @@ $(DEF6TARGETN) .PHONY :
3367 .ENDIF
3368 .IF "$(DEF6EXPORTFILE)"!=""
3369 .IF "$(COM)"=="GCC"
3370 - $(TYPE) $(DEF6EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3371 + $(COMMAND_ECHO)$(TYPE) $(DEF6EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3372 .ELSE
3373 - $(TYPE) $(DEF6EXPORTFILE) >> $@.tmpfile
3374 + $(COMMAND_ECHO)$(TYPE) $(DEF6EXPORTFILE) >> $@.tmpfile
3375 .ENDIF
3376 .ENDIF
3377 @-$(RM) $@
3378 @@ -1596,8 +1618,10 @@ $(DEF6TARGETN) : \
3379 $(DEF6TARGETN) .PHONY :
3380 .ENDIF # "$(link_always)"==""
3381 @+-$(RM) $@.tmpfile
3382 +.IF "$(VERBOSE)" == "TRUE"
3383 @echo ------------------------------
3384 - @echo Making Module-Definitionfile : $@
3385 +.ENDIF
3386 + @echo "Making: module definition file" $(@:f)
3387 @echo LIBRARY $(SHL6TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
3388 @echo DATA MULTIPLE >>$@.tmpfile
3389 @echo DESCRIPTION 'StarView 3.00 $(DEF6DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
3390 @@ -1678,11 +1702,11 @@ $(DEF6TARGETN) .PHONY :
3391 @sort < $@.tmp_ord | uniq > $@.exptmpfile
3392 @fix_def_ord < $@.exptmpfile >> $@.tmpfile
3393 @+-$(RM) $@
3394 - +$(RENAME) $@.tmpfile $@
3395 + $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
3396 @+-$(RM) $@.tmp_ord
3397 @+-$(RM) $@.exptmpfile
3398 - +$(IMPLIB) $(IMPLIBFLAGS) $(SHL6IMPLIBN:s/.lib/.a/) $@
3399 - +emxomf -o $(SHL6IMPLIBN) $(SHL6IMPLIBN:s/.lib/.a/)
3400 + $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL6IMPLIBN:s/.lib/.a/) $@
3401 + $(COMMAND_ECHO)+emxomf -o $(SHL6IMPLIBN) $(SHL6IMPLIBN:s/.lib/.a/)
3402
3403 .ENDIF # "$(GUI)"=="OS2"
3404
3405 @@ -1718,18 +1742,18 @@ $(DEF7EXPORTFILE) : $(SHL7OBJS) $(SHL7LIBS)
3406 .ENDIF # .IF "$(COM)"=="GCC"
3407
3408 $(DEF7EXPORTFILE) : $(SHL7VERSIONMAP)
3409 - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3410 + $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3411 .IF "$(COM)"=="GCC"
3412 - -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3413 - -$(GREP) "\*\|?" $@ > $@.symbols-regexp
3414 + $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3415 + $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
3416 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
3417 # Extract RTTI symbols from all the objects that will be used to build a shared library
3418 - nm -gP $(SHL7OBJS) \
3419 - `$(TYPE) /dev/null $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3420 - | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3421 + $(COMMAND_ECHO)nm -gP $(SHL7OBJS) \
3422 + `$(TYPE) /dev/null $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3423 + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3424 # overwrite the map file generate into the local output tree with the generated
3425 # exported symbols list
3426 - $(RENAME) $@.exported-symbols $@
3427 + $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
3428 .ENDIF # .IF "$(COM)"=="GCC"
3429
3430 .ENDIF # "$(GUI)"=="WNT"
3431 @@ -1761,8 +1785,10 @@ $(DEF7TARGETN) : \
3432 $(DEF7TARGETN) .PHONY :
3433 .ENDIF # "$(link_always)"==""
3434 @-$(RM) $@.tmpfile
3435 +.IF "$(VERBOSE)" == "TRUE"
3436 @echo ------------------------------
3437 - @echo Making Module-Definitionfile : $@
3438 +.ENDIF
3439 + @echo "Making: module definition file" $(@:f)
3440 @echo LIBRARY $(EMQ)"$(SHL7TARGETN:f)$(EMQ)" >$@.tmpfile
3441 .IF "$(COM)"!="GCC"
3442 @echo HEAPSIZE 0 >>$@.tmpfile
3443 @@ -1775,16 +1801,16 @@ $(DEF7TARGETN) .PHONY :
3444 .IF "$(DEFLIB7NAME)"!=""
3445 .IF "$(COM)"=="GCC"
3446 @-$(RM) $(MISC)/$(SHL7TARGET).exp
3447 - dlltool --output-def $(MISC)/$(SHL7TARGET).exp --export-all-symbols \
3448 + $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL7TARGET).exp --export-all-symbols \
3449 `$(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
3450 - tail --lines +3 $(MISC)/$(SHL7TARGET).exp | sed '/^;/d' >>$@.tmpfile
3451 + $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL7TARGET).exp | sed '/^;/d' >>$@.tmpfile
3452 @-$(RM) $(MISC)/$(SHL7TARGET).exp
3453 .ELSE
3454 .IF "$(SHL7USE_EXPORTS)"==""
3455 @-$(RMHACK7) $(MISC)/$(SHL7TARGET).exp
3456 @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL7TARGET).exp $(SLB)/$(DEFLIB7NAME).lib
3457 @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL7TARGET).flt $(MISC)/$(SHL7TARGET).exp >>$@.tmpfile
3458 - $(RMHACK7) $(MISC)/$(SHL7TARGET).exp
3459 + $(COMMAND_ECHO)$(RMHACK7) $(MISC)/$(SHL7TARGET).exp
3460 .ELSE # "$(SHL7USE_EXPORTS)"==""
3461 @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL7TARGET).direct
3462 @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF7FILTER) $(MISC)/$(SHL7TARGET).direct >>$@.tmpfile
3463 @@ -1853,9 +1879,9 @@ $(DEF7TARGETN) .PHONY :
3464 .ENDIF
3465 .IF "$(DEF7EXPORTFILE)"!=""
3466 .IF "$(COM)"=="GCC"
3467 - $(TYPE) $(DEF7EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3468 + $(COMMAND_ECHO)$(TYPE) $(DEF7EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3469 .ELSE
3470 - $(TYPE) $(DEF7EXPORTFILE) >> $@.tmpfile
3471 + $(COMMAND_ECHO)$(TYPE) $(DEF7EXPORTFILE) >> $@.tmpfile
3472 .ENDIF
3473 .ENDIF
3474 @-$(RM) $@
3475 @@ -1879,8 +1905,10 @@ $(DEF7TARGETN) : \
3476 $(DEF7TARGETN) .PHONY :
3477 .ENDIF # "$(link_always)"==""
3478 @+-$(RM) $@.tmpfile
3479 +.IF "$(VERBOSE)" == "TRUE"
3480 @echo ------------------------------
3481 - @echo Making Module-Definitionfile : $@
3482 +.ENDIF
3483 + @echo "Making: module definition file" $(@:f)
3484 @echo LIBRARY $(SHL7TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
3485 @echo DATA MULTIPLE >>$@.tmpfile
3486 @echo DESCRIPTION 'StarView 3.00 $(DEF7DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
3487 @@ -1961,11 +1989,11 @@ $(DEF7TARGETN) .PHONY :
3488 @sort < $@.tmp_ord | uniq > $@.exptmpfile
3489 @fix_def_ord < $@.exptmpfile >> $@.tmpfile
3490 @+-$(RM) $@
3491 - +$(RENAME) $@.tmpfile $@
3492 + $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
3493 @+-$(RM) $@.tmp_ord
3494 @+-$(RM) $@.exptmpfile
3495 - +$(IMPLIB) $(IMPLIBFLAGS) $(SHL7IMPLIBN:s/.lib/.a/) $@
3496 - +emxomf -o $(SHL7IMPLIBN) $(SHL7IMPLIBN:s/.lib/.a/)
3497 + $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL7IMPLIBN:s/.lib/.a/) $@
3498 + $(COMMAND_ECHO)+emxomf -o $(SHL7IMPLIBN) $(SHL7IMPLIBN:s/.lib/.a/)
3499
3500 .ENDIF # "$(GUI)"=="OS2"
3501
3502 @@ -2001,18 +2029,18 @@ $(DEF8EXPORTFILE) : $(SHL8OBJS) $(SHL8LIBS)
3503 .ENDIF # .IF "$(COM)"=="GCC"
3504
3505 $(DEF8EXPORTFILE) : $(SHL8VERSIONMAP)
3506 - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3507 + $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3508 .IF "$(COM)"=="GCC"
3509 - -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3510 - -$(GREP) "\*\|?" $@ > $@.symbols-regexp
3511 + $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3512 + $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
3513 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
3514 # Extract RTTI symbols from all the objects that will be used to build a shared library
3515 - nm -gP $(SHL8OBJS) \
3516 - `$(TYPE) /dev/null $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3517 - | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3518 + $(COMMAND_ECHO)nm -gP $(SHL8OBJS) \
3519 + `$(TYPE) /dev/null $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3520 + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3521 # overwrite the map file generate into the local output tree with the generated
3522 # exported symbols list
3523 - $(RENAME) $@.exported-symbols $@
3524 + $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
3525 .ENDIF # .IF "$(COM)"=="GCC"
3526
3527 .ENDIF # "$(GUI)"=="WNT"
3528 @@ -2044,8 +2072,10 @@ $(DEF8TARGETN) : \
3529 $(DEF8TARGETN) .PHONY :
3530 .ENDIF # "$(link_always)"==""
3531 @-$(RM) $@.tmpfile
3532 +.IF "$(VERBOSE)" == "TRUE"
3533 @echo ------------------------------
3534 - @echo Making Module-Definitionfile : $@
3535 +.ENDIF
3536 + @echo "Making: module definition file" $(@:f)
3537 @echo LIBRARY $(EMQ)"$(SHL8TARGETN:f)$(EMQ)" >$@.tmpfile
3538 .IF "$(COM)"!="GCC"
3539 @echo HEAPSIZE 0 >>$@.tmpfile
3540 @@ -2058,16 +2088,16 @@ $(DEF8TARGETN) .PHONY :
3541 .IF "$(DEFLIB8NAME)"!=""
3542 .IF "$(COM)"=="GCC"
3543 @-$(RM) $(MISC)/$(SHL8TARGET).exp
3544 - dlltool --output-def $(MISC)/$(SHL8TARGET).exp --export-all-symbols \
3545 + $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL8TARGET).exp --export-all-symbols \
3546 `$(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
3547 - tail --lines +3 $(MISC)/$(SHL8TARGET).exp | sed '/^;/d' >>$@.tmpfile
3548 + $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL8TARGET).exp | sed '/^;/d' >>$@.tmpfile
3549 @-$(RM) $(MISC)/$(SHL8TARGET).exp
3550 .ELSE
3551 .IF "$(SHL8USE_EXPORTS)"==""
3552 @-$(RMHACK8) $(MISC)/$(SHL8TARGET).exp
3553 @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL8TARGET).exp $(SLB)/$(DEFLIB8NAME).lib
3554 @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL8TARGET).flt $(MISC)/$(SHL8TARGET).exp >>$@.tmpfile
3555 - $(RMHACK8) $(MISC)/$(SHL8TARGET).exp
3556 + $(COMMAND_ECHO)$(RMHACK8) $(MISC)/$(SHL8TARGET).exp
3557 .ELSE # "$(SHL8USE_EXPORTS)"==""
3558 @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL8TARGET).direct
3559 @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF8FILTER) $(MISC)/$(SHL8TARGET).direct >>$@.tmpfile
3560 @@ -2136,9 +2166,9 @@ $(DEF8TARGETN) .PHONY :
3561 .ENDIF
3562 .IF "$(DEF8EXPORTFILE)"!=""
3563 .IF "$(COM)"=="GCC"
3564 - $(TYPE) $(DEF8EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3565 + $(COMMAND_ECHO)$(TYPE) $(DEF8EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3566 .ELSE
3567 - $(TYPE) $(DEF8EXPORTFILE) >> $@.tmpfile
3568 + $(COMMAND_ECHO)$(TYPE) $(DEF8EXPORTFILE) >> $@.tmpfile
3569 .ENDIF
3570 .ENDIF
3571 @-$(RM) $@
3572 @@ -2162,8 +2192,10 @@ $(DEF8TARGETN) : \
3573 $(DEF8TARGETN) .PHONY :
3574 .ENDIF # "$(link_always)"==""
3575 @+-$(RM) $@.tmpfile
3576 +.IF "$(VERBOSE)" == "TRUE"
3577 @echo ------------------------------
3578 - @echo Making Module-Definitionfile : $@
3579 +.ENDIF
3580 + @echo "Making: module definition file" $(@:f)
3581 @echo LIBRARY $(SHL8TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
3582 @echo DATA MULTIPLE >>$@.tmpfile
3583 @echo DESCRIPTION 'StarView 3.00 $(DEF8DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
3584 @@ -2244,11 +2276,11 @@ $(DEF8TARGETN) .PHONY :
3585 @sort < $@.tmp_ord | uniq > $@.exptmpfile
3586 @fix_def_ord < $@.exptmpfile >> $@.tmpfile
3587 @+-$(RM) $@
3588 - +$(RENAME) $@.tmpfile $@
3589 + $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
3590 @+-$(RM) $@.tmp_ord
3591 @+-$(RM) $@.exptmpfile
3592 - +$(IMPLIB) $(IMPLIBFLAGS) $(SHL8IMPLIBN:s/.lib/.a/) $@
3593 - +emxomf -o $(SHL8IMPLIBN) $(SHL8IMPLIBN:s/.lib/.a/)
3594 + $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL8IMPLIBN:s/.lib/.a/) $@
3595 + $(COMMAND_ECHO)+emxomf -o $(SHL8IMPLIBN) $(SHL8IMPLIBN:s/.lib/.a/)
3596
3597 .ENDIF # "$(GUI)"=="OS2"
3598
3599 @@ -2284,18 +2316,18 @@ $(DEF9EXPORTFILE) : $(SHL9OBJS) $(SHL9LIBS)
3600 .ENDIF # .IF "$(COM)"=="GCC"
3601
3602 $(DEF9EXPORTFILE) : $(SHL9VERSIONMAP)
3603 - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3604 + $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3605 .IF "$(COM)"=="GCC"
3606 - -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3607 - -$(GREP) "\*\|?" $@ > $@.symbols-regexp
3608 + $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3609 + $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
3610 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
3611 # Extract RTTI symbols from all the objects that will be used to build a shared library
3612 - nm -gP $(SHL9OBJS) \
3613 - `$(TYPE) /dev/null $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3614 - | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3615 + $(COMMAND_ECHO)nm -gP $(SHL9OBJS) \
3616 + `$(TYPE) /dev/null $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3617 + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3618 # overwrite the map file generate into the local output tree with the generated
3619 # exported symbols list
3620 - $(RENAME) $@.exported-symbols $@
3621 + $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
3622 .ENDIF # .IF "$(COM)"=="GCC"
3623
3624 .ENDIF # "$(GUI)"=="WNT"
3625 @@ -2327,8 +2359,10 @@ $(DEF9TARGETN) : \
3626 $(DEF9TARGETN) .PHONY :
3627 .ENDIF # "$(link_always)"==""
3628 @-$(RM) $@.tmpfile
3629 +.IF "$(VERBOSE)" == "TRUE"
3630 @echo ------------------------------
3631 - @echo Making Module-Definitionfile : $@
3632 +.ENDIF
3633 + @echo "Making: module definition file" $(@:f)
3634 @echo LIBRARY $(EMQ)"$(SHL9TARGETN:f)$(EMQ)" >$@.tmpfile
3635 .IF "$(COM)"!="GCC"
3636 @echo HEAPSIZE 0 >>$@.tmpfile
3637 @@ -2341,16 +2375,16 @@ $(DEF9TARGETN) .PHONY :
3638 .IF "$(DEFLIB9NAME)"!=""
3639 .IF "$(COM)"=="GCC"
3640 @-$(RM) $(MISC)/$(SHL9TARGET).exp
3641 - dlltool --output-def $(MISC)/$(SHL9TARGET).exp --export-all-symbols \
3642 + $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL9TARGET).exp --export-all-symbols \
3643 `$(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
3644 - tail --lines +3 $(MISC)/$(SHL9TARGET).exp | sed '/^;/d' >>$@.tmpfile
3645 + $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL9TARGET).exp | sed '/^;/d' >>$@.tmpfile
3646 @-$(RM) $(MISC)/$(SHL9TARGET).exp
3647 .ELSE
3648 .IF "$(SHL9USE_EXPORTS)"==""
3649 @-$(RMHACK9) $(MISC)/$(SHL9TARGET).exp
3650 @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL9TARGET).exp $(SLB)/$(DEFLIB9NAME).lib
3651 @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL9TARGET).flt $(MISC)/$(SHL9TARGET).exp >>$@.tmpfile
3652 - $(RMHACK9) $(MISC)/$(SHL9TARGET).exp
3653 + $(COMMAND_ECHO)$(RMHACK9) $(MISC)/$(SHL9TARGET).exp
3654 .ELSE # "$(SHL9USE_EXPORTS)"==""
3655 @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL9TARGET).direct
3656 @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF9FILTER) $(MISC)/$(SHL9TARGET).direct >>$@.tmpfile
3657 @@ -2419,9 +2453,9 @@ $(DEF9TARGETN) .PHONY :
3658 .ENDIF
3659 .IF "$(DEF9EXPORTFILE)"!=""
3660 .IF "$(COM)"=="GCC"
3661 - $(TYPE) $(DEF9EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3662 + $(COMMAND_ECHO)$(TYPE) $(DEF9EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3663 .ELSE
3664 - $(TYPE) $(DEF9EXPORTFILE) >> $@.tmpfile
3665 + $(COMMAND_ECHO)$(TYPE) $(DEF9EXPORTFILE) >> $@.tmpfile
3666 .ENDIF
3667 .ENDIF
3668 @-$(RM) $@
3669 @@ -2445,8 +2479,10 @@ $(DEF9TARGETN) : \
3670 $(DEF9TARGETN) .PHONY :
3671 .ENDIF # "$(link_always)"==""
3672 @+-$(RM) $@.tmpfile
3673 +.IF "$(VERBOSE)" == "TRUE"
3674 @echo ------------------------------
3675 - @echo Making Module-Definitionfile : $@
3676 +.ENDIF
3677 + @echo "Making: module definition file" $(@:f)
3678 @echo LIBRARY $(SHL9TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
3679 @echo DATA MULTIPLE >>$@.tmpfile
3680 @echo DESCRIPTION 'StarView 3.00 $(DEF9DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
3681 @@ -2527,11 +2563,11 @@ $(DEF9TARGETN) .PHONY :
3682 @sort < $@.tmp_ord | uniq > $@.exptmpfile
3683 @fix_def_ord < $@.exptmpfile >> $@.tmpfile
3684 @+-$(RM) $@
3685 - +$(RENAME) $@.tmpfile $@
3686 + $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
3687 @+-$(RM) $@.tmp_ord
3688 @+-$(RM) $@.exptmpfile
3689 - +$(IMPLIB) $(IMPLIBFLAGS) $(SHL9IMPLIBN:s/.lib/.a/) $@
3690 - +emxomf -o $(SHL9IMPLIBN) $(SHL9IMPLIBN:s/.lib/.a/)
3691 + $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL9IMPLIBN:s/.lib/.a/) $@
3692 + $(COMMAND_ECHO)+emxomf -o $(SHL9IMPLIBN) $(SHL9IMPLIBN:s/.lib/.a/)
3693
3694 .ENDIF # "$(GUI)"=="OS2"
3695
3696 @@ -2567,18 +2603,18 @@ $(DEF10EXPORTFILE) : $(SHL10OBJS) $(SHL10LIBS)
3697 .ENDIF # .IF "$(COM)"=="GCC"
3698
3699 $(DEF10EXPORTFILE) : $(SHL10VERSIONMAP)
3700 - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3701 + $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
3702 .IF "$(COM)"=="GCC"
3703 - -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3704 - -$(GREP) "\*\|?" $@ > $@.symbols-regexp
3705 + $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
3706 + $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
3707 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
3708 # Extract RTTI symbols from all the objects that will be used to build a shared library
3709 - nm -gP $(SHL10OBJS) \
3710 - `$(TYPE) /dev/null $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3711 - | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3712 + $(COMMAND_ECHO)nm -gP $(SHL10OBJS) \
3713 + `$(TYPE) /dev/null $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
3714 + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
3715 # overwrite the map file generate into the local output tree with the generated
3716 # exported symbols list
3717 - $(RENAME) $@.exported-symbols $@
3718 + $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
3719 .ENDIF # .IF "$(COM)"=="GCC"
3720
3721 .ENDIF # "$(GUI)"=="WNT"
3722 @@ -2610,8 +2646,10 @@ $(DEF10TARGETN) : \
3723 $(DEF10TARGETN) .PHONY :
3724 .ENDIF # "$(link_always)"==""
3725 @-$(RM) $@.tmpfile
3726 +.IF "$(VERBOSE)" == "TRUE"
3727 @echo ------------------------------
3728 - @echo Making Module-Definitionfile : $@
3729 +.ENDIF
3730 + @echo "Making: module definition file" $(@:f)
3731 @echo LIBRARY $(EMQ)"$(SHL10TARGETN:f)$(EMQ)" >$@.tmpfile
3732 .IF "$(COM)"!="GCC"
3733 @echo HEAPSIZE 0 >>$@.tmpfile
3734 @@ -2624,16 +2662,16 @@ $(DEF10TARGETN) .PHONY :
3735 .IF "$(DEFLIB10NAME)"!=""
3736 .IF "$(COM)"=="GCC"
3737 @-$(RM) $(MISC)/$(SHL10TARGET).exp
3738 - dlltool --output-def $(MISC)/$(SHL10TARGET).exp --export-all-symbols \
3739 + $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL10TARGET).exp --export-all-symbols \
3740 `$(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
3741 - tail --lines +3 $(MISC)/$(SHL10TARGET).exp | sed '/^;/d' >>$@.tmpfile
3742 + $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL10TARGET).exp | sed '/^;/d' >>$@.tmpfile
3743 @-$(RM) $(MISC)/$(SHL10TARGET).exp
3744 .ELSE
3745 .IF "$(SHL10USE_EXPORTS)"==""
3746 @-$(RMHACK10) $(MISC)/$(SHL10TARGET).exp
3747 @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL10TARGET).exp $(SLB)/$(DEFLIB10NAME).lib
3748 @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL10TARGET).flt $(MISC)/$(SHL10TARGET).exp >>$@.tmpfile
3749 - $(RMHACK10) $(MISC)/$(SHL10TARGET).exp
3750 + $(COMMAND_ECHO)$(RMHACK10) $(MISC)/$(SHL10TARGET).exp
3751 .ELSE # "$(SHL10USE_EXPORTS)"==""
3752 @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL10TARGET).direct
3753 @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF10FILTER) $(MISC)/$(SHL10TARGET).direct >>$@.tmpfile
3754 @@ -2702,9 +2740,9 @@ $(DEF10TARGETN) .PHONY :
3755 .ENDIF
3756 .IF "$(DEF10EXPORTFILE)"!=""
3757 .IF "$(COM)"=="GCC"
3758 - $(TYPE) $(DEF10EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3759 + $(COMMAND_ECHO)$(TYPE) $(DEF10EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
3760 .ELSE
3761 - $(TYPE) $(DEF10EXPORTFILE) >> $@.tmpfile
3762 + $(COMMAND_ECHO)$(TYPE) $(DEF10EXPORTFILE) >> $@.tmpfile
3763 .ENDIF
3764 .ENDIF
3765 @-$(RM) $@
3766 @@ -2728,8 +2766,10 @@ $(DEF10TARGETN) : \
3767 $(DEF10TARGETN) .PHONY :
3768 .ENDIF # "$(link_always)"==""
3769 @+-$(RM) $@.tmpfile
3770 +.IF "$(VERBOSE)" == "TRUE"
3771 @echo ------------------------------
3772 - @echo Making Module-Definitionfile : $@
3773 +.ENDIF
3774 + @echo "Making: module definition file" $(@:f)
3775 @echo LIBRARY $(SHL10TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
3776 @echo DATA MULTIPLE >>$@.tmpfile
3777 @echo DESCRIPTION 'StarView 3.00 $(DEF10DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
3778 @@ -2810,11 +2850,11 @@ $(DEF10TARGETN) .PHONY :
3779 @sort < $@.tmp_ord | uniq > $@.exptmpfile
3780 @fix_def_ord < $@.exptmpfile >> $@.tmpfile
3781 @+-$(RM) $@
3782 - +$(RENAME) $@.tmpfile $@
3783 + $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
3784 @+-$(RM) $@.tmp_ord
3785 @+-$(RM) $@.exptmpfile
3786 - +$(IMPLIB) $(IMPLIBFLAGS) $(SHL10IMPLIBN:s/.lib/.a/) $@
3787 - +emxomf -o $(SHL10IMPLIBN) $(SHL10IMPLIBN:s/.lib/.a/)
3788 + $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL10IMPLIBN:s/.lib/.a/) $@
3789 + $(COMMAND_ECHO)+emxomf -o $(SHL10IMPLIBN) $(SHL10IMPLIBN:s/.lib/.a/)
3790
3791 .ENDIF # "$(GUI)"=="OS2"
3792
3793 diff --git solenv/inc/_tg_lib.mk solenv/inc/_tg_lib.mk
3794 index 7216982..424bd89 100644
3795 --- solenv/inc/_tg_lib.mk
3796 +++ solenv/inc/_tg_lib.mk
3797 @@ -4,7 +4,7 @@
3798 .IF "$(LIB1ARCHIV)" != ""
3799
3800 $(LIB1ARCHIV) : $(LIB1TARGET)
3801 - @echo Making: $@
3802 + @echo "Making: " $(@:f)
3803 @@-$(RM) $@
3804 .IF "$(GUI)"=="UNX"
3805 @-$(RM) $(MISC)/$(LIB1ARCHIV:b).cmd
3806 @@ -21,14 +21,18 @@ $(LIB1ARCHIV) : $(LIB1TARGET)
3807 .IF "$(OS)" == "MACOSX"
3808 @echo ranlib $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd
3809 .ENDIF
3810 +.IF "$(VERBOSE)" == "TRUE"
3811 @cat $(MISC)/$(LIB1ARCHIV:b).cmd
3812 +.ENDIF
3813 @+source $(MISC)/$(LIB1ARCHIV:b).cmd
3814 .ELSE # "$(GUI)"=="UNX"
3815 .IF "$(GUI)$(COM)"=="WNTGCC"
3816 @+-$(RM) $(MISC)/$(LIB1ARCHIV:b).cmd
3817 @+echo $(LIBMGR) $(LIB1FLAGS) $(LIBFLAGS) $(LIB1ARCHIV) `cat $(LIB1TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB1ARCHIV:b).cmd
3818 @+echo ranlib $(LIB1ARCHIV) >> $(MISC)/$(LIB1ARCHIV:b).cmd
3819 +.IF "$(VERBOSE)" == "TRUE"
3820 @cat $(MISC)/$(LIB1ARCHIV:b).cmd
3821 +.ENDIF
3822 @+source $(MISC)/$(LIB1ARCHIV:b).cmd
3823 .ELSE
3824 @echo just a dummy > $@
3825 @@ -40,10 +44,12 @@ $(LIB1ARCHIV) : $(LIB1TARGET)
3826 $(LIB1TARGET) : $(LIB1FILES) \
3827 $(LIB1OBJFILES) \
3828 $(LIB1DEPN)
3829 +.IF "$(VERBOSE)" == "TRUE"
3830 @echo using: $(LIB1FILES)
3831 @echo using: $(LIB1TARGET)
3832 @echo ------------------------------
3833 - @echo Making: $@
3834 +.ENDIF
3835 + @echo "Making: " $(@:f)
3836 @@-$(RM) $@
3837 .IF "$(GUI)"=="UNX"
3838 @echo $(LIB1OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
3839 @@ -56,7 +62,7 @@ $(LIB1TARGET) : $(LIB1FILES) \
3840 .ENDIF
3841
3842 .ELIF "$(GUI)"=="OS2"
3843 - $(LIBMGR) $(LIBFLAGS) $@ $(LIB1FILES) $(LIB1OBJFILES)
3844 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB1FILES) $(LIB1OBJFILES)
3845 @+-$(RM) $(@:s/.lib/.lin/)
3846 .IF "$(LIB1OBJFILES)"!=""
3847 @+$(TYPE) $(mktmp $(LIB1OBJFILES)) > $(null,$(LIB1OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
3848 @@ -72,7 +78,7 @@ $(LIB1TARGET) : $(LIB1FILES) \
3849 +$(ECHONL) $(LIB1OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
3850 @+cat /dev/null $(LIB1FILES) | xargs -n1 >> $@
3851 .ELSE
3852 - $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB1FILES) $(LIB1OBJFILES))
3853 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB1FILES) $(LIB1OBJFILES))
3854 @-$(RM) $(@:s/.lib/.lin/)
3855 .IF "$(LIB1OBJFILES)"!=""
3856 @$(TYPE) $(mktmp $(LIB1OBJFILES)) > $(null,$(LIB1OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
3857 @@ -84,8 +90,10 @@ $(LIB1TARGET) : $(LIB1FILES) \
3858 .ENDIF # "$(LIB1FILES)"!=""
3859 .ELSE # "$(GUI)"=="WNT"
3860 @-$(RM) $@
3861 - echo $(LIBMGR) r $@ $(LIB1OBJFILES)
3862 - $(LIBMGR) r $@ $(LIB1OBJFILES) $(LIB1FILES) bla.lib
3863 + .IF "$(VERBOSE)" == "TRUE"
3864 + @echo $(LIBMGR) r $@ $(LIB1OBJFILES)
3865 + .ENDIF
3866 + $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB1OBJFILES) $(LIB1FILES) bla.lib
3867 .ENDIF # "$(GUI)"=="WNT"
3868 .ENDIF # "$(GUI)"=="UNX"
3869 .ENDIF # "$(LIB1TARGET)" != ""
3870 @@ -97,7 +105,7 @@ $(LIB1TARGET) : $(LIB1FILES) \
3871 .IF "$(LIB2ARCHIV)" != ""
3872
3873 $(LIB2ARCHIV) : $(LIB2TARGET)
3874 - @echo Making: $@
3875 + @echo "Making: " $(@:f)
3876 @@-$(RM) $@
3877 .IF "$(GUI)"=="UNX"
3878 @-$(RM) $(MISC)/$(LIB2ARCHIV:b).cmd
3879 @@ -114,14 +122,18 @@ $(LIB2ARCHIV) : $(LIB2TARGET)
3880 .IF "$(OS)" == "MACOSX"
3881 @echo ranlib $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd
3882 .ENDIF
3883 +.IF "$(VERBOSE)" == "TRUE"
3884 @cat $(MISC)/$(LIB2ARCHIV:b).cmd
3885 +.ENDIF
3886 @+source $(MISC)/$(LIB2ARCHIV:b).cmd
3887 .ELSE # "$(GUI)"=="UNX"
3888 .IF "$(GUI)$(COM)"=="WNTGCC"
3889 @+-$(RM) $(MISC)/$(LIB2ARCHIV:b).cmd
3890 @+echo $(LIBMGR) $(LIB2FLAGS) $(LIBFLAGS) $(LIB2ARCHIV) `cat $(LIB2TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB2ARCHIV:b).cmd
3891 @+echo ranlib $(LIB2ARCHIV) >> $(MISC)/$(LIB2ARCHIV:b).cmd
3892 +.IF "$(VERBOSE)" == "TRUE"
3893 @cat $(MISC)/$(LIB2ARCHIV:b).cmd
3894 +.ENDIF
3895 @+source $(MISC)/$(LIB2ARCHIV:b).cmd
3896 .ELSE
3897 @echo just a dummy > $@
3898 @@ -133,10 +145,12 @@ $(LIB2ARCHIV) : $(LIB2TARGET)
3899 $(LIB2TARGET) : $(LIB2FILES) \
3900 $(LIB2OBJFILES) \
3901 $(LIB2DEPN)
3902 +.IF "$(VERBOSE)" == "TRUE"
3903 @echo using: $(LIB2FILES)
3904 @echo using: $(LIB2TARGET)
3905 @echo ------------------------------
3906 - @echo Making: $@
3907 +.ENDIF
3908 + @echo "Making: " $(@:f)
3909 @@-$(RM) $@
3910 .IF "$(GUI)"=="UNX"
3911 @echo $(LIB2OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
3912 @@ -149,7 +163,7 @@ $(LIB2TARGET) : $(LIB2FILES) \
3913 .ENDIF
3914
3915 .ELIF "$(GUI)"=="OS2"
3916 - $(LIBMGR) $(LIBFLAGS) $@ $(LIB2FILES) $(LIB2OBJFILES)
3917 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB2FILES) $(LIB2OBJFILES)
3918 @+-$(RM) $(@:s/.lib/.lin/)
3919 .IF "$(LIB2OBJFILES)"!=""
3920 @+$(TYPE) $(mktmp $(LIB2OBJFILES)) > $(null,$(LIB2OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
3921 @@ -165,7 +179,7 @@ $(LIB2TARGET) : $(LIB2FILES) \
3922 +$(ECHONL) $(LIB2OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
3923 @+cat /dev/null $(LIB2FILES) | xargs -n1 >> $@
3924 .ELSE
3925 - $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB2FILES) $(LIB2OBJFILES))
3926 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB2FILES) $(LIB2OBJFILES))
3927 @-$(RM) $(@:s/.lib/.lin/)
3928 .IF "$(LIB2OBJFILES)"!=""
3929 @$(TYPE) $(mktmp $(LIB2OBJFILES)) > $(null,$(LIB2OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
3930 @@ -177,8 +191,10 @@ $(LIB2TARGET) : $(LIB2FILES) \
3931 .ENDIF # "$(LIB2FILES)"!=""
3932 .ELSE # "$(GUI)"=="WNT"
3933 @-$(RM) $@
3934 - echo $(LIBMGR) r $@ $(LIB2OBJFILES)
3935 - $(LIBMGR) r $@ $(LIB2OBJFILES) $(LIB2FILES) bla.lib
3936 + .IF "$(VERBOSE)" == "TRUE"
3937 + @echo $(LIBMGR) r $@ $(LIB2OBJFILES)
3938 + .ENDIF
3939 + $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB2OBJFILES) $(LIB2FILES) bla.lib
3940 .ENDIF # "$(GUI)"=="WNT"
3941 .ENDIF # "$(GUI)"=="UNX"
3942 .ENDIF # "$(LIB2TARGET)" != ""
3943 @@ -190,7 +206,7 @@ $(LIB2TARGET) : $(LIB2FILES) \
3944 .IF "$(LIB3ARCHIV)" != ""
3945
3946 $(LIB3ARCHIV) : $(LIB3TARGET)
3947 - @echo Making: $@
3948 + @echo "Making: " $(@:f)
3949 @@-$(RM) $@
3950 .IF "$(GUI)"=="UNX"
3951 @-$(RM) $(MISC)/$(LIB3ARCHIV:b).cmd
3952 @@ -207,14 +223,18 @@ $(LIB3ARCHIV) : $(LIB3TARGET)
3953 .IF "$(OS)" == "MACOSX"
3954 @echo ranlib $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd
3955 .ENDIF
3956 +.IF "$(VERBOSE)" == "TRUE"
3957 @cat $(MISC)/$(LIB3ARCHIV:b).cmd
3958 +.ENDIF
3959 @+source $(MISC)/$(LIB3ARCHIV:b).cmd
3960 .ELSE # "$(GUI)"=="UNX"
3961 .IF "$(GUI)$(COM)"=="WNTGCC"
3962 @+-$(RM) $(MISC)/$(LIB3ARCHIV:b).cmd
3963 @+echo $(LIBMGR) $(LIB3FLAGS) $(LIBFLAGS) $(LIB3ARCHIV) `cat $(LIB3TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB3ARCHIV:b).cmd
3964 @+echo ranlib $(LIB3ARCHIV) >> $(MISC)/$(LIB3ARCHIV:b).cmd
3965 +.IF "$(VERBOSE)" == "TRUE"
3966 @cat $(MISC)/$(LIB3ARCHIV:b).cmd
3967 +.ENDIF
3968 @+source $(MISC)/$(LIB3ARCHIV:b).cmd
3969 .ELSE
3970 @echo just a dummy > $@
3971 @@ -226,10 +246,12 @@ $(LIB3ARCHIV) : $(LIB3TARGET)
3972 $(LIB3TARGET) : $(LIB3FILES) \
3973 $(LIB3OBJFILES) \
3974 $(LIB3DEPN)
3975 +.IF "$(VERBOSE)" == "TRUE"
3976 @echo using: $(LIB3FILES)
3977 @echo using: $(LIB3TARGET)
3978 @echo ------------------------------
3979 - @echo Making: $@
3980 +.ENDIF
3981 + @echo "Making: " $(@:f)
3982 @@-$(RM) $@
3983 .IF "$(GUI)"=="UNX"
3984 @echo $(LIB3OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
3985 @@ -242,7 +264,7 @@ $(LIB3TARGET) : $(LIB3FILES) \
3986 .ENDIF
3987
3988 .ELIF "$(GUI)"=="OS2"
3989 - $(LIBMGR) $(LIBFLAGS) $@ $(LIB3FILES) $(LIB3OBJFILES)
3990 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB3FILES) $(LIB3OBJFILES)
3991 @+-$(RM) $(@:s/.lib/.lin/)
3992 .IF "$(LIB3OBJFILES)"!=""
3993 @+$(TYPE) $(mktmp $(LIB3OBJFILES)) > $(null,$(LIB3OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
3994 @@ -258,7 +280,7 @@ $(LIB3TARGET) : $(LIB3FILES) \
3995 +$(ECHONL) $(LIB3OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
3996 @+cat /dev/null $(LIB3FILES) | xargs -n1 >> $@
3997 .ELSE
3998 - $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB3FILES) $(LIB3OBJFILES))
3999 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB3FILES) $(LIB3OBJFILES))
4000 @-$(RM) $(@:s/.lib/.lin/)
4001 .IF "$(LIB3OBJFILES)"!=""
4002 @$(TYPE) $(mktmp $(LIB3OBJFILES)) > $(null,$(LIB3OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
4003 @@ -270,8 +292,10 @@ $(LIB3TARGET) : $(LIB3FILES) \
4004 .ENDIF # "$(LIB3FILES)"!=""
4005 .ELSE # "$(GUI)"=="WNT"
4006 @-$(RM) $@
4007 - echo $(LIBMGR) r $@ $(LIB3OBJFILES)
4008 - $(LIBMGR) r $@ $(LIB3OBJFILES) $(LIB3FILES) bla.lib
4009 + .IF "$(VERBOSE)" == "TRUE"
4010 + @echo $(LIBMGR) r $@ $(LIB3OBJFILES)
4011 + .ENDIF
4012 + $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB3OBJFILES) $(LIB3FILES) bla.lib
4013 .ENDIF # "$(GUI)"=="WNT"
4014 .ENDIF # "$(GUI)"=="UNX"
4015 .ENDIF # "$(LIB3TARGET)" != ""
4016 @@ -283,7 +307,7 @@ $(LIB3TARGET) : $(LIB3FILES) \
4017 .IF "$(LIB4ARCHIV)" != ""
4018
4019 $(LIB4ARCHIV) : $(LIB4TARGET)
4020 - @echo Making: $@
4021 + @echo "Making: " $(@:f)
4022 @@-$(RM) $@
4023 .IF "$(GUI)"=="UNX"
4024 @-$(RM) $(MISC)/$(LIB4ARCHIV:b).cmd
4025 @@ -300,14 +324,18 @@ $(LIB4ARCHIV) : $(LIB4TARGET)
4026 .IF "$(OS)" == "MACOSX"
4027 @echo ranlib $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd
4028 .ENDIF
4029 +.IF "$(VERBOSE)" == "TRUE"
4030 @cat $(MISC)/$(LIB4ARCHIV:b).cmd
4031 +.ENDIF
4032 @+source $(MISC)/$(LIB4ARCHIV:b).cmd
4033 .ELSE # "$(GUI)"=="UNX"
4034 .IF "$(GUI)$(COM)"=="WNTGCC"
4035 @+-$(RM) $(MISC)/$(LIB4ARCHIV:b).cmd
4036 @+echo $(LIBMGR) $(LIB4FLAGS) $(LIBFLAGS) $(LIB4ARCHIV) `cat $(LIB4TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB4ARCHIV:b).cmd
4037 @+echo ranlib $(LIB4ARCHIV) >> $(MISC)/$(LIB4ARCHIV:b).cmd
4038 +.IF "$(VERBOSE)" == "TRUE"
4039 @cat $(MISC)/$(LIB4ARCHIV:b).cmd
4040 +.ENDIF
4041 @+source $(MISC)/$(LIB4ARCHIV:b).cmd
4042 .ELSE
4043 @echo just a dummy > $@
4044 @@ -319,10 +347,12 @@ $(LIB4ARCHIV) : $(LIB4TARGET)
4045 $(LIB4TARGET) : $(LIB4FILES) \
4046 $(LIB4OBJFILES) \
4047 $(LIB4DEPN)
4048 +.IF "$(VERBOSE)" == "TRUE"
4049 @echo using: $(LIB4FILES)
4050 @echo using: $(LIB4TARGET)
4051 @echo ------------------------------
4052 - @echo Making: $@
4053 +.ENDIF
4054 + @echo "Making: " $(@:f)
4055 @@-$(RM) $@
4056 .IF "$(GUI)"=="UNX"
4057 @echo $(LIB4OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
4058 @@ -335,7 +365,7 @@ $(LIB4TARGET) : $(LIB4FILES) \
4059 .ENDIF
4060
4061 .ELIF "$(GUI)"=="OS2"
4062 - $(LIBMGR) $(LIBFLAGS) $@ $(LIB4FILES) $(LIB4OBJFILES)
4063 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB4FILES) $(LIB4OBJFILES)
4064 @+-$(RM) $(@:s/.lib/.lin/)
4065 .IF "$(LIB4OBJFILES)"!=""
4066 @+$(TYPE) $(mktmp $(LIB4OBJFILES)) > $(null,$(LIB4OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
4067 @@ -351,7 +381,7 @@ $(LIB4TARGET) : $(LIB4FILES) \
4068 +$(ECHONL) $(LIB4OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
4069 @+cat /dev/null $(LIB4FILES) | xargs -n1 >> $@
4070 .ELSE
4071 - $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB4FILES) $(LIB4OBJFILES))
4072 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB4FILES) $(LIB4OBJFILES))
4073 @-$(RM) $(@:s/.lib/.lin/)
4074 .IF "$(LIB4OBJFILES)"!=""
4075 @$(TYPE) $(mktmp $(LIB4OBJFILES)) > $(null,$(LIB4OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
4076 @@ -363,8 +393,10 @@ $(LIB4TARGET) : $(LIB4FILES) \
4077 .ENDIF # "$(LIB4FILES)"!=""
4078 .ELSE # "$(GUI)"=="WNT"
4079 @-$(RM) $@
4080 - echo $(LIBMGR) r $@ $(LIB4OBJFILES)
4081 - $(LIBMGR) r $@ $(LIB4OBJFILES) $(LIB4FILES) bla.lib
4082 + .IF "$(VERBOSE)" == "TRUE"
4083 + @echo $(LIBMGR) r $@ $(LIB4OBJFILES)
4084 + .ENDIF
4085 + $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB4OBJFILES) $(LIB4FILES) bla.lib
4086 .ENDIF # "$(GUI)"=="WNT"
4087 .ENDIF # "$(GUI)"=="UNX"
4088 .ENDIF # "$(LIB4TARGET)" != ""
4089 @@ -376,7 +408,7 @@ $(LIB4TARGET) : $(LIB4FILES) \
4090 .IF "$(LIB5ARCHIV)" != ""
4091
4092 $(LIB5ARCHIV) : $(LIB5TARGET)
4093 - @echo Making: $@
4094 + @echo "Making: " $(@:f)
4095 @@-$(RM) $@
4096 .IF "$(GUI)"=="UNX"
4097 @-$(RM) $(MISC)/$(LIB5ARCHIV:b).cmd
4098 @@ -393,14 +425,18 @@ $(LIB5ARCHIV) : $(LIB5TARGET)
4099 .IF "$(OS)" == "MACOSX"
4100 @echo ranlib $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd
4101 .ENDIF
4102 +.IF "$(VERBOSE)" == "TRUE"
4103 @cat $(MISC)/$(LIB5ARCHIV:b).cmd
4104 +.ENDIF
4105 @+source $(MISC)/$(LIB5ARCHIV:b).cmd
4106 .ELSE # "$(GUI)"=="UNX"
4107 .IF "$(GUI)$(COM)"=="WNTGCC"
4108 @+-$(RM) $(MISC)/$(LIB5ARCHIV:b).cmd
4109 @+echo $(LIBMGR) $(LIB5FLAGS) $(LIBFLAGS) $(LIB5ARCHIV) `cat $(LIB5TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB5ARCHIV:b).cmd
4110 @+echo ranlib $(LIB5ARCHIV) >> $(MISC)/$(LIB5ARCHIV:b).cmd
4111 +.IF "$(VERBOSE)" == "TRUE"
4112 @cat $(MISC)/$(LIB5ARCHIV:b).cmd
4113 +.ENDIF
4114 @+source $(MISC)/$(LIB5ARCHIV:b).cmd
4115 .ELSE
4116 @echo just a dummy > $@
4117 @@ -412,10 +448,12 @@ $(LIB5ARCHIV) : $(LIB5TARGET)
4118 $(LIB5TARGET) : $(LIB5FILES) \
4119 $(LIB5OBJFILES) \
4120 $(LIB5DEPN)
4121 +.IF "$(VERBOSE)" == "TRUE"
4122 @echo using: $(LIB5FILES)
4123 @echo using: $(LIB5TARGET)
4124 @echo ------------------------------
4125 - @echo Making: $@
4126 +.ENDIF
4127 + @echo "Making: " $(@:f)
4128 @@-$(RM) $@
4129 .IF "$(GUI)"=="UNX"
4130 @echo $(LIB5OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
4131 @@ -428,7 +466,7 @@ $(LIB5TARGET) : $(LIB5FILES) \
4132 .ENDIF
4133
4134 .ELIF "$(GUI)"=="OS2"
4135 - $(LIBMGR) $(LIBFLAGS) $@ $(LIB5FILES) $(LIB5OBJFILES)
4136 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB5FILES) $(LIB5OBJFILES)
4137 @+-$(RM) $(@:s/.lib/.lin/)
4138 .IF "$(LIB5OBJFILES)"!=""
4139 @+$(TYPE) $(mktmp $(LIB5OBJFILES)) > $(null,$(LIB5OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
4140 @@ -444,7 +482,7 @@ $(LIB5TARGET) : $(LIB5FILES) \
4141 +$(ECHONL) $(LIB5OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
4142 @+cat /dev/null $(LIB5FILES) | xargs -n1 >> $@
4143 .ELSE
4144 - $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB5FILES) $(LIB5OBJFILES))
4145 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB5FILES) $(LIB5OBJFILES))
4146 @-$(RM) $(@:s/.lib/.lin/)
4147 .IF "$(LIB5OBJFILES)"!=""
4148 @$(TYPE) $(mktmp $(LIB5OBJFILES)) > $(null,$(LIB5OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
4149 @@ -456,8 +494,10 @@ $(LIB5TARGET) : $(LIB5FILES) \
4150 .ENDIF # "$(LIB5FILES)"!=""
4151 .ELSE # "$(GUI)"=="WNT"
4152 @-$(RM) $@
4153 - echo $(LIBMGR) r $@ $(LIB5OBJFILES)
4154 - $(LIBMGR) r $@ $(LIB5OBJFILES) $(LIB5FILES) bla.lib
4155 + .IF "$(VERBOSE)" == "TRUE"
4156 + @echo $(LIBMGR) r $@ $(LIB5OBJFILES)
4157 + .ENDIF
4158 + $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB5OBJFILES) $(LIB5FILES) bla.lib
4159 .ENDIF # "$(GUI)"=="WNT"
4160 .ENDIF # "$(GUI)"=="UNX"
4161 .ENDIF # "$(LIB5TARGET)" != ""
4162 @@ -469,7 +509,7 @@ $(LIB5TARGET) : $(LIB5FILES) \
4163 .IF "$(LIB6ARCHIV)" != ""
4164
4165 $(LIB6ARCHIV) : $(LIB6TARGET)
4166 - @echo Making: $@
4167 + @echo "Making: " $(@:f)
4168 @@-$(RM) $@
4169 .IF "$(GUI)"=="UNX"
4170 @-$(RM) $(MISC)/$(LIB6ARCHIV:b).cmd
4171 @@ -486,14 +526,18 @@ $(LIB6ARCHIV) : $(LIB6TARGET)
4172 .IF "$(OS)" == "MACOSX"
4173 @echo ranlib $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd
4174 .ENDIF
4175 +.IF "$(VERBOSE)" == "TRUE"
4176 @cat $(MISC)/$(LIB6ARCHIV:b).cmd
4177 +.ENDIF
4178 @+source $(MISC)/$(LIB6ARCHIV:b).cmd
4179 .ELSE # "$(GUI)"=="UNX"
4180 .IF "$(GUI)$(COM)"=="WNTGCC"
4181 @+-$(RM) $(MISC)/$(LIB6ARCHIV:b).cmd
4182 @+echo $(LIBMGR) $(LIB6FLAGS) $(LIBFLAGS) $(LIB6ARCHIV) `cat $(LIB6TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB6ARCHIV:b).cmd
4183 @+echo ranlib $(LIB6ARCHIV) >> $(MISC)/$(LIB6ARCHIV:b).cmd
4184 +.IF "$(VERBOSE)" == "TRUE"
4185 @cat $(MISC)/$(LIB6ARCHIV:b).cmd
4186 +.ENDIF
4187 @+source $(MISC)/$(LIB6ARCHIV:b).cmd
4188 .ELSE
4189 @echo just a dummy > $@
4190 @@ -505,10 +549,12 @@ $(LIB6ARCHIV) : $(LIB6TARGET)
4191 $(LIB6TARGET) : $(LIB6FILES) \
4192 $(LIB6OBJFILES) \
4193 $(LIB6DEPN)
4194 +.IF "$(VERBOSE)" == "TRUE"
4195 @echo using: $(LIB6FILES)
4196 @echo using: $(LIB6TARGET)
4197 @echo ------------------------------
4198 - @echo Making: $@
4199 +.ENDIF
4200 + @echo "Making: " $(@:f)
4201 @@-$(RM) $@
4202 .IF "$(GUI)"=="UNX"
4203 @echo $(LIB6OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
4204 @@ -521,7 +567,7 @@ $(LIB6TARGET) : $(LIB6FILES) \
4205 .ENDIF
4206
4207 .ELIF "$(GUI)"=="OS2"
4208 - $(LIBMGR) $(LIBFLAGS) $@ $(LIB6FILES) $(LIB6OBJFILES)
4209 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB6FILES) $(LIB6OBJFILES)
4210 @+-$(RM) $(@:s/.lib/.lin/)
4211 .IF "$(LIB6OBJFILES)"!=""
4212 @+$(TYPE) $(mktmp $(LIB6OBJFILES)) > $(null,$(LIB6OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
4213 @@ -537,7 +583,7 @@ $(LIB6TARGET) : $(LIB6FILES) \
4214 +$(ECHONL) $(LIB6OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
4215 @+cat /dev/null $(LIB6FILES) | xargs -n1 >> $@
4216 .ELSE
4217 - $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB6FILES) $(LIB6OBJFILES))
4218 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB6FILES) $(LIB6OBJFILES))
4219 @-$(RM) $(@:s/.lib/.lin/)
4220 .IF "$(LIB6OBJFILES)"!=""
4221 @$(TYPE) $(mktmp $(LIB6OBJFILES)) > $(null,$(LIB6OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
4222 @@ -549,8 +595,10 @@ $(LIB6TARGET) : $(LIB6FILES) \
4223 .ENDIF # "$(LIB6FILES)"!=""
4224 .ELSE # "$(GUI)"=="WNT"
4225 @-$(RM) $@
4226 - echo $(LIBMGR) r $@ $(LIB6OBJFILES)
4227 - $(LIBMGR) r $@ $(LIB6OBJFILES) $(LIB6FILES) bla.lib
4228 + .IF "$(VERBOSE)" == "TRUE"
4229 + @echo $(LIBMGR) r $@ $(LIB6OBJFILES)
4230 + .ENDIF
4231 + $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB6OBJFILES) $(LIB6FILES) bla.lib
4232 .ENDIF # "$(GUI)"=="WNT"
4233 .ENDIF # "$(GUI)"=="UNX"
4234 .ENDIF # "$(LIB6TARGET)" != ""
4235 @@ -562,7 +610,7 @@ $(LIB6TARGET) : $(LIB6FILES) \
4236 .IF "$(LIB7ARCHIV)" != ""
4237
4238 $(LIB7ARCHIV) : $(LIB7TARGET)
4239 - @echo Making: $@
4240 + @echo "Making: " $(@:f)
4241 @@-$(RM) $@
4242 .IF "$(GUI)"=="UNX"
4243 @-$(RM) $(MISC)/$(LIB7ARCHIV:b).cmd
4244 @@ -579,14 +627,18 @@ $(LIB7ARCHIV) : $(LIB7TARGET)
4245 .IF "$(OS)" == "MACOSX"
4246 @echo ranlib $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd
4247 .ENDIF
4248 +.IF "$(VERBOSE)" == "TRUE"
4249 @cat $(MISC)/$(LIB7ARCHIV:b).cmd
4250 +.ENDIF
4251 @+source $(MISC)/$(LIB7ARCHIV:b).cmd
4252 .ELSE # "$(GUI)"=="UNX"
4253 .IF "$(GUI)$(COM)"=="WNTGCC"
4254 @+-$(RM) $(MISC)/$(LIB7ARCHIV:b).cmd
4255 @+echo $(LIBMGR) $(LIB7FLAGS) $(LIBFLAGS) $(LIB7ARCHIV) `cat $(LIB7TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB7ARCHIV:b).cmd
4256 @+echo ranlib $(LIB7ARCHIV) >> $(MISC)/$(LIB7ARCHIV:b).cmd
4257 +.IF "$(VERBOSE)" == "TRUE"
4258 @cat $(MISC)/$(LIB7ARCHIV:b).cmd
4259 +.ENDIF
4260 @+source $(MISC)/$(LIB7ARCHIV:b).cmd
4261 .ELSE
4262 @echo just a dummy > $@
4263 @@ -598,10 +650,12 @@ $(LIB7ARCHIV) : $(LIB7TARGET)
4264 $(LIB7TARGET) : $(LIB7FILES) \
4265 $(LIB7OBJFILES) \
4266 $(LIB7DEPN)
4267 +.IF "$(VERBOSE)" == "TRUE"
4268 @echo using: $(LIB7FILES)
4269 @echo using: $(LIB7TARGET)
4270 @echo ------------------------------
4271 - @echo Making: $@
4272 +.ENDIF
4273 + @echo "Making: " $(@:f)
4274 @@-$(RM) $@
4275 .IF "$(GUI)"=="UNX"
4276 @echo $(LIB7OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
4277 @@ -614,7 +668,7 @@ $(LIB7TARGET) : $(LIB7FILES) \
4278 .ENDIF
4279
4280 .ELIF "$(GUI)"=="OS2"
4281 - $(LIBMGR) $(LIBFLAGS) $@ $(LIB7FILES) $(LIB7OBJFILES)
4282 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB7FILES) $(LIB7OBJFILES)
4283 @+-$(RM) $(@:s/.lib/.lin/)
4284 .IF "$(LIB7OBJFILES)"!=""
4285 @+$(TYPE) $(mktmp $(LIB7OBJFILES)) > $(null,$(LIB7OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
4286 @@ -630,7 +684,7 @@ $(LIB7TARGET) : $(LIB7FILES) \
4287 +$(ECHONL) $(LIB7OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
4288 @+cat /dev/null $(LIB7FILES) | xargs -n1 >> $@
4289 .ELSE
4290 - $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB7FILES) $(LIB7OBJFILES))
4291 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB7FILES) $(LIB7OBJFILES))
4292 @-$(RM) $(@:s/.lib/.lin/)
4293 .IF "$(LIB7OBJFILES)"!=""
4294 @$(TYPE) $(mktmp $(LIB7OBJFILES)) > $(null,$(LIB7OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
4295 @@ -642,8 +696,10 @@ $(LIB7TARGET) : $(LIB7FILES) \
4296 .ENDIF # "$(LIB7FILES)"!=""
4297 .ELSE # "$(GUI)"=="WNT"
4298 @-$(RM) $@
4299 - echo $(LIBMGR) r $@ $(LIB7OBJFILES)
4300 - $(LIBMGR) r $@ $(LIB7OBJFILES) $(LIB7FILES) bla.lib
4301 + .IF "$(VERBOSE)" == "TRUE"
4302 + @echo $(LIBMGR) r $@ $(LIB7OBJFILES)
4303 + .ENDIF
4304 + $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB7OBJFILES) $(LIB7FILES) bla.lib
4305 .ENDIF # "$(GUI)"=="WNT"
4306 .ENDIF # "$(GUI)"=="UNX"
4307 .ENDIF # "$(LIB7TARGET)" != ""
4308 @@ -655,7 +711,7 @@ $(LIB7TARGET) : $(LIB7FILES) \
4309 .IF "$(LIB8ARCHIV)" != ""
4310
4311 $(LIB8ARCHIV) : $(LIB8TARGET)
4312 - @echo Making: $@
4313 + @echo "Making: " $(@:f)
4314 @@-$(RM) $@
4315 .IF "$(GUI)"=="UNX"
4316 @-$(RM) $(MISC)/$(LIB8ARCHIV:b).cmd
4317 @@ -672,14 +728,18 @@ $(LIB8ARCHIV) : $(LIB8TARGET)
4318 .IF "$(OS)" == "MACOSX"
4319 @echo ranlib $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd
4320 .ENDIF
4321 +.IF "$(VERBOSE)" == "TRUE"
4322 @cat $(MISC)/$(LIB8ARCHIV:b).cmd
4323 +.ENDIF
4324 @+source $(MISC)/$(LIB8ARCHIV:b).cmd
4325 .ELSE # "$(GUI)"=="UNX"
4326 .IF "$(GUI)$(COM)"=="WNTGCC"
4327 @+-$(RM) $(MISC)/$(LIB8ARCHIV:b).cmd
4328 @+echo $(LIBMGR) $(LIB8FLAGS) $(LIBFLAGS) $(LIB8ARCHIV) `cat $(LIB8TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB8ARCHIV:b).cmd
4329 @+echo ranlib $(LIB8ARCHIV) >> $(MISC)/$(LIB8ARCHIV:b).cmd
4330 +.IF "$(VERBOSE)" == "TRUE"
4331 @cat $(MISC)/$(LIB8ARCHIV:b).cmd
4332 +.ENDIF
4333 @+source $(MISC)/$(LIB8ARCHIV:b).cmd
4334 .ELSE
4335 @echo just a dummy > $@
4336 @@ -691,10 +751,12 @@ $(LIB8ARCHIV) : $(LIB8TARGET)
4337 $(LIB8TARGET) : $(LIB8FILES) \
4338 $(LIB8OBJFILES) \
4339 $(LIB8DEPN)
4340 +.IF "$(VERBOSE)" == "TRUE"
4341 @echo using: $(LIB8FILES)
4342 @echo using: $(LIB8TARGET)
4343 @echo ------------------------------
4344 - @echo Making: $@
4345 +.ENDIF
4346 + @echo "Making: " $(@:f)
4347 @@-$(RM) $@
4348 .IF "$(GUI)"=="UNX"
4349 @echo $(LIB8OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
4350 @@ -707,7 +769,7 @@ $(LIB8TARGET) : $(LIB8FILES) \
4351 .ENDIF
4352
4353 .ELIF "$(GUI)"=="OS2"
4354 - $(LIBMGR) $(LIBFLAGS) $@ $(LIB8FILES) $(LIB8OBJFILES)
4355 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB8FILES) $(LIB8OBJFILES)
4356 @+-$(RM) $(@:s/.lib/.lin/)
4357 .IF "$(LIB8OBJFILES)"!=""
4358 @+$(TYPE) $(mktmp $(LIB8OBJFILES)) > $(null,$(LIB8OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
4359 @@ -723,7 +785,7 @@ $(LIB8TARGET) : $(LIB8FILES) \
4360 +$(ECHONL) $(LIB8OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
4361 @+cat /dev/null $(LIB8FILES) | xargs -n1 >> $@
4362 .ELSE
4363 - $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB8FILES) $(LIB8OBJFILES))
4364 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB8FILES) $(LIB8OBJFILES))
4365 @-$(RM) $(@:s/.lib/.lin/)
4366 .IF "$(LIB8OBJFILES)"!=""
4367 @$(TYPE) $(mktmp $(LIB8OBJFILES)) > $(null,$(LIB8OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
4368 @@ -735,8 +797,10 @@ $(LIB8TARGET) : $(LIB8FILES) \
4369 .ENDIF # "$(LIB8FILES)"!=""
4370 .ELSE # "$(GUI)"=="WNT"
4371 @-$(RM) $@
4372 - echo $(LIBMGR) r $@ $(LIB8OBJFILES)
4373 - $(LIBMGR) r $@ $(LIB8OBJFILES) $(LIB8FILES) bla.lib
4374 + .IF "$(VERBOSE)" == "TRUE"
4375 + @echo $(LIBMGR) r $@ $(LIB8OBJFILES)
4376 + .ENDIF
4377 + $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB8OBJFILES) $(LIB8FILES) bla.lib
4378 .ENDIF # "$(GUI)"=="WNT"
4379 .ENDIF # "$(GUI)"=="UNX"
4380 .ENDIF # "$(LIB8TARGET)" != ""
4381 @@ -748,7 +812,7 @@ $(LIB8TARGET) : $(LIB8FILES) \
4382 .IF "$(LIB9ARCHIV)" != ""
4383
4384 $(LIB9ARCHIV) : $(LIB9TARGET)
4385 - @echo Making: $@
4386 + @echo "Making: " $(@:f)
4387 @@-$(RM) $@
4388 .IF "$(GUI)"=="UNX"
4389 @-$(RM) $(MISC)/$(LIB9ARCHIV:b).cmd
4390 @@ -765,14 +829,18 @@ $(LIB9ARCHIV) : $(LIB9TARGET)
4391 .IF "$(OS)" == "MACOSX"
4392 @echo ranlib $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd
4393 .ENDIF
4394 +.IF "$(VERBOSE)" == "TRUE"
4395 @cat $(MISC)/$(LIB9ARCHIV:b).cmd
4396 +.ENDIF
4397 @+source $(MISC)/$(LIB9ARCHIV:b).cmd
4398 .ELSE # "$(GUI)"=="UNX"
4399 .IF "$(GUI)$(COM)"=="WNTGCC"
4400 @+-$(RM) $(MISC)/$(LIB9ARCHIV:b).cmd
4401 @+echo $(LIBMGR) $(LIB9FLAGS) $(LIBFLAGS) $(LIB9ARCHIV) `cat $(LIB9TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB9ARCHIV:b).cmd
4402 @+echo ranlib $(LIB9ARCHIV) >> $(MISC)/$(LIB9ARCHIV:b).cmd
4403 +.IF "$(VERBOSE)" == "TRUE"
4404 @cat $(MISC)/$(LIB9ARCHIV:b).cmd
4405 +.ENDIF
4406 @+source $(MISC)/$(LIB9ARCHIV:b).cmd
4407 .ELSE
4408 @echo just a dummy > $@
4409 @@ -784,10 +852,12 @@ $(LIB9ARCHIV) : $(LIB9TARGET)
4410 $(LIB9TARGET) : $(LIB9FILES) \
4411 $(LIB9OBJFILES) \
4412 $(LIB9DEPN)
4413 +.IF "$(VERBOSE)" == "TRUE"
4414 @echo using: $(LIB9FILES)
4415 @echo using: $(LIB9TARGET)
4416 @echo ------------------------------
4417 - @echo Making: $@
4418 +.ENDIF
4419 + @echo "Making: " $(@:f)
4420 @@-$(RM) $@
4421 .IF "$(GUI)"=="UNX"
4422 @echo $(LIB9OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
4423 @@ -800,7 +870,7 @@ $(LIB9TARGET) : $(LIB9FILES) \
4424 .ENDIF
4425
4426 .ELIF "$(GUI)"=="OS2"
4427 - $(LIBMGR) $(LIBFLAGS) $@ $(LIB9FILES) $(LIB9OBJFILES)
4428 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB9FILES) $(LIB9OBJFILES)
4429 @+-$(RM) $(@:s/.lib/.lin/)
4430 .IF "$(LIB9OBJFILES)"!=""
4431 @+$(TYPE) $(mktmp $(LIB9OBJFILES)) > $(null,$(LIB9OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
4432 @@ -816,7 +886,7 @@ $(LIB9TARGET) : $(LIB9FILES) \
4433 +$(ECHONL) $(LIB9OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
4434 @+cat /dev/null $(LIB9FILES) | xargs -n1 >> $@
4435 .ELSE
4436 - $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB9FILES) $(LIB9OBJFILES))
4437 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB9FILES) $(LIB9OBJFILES))
4438 @-$(RM) $(@:s/.lib/.lin/)
4439 .IF "$(LIB9OBJFILES)"!=""
4440 @$(TYPE) $(mktmp $(LIB9OBJFILES)) > $(null,$(LIB9OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
4441 @@ -828,8 +898,10 @@ $(LIB9TARGET) : $(LIB9FILES) \
4442 .ENDIF # "$(LIB9FILES)"!=""
4443 .ELSE # "$(GUI)"=="WNT"
4444 @-$(RM) $@
4445 - echo $(LIBMGR) r $@ $(LIB9OBJFILES)
4446 - $(LIBMGR) r $@ $(LIB9OBJFILES) $(LIB9FILES) bla.lib
4447 + .IF "$(VERBOSE)" == "TRUE"
4448 + @echo $(LIBMGR) r $@ $(LIB9OBJFILES)
4449 + .ENDIF
4450 + $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB9OBJFILES) $(LIB9FILES) bla.lib
4451 .ENDIF # "$(GUI)"=="WNT"
4452 .ENDIF # "$(GUI)"=="UNX"
4453 .ENDIF # "$(LIB9TARGET)" != ""
4454 @@ -841,7 +913,7 @@ $(LIB9TARGET) : $(LIB9FILES) \
4455 .IF "$(LIB10ARCHIV)" != ""
4456
4457 $(LIB10ARCHIV) : $(LIB10TARGET)
4458 - @echo Making: $@
4459 + @echo "Making: " $(@:f)
4460 @@-$(RM) $@
4461 .IF "$(GUI)"=="UNX"
4462 @-$(RM) $(MISC)/$(LIB10ARCHIV:b).cmd
4463 @@ -858,14 +930,18 @@ $(LIB10ARCHIV) : $(LIB10TARGET)
4464 .IF "$(OS)" == "MACOSX"
4465 @echo ranlib $(LIB10ARCHIV) >> $(MISC)/$(LIB10ARCHIV:b).cmd
4466 .ENDIF
4467 +.IF "$(VERBOSE)" == "TRUE"
4468 @cat $(MISC)/$(LIB10ARCHIV:b).cmd
4469 +.ENDIF
4470 @+source $(MISC)/$(LIB10ARCHIV:b).cmd
4471 .ELSE # "$(GUI)"=="UNX"
4472 .IF "$(GUI)$(COM)"=="WNTGCC"
4473 @+-$(RM) $(MISC)/$(LIB10ARCHIV:b).cmd
4474 @+echo $(LIBMGR) $(LIB10FLAGS) $(LIBFLAGS) $(LIB10ARCHIV) `cat $(LIB10TARGET) | sed s#'^'$(ROUT)#$(PRJ)/$(ROUT)#g` > $(MISC)/$(LIB10ARCHIV:b).cmd
4475 @+echo ranlib $(LIB10ARCHIV) >> $(MISC)/$(LIB10ARCHIV:b).cmd
4476 +.IF "$(VERBOSE)" == "TRUE"
4477 @cat $(MISC)/$(LIB10ARCHIV:b).cmd
4478 +.ENDIF
4479 @+source $(MISC)/$(LIB10ARCHIV:b).cmd
4480 .ELSE
4481 @echo just a dummy > $@
4482 @@ -877,10 +953,12 @@ $(LIB10ARCHIV) : $(LIB10TARGET)
4483 $(LIB10TARGET) : $(LIB10FILES) \
4484 $(LIB10OBJFILES) \
4485 $(LIB10DEPN)
4486 +.IF "$(VERBOSE)" == "TRUE"
4487 @echo using: $(LIB10FILES)
4488 @echo using: $(LIB10TARGET)
4489 @echo ------------------------------
4490 - @echo Making: $@
4491 +.ENDIF
4492 + @echo "Making: " $(@:f)
4493 @@-$(RM) $@
4494 .IF "$(GUI)"=="UNX"
4495 @echo $(LIB10OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
4496 @@ -893,7 +971,7 @@ $(LIB10TARGET) : $(LIB10FILES) \
4497 .ENDIF
4498
4499 .ELIF "$(GUI)"=="OS2"
4500 - $(LIBMGR) $(LIBFLAGS) $@ $(LIB10FILES) $(LIB10OBJFILES)
4501 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB10FILES) $(LIB10OBJFILES)
4502 @+-$(RM) $(@:s/.lib/.lin/)
4503 .IF "$(LIB10OBJFILES)"!=""
4504 @+$(TYPE) $(mktmp $(LIB10OBJFILES)) > $(null,$(LIB10OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
4505 @@ -909,7 +987,7 @@ $(LIB10TARGET) : $(LIB10FILES) \
4506 +$(ECHONL) $(LIB10OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
4507 @+cat /dev/null $(LIB10FILES) | xargs -n1 >> $@
4508 .ELSE
4509 - $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB10FILES) $(LIB10OBJFILES))
4510 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB10FILES) $(LIB10OBJFILES))
4511 @-$(RM) $(@:s/.lib/.lin/)
4512 .IF "$(LIB10OBJFILES)"!=""
4513 @$(TYPE) $(mktmp $(LIB10OBJFILES)) > $(null,$(LIB10OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
4514 @@ -921,8 +999,10 @@ $(LIB10TARGET) : $(LIB10FILES) \
4515 .ENDIF # "$(LIB10FILES)"!=""
4516 .ELSE # "$(GUI)"=="WNT"
4517 @-$(RM) $@
4518 - echo $(LIBMGR) r $@ $(LIB10OBJFILES)
4519 - $(LIBMGR) r $@ $(LIB10OBJFILES) $(LIB10FILES) bla.lib
4520 + .IF "$(VERBOSE)" == "TRUE"
4521 + @echo $(LIBMGR) r $@ $(LIB10OBJFILES)
4522 + .ENDIF
4523 + $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB10OBJFILES) $(LIB10FILES) bla.lib
4524 .ENDIF # "$(GUI)"=="WNT"
4525 .ENDIF # "$(GUI)"=="UNX"
4526 .ENDIF # "$(LIB10TARGET)" != ""
4527 diff --git solenv/inc/_tg_rslb.mk solenv/inc/_tg_rslb.mk
4528 index e6d0639..08ffdd2 100644
4529 --- solenv/inc/_tg_rslb.mk
4530 +++ solenv/inc/_tg_rslb.mk
4531 @@ -8,11 +8,13 @@ HIDRES1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB1NAME)_res.
4532 #HACK cut off the dirty srs files which are included from solver
4533 RESLIB1HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB1SRSFILES)))
4534 $(HIDRES1PARTICLE): $(RESLIB1HIDFILES)
4535 +.IF "$(VERBOSE)" == "TRUE"
4536 @echo ------------------------------
4537 - @echo Making: $@
4538 +.ENDIF
4539 + @echo "Making: " $(@:f)
4540 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
4541 # need to strip since solaris cannot handle tab-only whitespace here
4542 - $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB1HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4543 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB1HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4544 @$(RENAME) $@.$(ROUT).tmp $@
4545
4546 ALLTAR : $(HIDRES1PARTICLE)
4547 @@ -23,9 +25,9 @@ $(RSC_MULTI1) : \
4548 $(RESLIB1SRSFILES) \
4549 $(RESLIB1TARGETN) \
4550 $(RESLIB1BMPS)
4551 - @echo using rsc multi-res feature
4552 + @echo Compiling: $(@:f)
4553 .IF "$(common_build_reslib)"!=""
4554 - $(RSC) -presponse @$(mktmp \
4555 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4556 -r -p \
4557 $(foreach,i,$(alllangiso) -lg$i \
4558 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4559 @@ -40,7 +42,7 @@ $(RSC_MULTI1) : \
4560 $(RSC1HEADER) $(RESLIB1SRSFILES) \
4561 ) > $(NULLDEV)
4562 .ELSE # "$(common_build_reslib)"!=""
4563 - $(RSC) -presponse @$(mktmp \
4564 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4565 -r -p \
4566 $(foreach,i,$(alllangiso) -lg$i \
4567 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4568 @@ -59,7 +61,7 @@ $(RSC_MULTI1) : \
4569 $(RESLIB1TARGETN): \
4570 $(RESLIB1SRSFILES) \
4571 $(RESLIB1BMPS)
4572 - @echo Making: $@
4573 + @echo "Making: " $(@:f)
4574 .IF "$(GUI)"=="UNX"
4575 .IF "$(common_build_reslib)"!=""
4576 @@-$(RM) $(RSC_MULTI1)
4577 @@ -86,11 +88,13 @@ HIDRES2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB2NAME)_res.
4578 #HACK cut off the dirty srs files which are included from solver
4579 RESLIB2HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB2SRSFILES)))
4580 $(HIDRES2PARTICLE): $(RESLIB2HIDFILES)
4581 +.IF "$(VERBOSE)" == "TRUE"
4582 @echo ------------------------------
4583 - @echo Making: $@
4584 +.ENDIF
4585 + @echo "Making: " $(@:f)
4586 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
4587 # need to strip since solaris cannot handle tab-only whitespace here
4588 - $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB2HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4589 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB2HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4590 @$(RENAME) $@.$(ROUT).tmp $@
4591
4592 ALLTAR : $(HIDRES2PARTICLE)
4593 @@ -101,9 +105,9 @@ $(RSC_MULTI2) : \
4594 $(RESLIB2SRSFILES) \
4595 $(RESLIB2TARGETN) \
4596 $(RESLIB2BMPS)
4597 - @echo using rsc multi-res feature
4598 + @echo Compiling: $(@:f)
4599 .IF "$(common_build_reslib)"!=""
4600 - $(RSC) -presponse @$(mktmp \
4601 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4602 -r -p \
4603 $(foreach,i,$(alllangiso) -lg$i \
4604 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4605 @@ -118,7 +122,7 @@ $(RSC_MULTI2) : \
4606 $(RSC2HEADER) $(RESLIB2SRSFILES) \
4607 ) > $(NULLDEV)
4608 .ELSE # "$(common_build_reslib)"!=""
4609 - $(RSC) -presponse @$(mktmp \
4610 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4611 -r -p \
4612 $(foreach,i,$(alllangiso) -lg$i \
4613 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4614 @@ -137,7 +141,7 @@ $(RSC_MULTI2) : \
4615 $(RESLIB2TARGETN): \
4616 $(RESLIB2SRSFILES) \
4617 $(RESLIB2BMPS)
4618 - @echo Making: $@
4619 + @echo "Making: " $(@:f)
4620 .IF "$(GUI)"=="UNX"
4621 .IF "$(common_build_reslib)"!=""
4622 @@-$(RM) $(RSC_MULTI2)
4623 @@ -164,11 +168,13 @@ HIDRES3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB3NAME)_res.
4624 #HACK cut off the dirty srs files which are included from solver
4625 RESLIB3HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB3SRSFILES)))
4626 $(HIDRES3PARTICLE): $(RESLIB3HIDFILES)
4627 +.IF "$(VERBOSE)" == "TRUE"
4628 @echo ------------------------------
4629 - @echo Making: $@
4630 +.ENDIF
4631 + @echo "Making: " $(@:f)
4632 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
4633 # need to strip since solaris cannot handle tab-only whitespace here
4634 - $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB3HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4635 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB3HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4636 @$(RENAME) $@.$(ROUT).tmp $@
4637
4638 ALLTAR : $(HIDRES3PARTICLE)
4639 @@ -179,9 +185,9 @@ $(RSC_MULTI3) : \
4640 $(RESLIB3SRSFILES) \
4641 $(RESLIB3TARGETN) \
4642 $(RESLIB3BMPS)
4643 - @echo using rsc multi-res feature
4644 + @echo Compiling: $(@:f)
4645 .IF "$(common_build_reslib)"!=""
4646 - $(RSC) -presponse @$(mktmp \
4647 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4648 -r -p \
4649 $(foreach,i,$(alllangiso) -lg$i \
4650 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4651 @@ -196,7 +202,7 @@ $(RSC_MULTI3) : \
4652 $(RSC3HEADER) $(RESLIB3SRSFILES) \
4653 ) > $(NULLDEV)
4654 .ELSE # "$(common_build_reslib)"!=""
4655 - $(RSC) -presponse @$(mktmp \
4656 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4657 -r -p \
4658 $(foreach,i,$(alllangiso) -lg$i \
4659 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4660 @@ -215,7 +221,7 @@ $(RSC_MULTI3) : \
4661 $(RESLIB3TARGETN): \
4662 $(RESLIB3SRSFILES) \
4663 $(RESLIB3BMPS)
4664 - @echo Making: $@
4665 + @echo "Making: " $(@:f)
4666 .IF "$(GUI)"=="UNX"
4667 .IF "$(common_build_reslib)"!=""
4668 @@-$(RM) $(RSC_MULTI3)
4669 @@ -242,11 +248,13 @@ HIDRES4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB4NAME)_res.
4670 #HACK cut off the dirty srs files which are included from solver
4671 RESLIB4HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB4SRSFILES)))
4672 $(HIDRES4PARTICLE): $(RESLIB4HIDFILES)
4673 +.IF "$(VERBOSE)" == "TRUE"
4674 @echo ------------------------------
4675 - @echo Making: $@
4676 +.ENDIF
4677 + @echo "Making: " $(@:f)
4678 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
4679 # need to strip since solaris cannot handle tab-only whitespace here
4680 - $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB4HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4681 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB4HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4682 @$(RENAME) $@.$(ROUT).tmp $@
4683
4684 ALLTAR : $(HIDRES4PARTICLE)
4685 @@ -257,9 +265,9 @@ $(RSC_MULTI4) : \
4686 $(RESLIB4SRSFILES) \
4687 $(RESLIB4TARGETN) \
4688 $(RESLIB4BMPS)
4689 - @echo using rsc multi-res feature
4690 + @echo Compiling: $(@:f)
4691 .IF "$(common_build_reslib)"!=""
4692 - $(RSC) -presponse @$(mktmp \
4693 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4694 -r -p \
4695 $(foreach,i,$(alllangiso) -lg$i \
4696 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4697 @@ -274,7 +282,7 @@ $(RSC_MULTI4) : \
4698 $(RSC4HEADER) $(RESLIB4SRSFILES) \
4699 ) > $(NULLDEV)
4700 .ELSE # "$(common_build_reslib)"!=""
4701 - $(RSC) -presponse @$(mktmp \
4702 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4703 -r -p \
4704 $(foreach,i,$(alllangiso) -lg$i \
4705 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4706 @@ -293,7 +301,7 @@ $(RSC_MULTI4) : \
4707 $(RESLIB4TARGETN): \
4708 $(RESLIB4SRSFILES) \
4709 $(RESLIB4BMPS)
4710 - @echo Making: $@
4711 + @echo "Making: " $(@:f)
4712 .IF "$(GUI)"=="UNX"
4713 .IF "$(common_build_reslib)"!=""
4714 @@-$(RM) $(RSC_MULTI4)
4715 @@ -320,11 +328,13 @@ HIDRES5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB5NAME)_res.
4716 #HACK cut off the dirty srs files which are included from solver
4717 RESLIB5HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB5SRSFILES)))
4718 $(HIDRES5PARTICLE): $(RESLIB5HIDFILES)
4719 +.IF "$(VERBOSE)" == "TRUE"
4720 @echo ------------------------------
4721 - @echo Making: $@
4722 +.ENDIF
4723 + @echo "Making: " $(@:f)
4724 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
4725 # need to strip since solaris cannot handle tab-only whitespace here
4726 - $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB5HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4727 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB5HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4728 @$(RENAME) $@.$(ROUT).tmp $@
4729
4730 ALLTAR : $(HIDRES5PARTICLE)
4731 @@ -335,9 +345,9 @@ $(RSC_MULTI5) : \
4732 $(RESLIB5SRSFILES) \
4733 $(RESLIB5TARGETN) \
4734 $(RESLIB5BMPS)
4735 - @echo using rsc multi-res feature
4736 + @echo Compiling: $(@:f)
4737 .IF "$(common_build_reslib)"!=""
4738 - $(RSC) -presponse @$(mktmp \
4739 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4740 -r -p \
4741 $(foreach,i,$(alllangiso) -lg$i \
4742 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4743 @@ -352,7 +362,7 @@ $(RSC_MULTI5) : \
4744 $(RSC5HEADER) $(RESLIB5SRSFILES) \
4745 ) > $(NULLDEV)
4746 .ELSE # "$(common_build_reslib)"!=""
4747 - $(RSC) -presponse @$(mktmp \
4748 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4749 -r -p \
4750 $(foreach,i,$(alllangiso) -lg$i \
4751 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4752 @@ -371,7 +381,7 @@ $(RSC_MULTI5) : \
4753 $(RESLIB5TARGETN): \
4754 $(RESLIB5SRSFILES) \
4755 $(RESLIB5BMPS)
4756 - @echo Making: $@
4757 + @echo "Making: " $(@:f)
4758 .IF "$(GUI)"=="UNX"
4759 .IF "$(common_build_reslib)"!=""
4760 @@-$(RM) $(RSC_MULTI5)
4761 @@ -398,11 +408,13 @@ HIDRES6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB6NAME)_res.
4762 #HACK cut off the dirty srs files which are included from solver
4763 RESLIB6HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB6SRSFILES)))
4764 $(HIDRES6PARTICLE): $(RESLIB6HIDFILES)
4765 +.IF "$(VERBOSE)" == "TRUE"
4766 @echo ------------------------------
4767 - @echo Making: $@
4768 +.ENDIF
4769 + @echo "Making: " $(@:f)
4770 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
4771 # need to strip since solaris cannot handle tab-only whitespace here
4772 - $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB6HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4773 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB6HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4774 @$(RENAME) $@.$(ROUT).tmp $@
4775
4776 ALLTAR : $(HIDRES6PARTICLE)
4777 @@ -413,9 +425,9 @@ $(RSC_MULTI6) : \
4778 $(RESLIB6SRSFILES) \
4779 $(RESLIB6TARGETN) \
4780 $(RESLIB6BMPS)
4781 - @echo using rsc multi-res feature
4782 + @echo Compiling: $(@:f)
4783 .IF "$(common_build_reslib)"!=""
4784 - $(RSC) -presponse @$(mktmp \
4785 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4786 -r -p \
4787 $(foreach,i,$(alllangiso) -lg$i \
4788 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4789 @@ -430,7 +442,7 @@ $(RSC_MULTI6) : \
4790 $(RSC6HEADER) $(RESLIB6SRSFILES) \
4791 ) > $(NULLDEV)
4792 .ELSE # "$(common_build_reslib)"!=""
4793 - $(RSC) -presponse @$(mktmp \
4794 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4795 -r -p \
4796 $(foreach,i,$(alllangiso) -lg$i \
4797 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4798 @@ -449,7 +461,7 @@ $(RSC_MULTI6) : \
4799 $(RESLIB6TARGETN): \
4800 $(RESLIB6SRSFILES) \
4801 $(RESLIB6BMPS)
4802 - @echo Making: $@
4803 + @echo "Making: " $(@:f)
4804 .IF "$(GUI)"=="UNX"
4805 .IF "$(common_build_reslib)"!=""
4806 @@-$(RM) $(RSC_MULTI6)
4807 @@ -476,11 +488,13 @@ HIDRES7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB7NAME)_res.
4808 #HACK cut off the dirty srs files which are included from solver
4809 RESLIB7HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB7SRSFILES)))
4810 $(HIDRES7PARTICLE): $(RESLIB7HIDFILES)
4811 +.IF "$(VERBOSE)" == "TRUE"
4812 @echo ------------------------------
4813 - @echo Making: $@
4814 +.ENDIF
4815 + @echo "Making: " $(@:f)
4816 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
4817 # need to strip since solaris cannot handle tab-only whitespace here
4818 - $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB7HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4819 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB7HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4820 @$(RENAME) $@.$(ROUT).tmp $@
4821
4822 ALLTAR : $(HIDRES7PARTICLE)
4823 @@ -491,9 +505,9 @@ $(RSC_MULTI7) : \
4824 $(RESLIB7SRSFILES) \
4825 $(RESLIB7TARGETN) \
4826 $(RESLIB7BMPS)
4827 - @echo using rsc multi-res feature
4828 + @echo Compiling: $(@:f)
4829 .IF "$(common_build_reslib)"!=""
4830 - $(RSC) -presponse @$(mktmp \
4831 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4832 -r -p \
4833 $(foreach,i,$(alllangiso) -lg$i \
4834 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4835 @@ -508,7 +522,7 @@ $(RSC_MULTI7) : \
4836 $(RSC7HEADER) $(RESLIB7SRSFILES) \
4837 ) > $(NULLDEV)
4838 .ELSE # "$(common_build_reslib)"!=""
4839 - $(RSC) -presponse @$(mktmp \
4840 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4841 -r -p \
4842 $(foreach,i,$(alllangiso) -lg$i \
4843 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4844 @@ -527,7 +541,7 @@ $(RSC_MULTI7) : \
4845 $(RESLIB7TARGETN): \
4846 $(RESLIB7SRSFILES) \
4847 $(RESLIB7BMPS)
4848 - @echo Making: $@
4849 + @echo "Making: " $(@:f)
4850 .IF "$(GUI)"=="UNX"
4851 .IF "$(common_build_reslib)"!=""
4852 @@-$(RM) $(RSC_MULTI7)
4853 @@ -554,11 +568,13 @@ HIDRES8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB8NAME)_res.
4854 #HACK cut off the dirty srs files which are included from solver
4855 RESLIB8HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB8SRSFILES)))
4856 $(HIDRES8PARTICLE): $(RESLIB8HIDFILES)
4857 +.IF "$(VERBOSE)" == "TRUE"
4858 @echo ------------------------------
4859 - @echo Making: $@
4860 +.ENDIF
4861 + @echo "Making: " $(@:f)
4862 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
4863 # need to strip since solaris cannot handle tab-only whitespace here
4864 - $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB8HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4865 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB8HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4866 @$(RENAME) $@.$(ROUT).tmp $@
4867
4868 ALLTAR : $(HIDRES8PARTICLE)
4869 @@ -569,9 +585,9 @@ $(RSC_MULTI8) : \
4870 $(RESLIB8SRSFILES) \
4871 $(RESLIB8TARGETN) \
4872 $(RESLIB8BMPS)
4873 - @echo using rsc multi-res feature
4874 + @echo Compiling: $(@:f)
4875 .IF "$(common_build_reslib)"!=""
4876 - $(RSC) -presponse @$(mktmp \
4877 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4878 -r -p \
4879 $(foreach,i,$(alllangiso) -lg$i \
4880 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4881 @@ -586,7 +602,7 @@ $(RSC_MULTI8) : \
4882 $(RSC8HEADER) $(RESLIB8SRSFILES) \
4883 ) > $(NULLDEV)
4884 .ELSE # "$(common_build_reslib)"!=""
4885 - $(RSC) -presponse @$(mktmp \
4886 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4887 -r -p \
4888 $(foreach,i,$(alllangiso) -lg$i \
4889 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4890 @@ -605,7 +621,7 @@ $(RSC_MULTI8) : \
4891 $(RESLIB8TARGETN): \
4892 $(RESLIB8SRSFILES) \
4893 $(RESLIB8BMPS)
4894 - @echo Making: $@
4895 + @echo "Making: " $(@:f)
4896 .IF "$(GUI)"=="UNX"
4897 .IF "$(common_build_reslib)"!=""
4898 @@-$(RM) $(RSC_MULTI8)
4899 @@ -632,11 +648,13 @@ HIDRES9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB9NAME)_res.
4900 #HACK cut off the dirty srs files which are included from solver
4901 RESLIB9HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB9SRSFILES)))
4902 $(HIDRES9PARTICLE): $(RESLIB9HIDFILES)
4903 +.IF "$(VERBOSE)" == "TRUE"
4904 @echo ------------------------------
4905 - @echo Making: $@
4906 +.ENDIF
4907 + @echo "Making: " $(@:f)
4908 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
4909 # need to strip since solaris cannot handle tab-only whitespace here
4910 - $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB9HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4911 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB9HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4912 @$(RENAME) $@.$(ROUT).tmp $@
4913
4914 ALLTAR : $(HIDRES9PARTICLE)
4915 @@ -647,9 +665,9 @@ $(RSC_MULTI9) : \
4916 $(RESLIB9SRSFILES) \
4917 $(RESLIB9TARGETN) \
4918 $(RESLIB9BMPS)
4919 - @echo using rsc multi-res feature
4920 + @echo Compiling: $(@:f)
4921 .IF "$(common_build_reslib)"!=""
4922 - $(RSC) -presponse @$(mktmp \
4923 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4924 -r -p \
4925 $(foreach,i,$(alllangiso) -lg$i \
4926 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4927 @@ -664,7 +682,7 @@ $(RSC_MULTI9) : \
4928 $(RSC9HEADER) $(RESLIB9SRSFILES) \
4929 ) > $(NULLDEV)
4930 .ELSE # "$(common_build_reslib)"!=""
4931 - $(RSC) -presponse @$(mktmp \
4932 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4933 -r -p \
4934 $(foreach,i,$(alllangiso) -lg$i \
4935 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4936 @@ -683,7 +701,7 @@ $(RSC_MULTI9) : \
4937 $(RESLIB9TARGETN): \
4938 $(RESLIB9SRSFILES) \
4939 $(RESLIB9BMPS)
4940 - @echo Making: $@
4941 + @echo "Making: " $(@:f)
4942 .IF "$(GUI)"=="UNX"
4943 .IF "$(common_build_reslib)"!=""
4944 @@-$(RM) $(RSC_MULTI9)
4945 @@ -710,11 +728,13 @@ HIDRES10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB10NAME)_re
4946 #HACK cut off the dirty srs files which are included from solver
4947 RESLIB10HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB10SRSFILES)))
4948 $(HIDRES10PARTICLE): $(RESLIB10HIDFILES)
4949 +.IF "$(VERBOSE)" == "TRUE"
4950 @echo ------------------------------
4951 - @echo Making: $@
4952 +.ENDIF
4953 + @echo "Making: " $(@:f)
4954 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
4955 # need to strip since solaris cannot handle tab-only whitespace here
4956 - $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB10HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4957 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB10HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
4958 @$(RENAME) $@.$(ROUT).tmp $@
4959
4960 ALLTAR : $(HIDRES10PARTICLE)
4961 @@ -725,9 +745,9 @@ $(RSC_MULTI10) : \
4962 $(RESLIB10SRSFILES) \
4963 $(RESLIB10TARGETN) \
4964 $(RESLIB10BMPS)
4965 - @echo using rsc multi-res feature
4966 + @echo Compiling: $(@:f)
4967 .IF "$(common_build_reslib)"!=""
4968 - $(RSC) -presponse @$(mktmp \
4969 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4970 -r -p \
4971 $(foreach,i,$(alllangiso) -lg$i \
4972 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4973 @@ -742,7 +762,7 @@ $(RSC_MULTI10) : \
4974 $(RSC10HEADER) $(RESLIB10SRSFILES) \
4975 ) > $(NULLDEV)
4976 .ELSE # "$(common_build_reslib)"!=""
4977 - $(RSC) -presponse @$(mktmp \
4978 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
4979 -r -p \
4980 $(foreach,i,$(alllangiso) -lg$i \
4981 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
4982 @@ -761,7 +781,7 @@ $(RSC_MULTI10) : \
4983 $(RESLIB10TARGETN): \
4984 $(RESLIB10SRSFILES) \
4985 $(RESLIB10BMPS)
4986 - @echo Making: $@
4987 + @echo "Making: " $(@:f)
4988 .IF "$(GUI)"=="UNX"
4989 .IF "$(common_build_reslib)"!=""
4990 @@-$(RM) $(RSC_MULTI10)
4991 diff --git solenv/inc/_tg_scp.mk solenv/inc/_tg_scp.mk
4992 index ea37f37..288bfa4 100644
4993 --- solenv/inc/_tg_scp.mk
4994 +++ solenv/inc/_tg_scp.mk
4995 @@ -5,15 +5,17 @@
4996 # try to get missing parfiles
4997 $(PAR)/%.par : $(SOLARPARDIR)/%.par
4998 @@-$(MKDIRHIER) $(@:d:d)
4999 - $(COPY) $< $@
5000 + $(COMMAND_ECHO)$(COPY) $< $@
5001
5002 LOCALSCP1FILES=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
5003
5004 $(SCP1TARGETN): $(LOCALSCP1FILES)
5005 +.IF "$(VERBOSE)" == "TRUE"
5006 @echo ------------------------------
5007 - @echo Making: $@
5008 +.ENDIF
5009 + @echo "Making: " $(@:f)
5010 @@-$(MKDIRHIER) $(BIN)/$(SCP1LINK_PRODUCT_TYPE)
5011 - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP1FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5012 + $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP1FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5013 .ENDIF
5014
5015 # Anweisungen fuer das Linken
5016 @@ -24,15 +26,17 @@ $(SCP1TARGETN): $(LOCALSCP1FILES)
5017 # try to get missing parfiles
5018 $(PAR)/%.par : $(SOLARPARDIR)/%.par
5019 @@-$(MKDIRHIER) $(@:d:d)
5020 - $(COPY) $< $@
5021 + $(COMMAND_ECHO)$(COPY) $< $@
5022
5023 LOCALSCP2FILES=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
5024
5025 $(SCP2TARGETN): $(LOCALSCP2FILES)
5026 +.IF "$(VERBOSE)" == "TRUE"
5027 @echo ------------------------------
5028 - @echo Making: $@
5029 +.ENDIF
5030 + @echo "Making: " $(@:f)
5031 @@-$(MKDIRHIER) $(BIN)/$(SCP2LINK_PRODUCT_TYPE)
5032 - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP2FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5033 + $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP2FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5034 .ENDIF
5035
5036 # Anweisungen fuer das Linken
5037 @@ -43,15 +47,17 @@ $(SCP2TARGETN): $(LOCALSCP2FILES)
5038 # try to get missing parfiles
5039 $(PAR)/%.par : $(SOLARPARDIR)/%.par
5040 @@-$(MKDIRHIER) $(@:d:d)
5041 - $(COPY) $< $@
5042 + $(COMMAND_ECHO)$(COPY) $< $@
5043
5044 LOCALSCP3FILES=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
5045
5046 $(SCP3TARGETN): $(LOCALSCP3FILES)
5047 +.IF "$(VERBOSE)" == "TRUE"
5048 @echo ------------------------------
5049 - @echo Making: $@
5050 +.ENDIF
5051 + @echo "Making: " $(@:f)
5052 @@-$(MKDIRHIER) $(BIN)/$(SCP3LINK_PRODUCT_TYPE)
5053 - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP3FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5054 + $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP3FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5055 .ENDIF
5056
5057 # Anweisungen fuer das Linken
5058 @@ -62,15 +68,17 @@ $(SCP3TARGETN): $(LOCALSCP3FILES)
5059 # try to get missing parfiles
5060 $(PAR)/%.par : $(SOLARPARDIR)/%.par
5061 @@-$(MKDIRHIER) $(@:d:d)
5062 - $(COPY) $< $@
5063 + $(COMMAND_ECHO)$(COPY) $< $@
5064
5065 LOCALSCP4FILES=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
5066
5067 $(SCP4TARGETN): $(LOCALSCP4FILES)
5068 +.IF "$(VERBOSE)" == "TRUE"
5069 @echo ------------------------------
5070 - @echo Making: $@
5071 +.ENDIF
5072 + @echo "Making: " $(@:f)
5073 @@-$(MKDIRHIER) $(BIN)/$(SCP4LINK_PRODUCT_TYPE)
5074 - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP4FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5075 + $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP4FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5076 .ENDIF
5077
5078 # Anweisungen fuer das Linken
5079 @@ -81,15 +89,17 @@ $(SCP4TARGETN): $(LOCALSCP4FILES)
5080 # try to get missing parfiles
5081 $(PAR)/%.par : $(SOLARPARDIR)/%.par
5082 @@-$(MKDIRHIER) $(@:d:d)
5083 - $(COPY) $< $@
5084 + $(COMMAND_ECHO)$(COPY) $< $@
5085
5086 LOCALSCP5FILES=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
5087
5088 $(SCP5TARGETN): $(LOCALSCP5FILES)
5089 +.IF "$(VERBOSE)" == "TRUE"
5090 @echo ------------------------------
5091 - @echo Making: $@
5092 +.ENDIF
5093 + @echo "Making: " $(@:f)
5094 @@-$(MKDIRHIER) $(BIN)/$(SCP5LINK_PRODUCT_TYPE)
5095 - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP5FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5096 + $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP5FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5097 .ENDIF
5098
5099 # Anweisungen fuer das Linken
5100 @@ -100,15 +110,17 @@ $(SCP5TARGETN): $(LOCALSCP5FILES)
5101 # try to get missing parfiles
5102 $(PAR)/%.par : $(SOLARPARDIR)/%.par
5103 @@-$(MKDIRHIER) $(@:d:d)
5104 - $(COPY) $< $@
5105 + $(COMMAND_ECHO)$(COPY) $< $@
5106
5107 LOCALSCP6FILES=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
5108
5109 $(SCP6TARGETN): $(LOCALSCP6FILES)
5110 +.IF "$(VERBOSE)" == "TRUE"
5111 @echo ------------------------------
5112 - @echo Making: $@
5113 +.ENDIF
5114 + @echo "Making: " $(@:f)
5115 @@-$(MKDIRHIER) $(BIN)/$(SCP6LINK_PRODUCT_TYPE)
5116 - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP6FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5117 + $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP6FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5118 .ENDIF
5119
5120 # Anweisungen fuer das Linken
5121 @@ -119,15 +131,17 @@ $(SCP6TARGETN): $(LOCALSCP6FILES)
5122 # try to get missing parfiles
5123 $(PAR)/%.par : $(SOLARPARDIR)/%.par
5124 @@-$(MKDIRHIER) $(@:d:d)
5125 - $(COPY) $< $@
5126 + $(COMMAND_ECHO)$(COPY) $< $@
5127
5128 LOCALSCP7FILES=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
5129
5130 $(SCP7TARGETN): $(LOCALSCP7FILES)
5131 +.IF "$(VERBOSE)" == "TRUE"
5132 @echo ------------------------------
5133 - @echo Making: $@
5134 +.ENDIF
5135 + @echo "Making: " $(@:f)
5136 @@-$(MKDIRHIER) $(BIN)/$(SCP7LINK_PRODUCT_TYPE)
5137 - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP7FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5138 + $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP7FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5139 .ENDIF
5140
5141 # Anweisungen fuer das Linken
5142 @@ -138,15 +152,17 @@ $(SCP7TARGETN): $(LOCALSCP7FILES)
5143 # try to get missing parfiles
5144 $(PAR)/%.par : $(SOLARPARDIR)/%.par
5145 @@-$(MKDIRHIER) $(@:d:d)
5146 - $(COPY) $< $@
5147 + $(COMMAND_ECHO)$(COPY) $< $@
5148
5149 LOCALSCP8FILES=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
5150
5151 $(SCP8TARGETN): $(LOCALSCP8FILES)
5152 +.IF "$(VERBOSE)" == "TRUE"
5153 @echo ------------------------------
5154 - @echo Making: $@
5155 +.ENDIF
5156 + @echo "Making: " $(@:f)
5157 @@-$(MKDIRHIER) $(BIN)/$(SCP8LINK_PRODUCT_TYPE)
5158 - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP8FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5159 + $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP8FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5160 .ENDIF
5161
5162 # Anweisungen fuer das Linken
5163 @@ -157,15 +173,17 @@ $(SCP8TARGETN): $(LOCALSCP8FILES)
5164 # try to get missing parfiles
5165 $(PAR)/%.par : $(SOLARPARDIR)/%.par
5166 @@-$(MKDIRHIER) $(@:d:d)
5167 - $(COPY) $< $@
5168 + $(COMMAND_ECHO)$(COPY) $< $@
5169
5170 LOCALSCP9FILES=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
5171
5172 $(SCP9TARGETN): $(LOCALSCP9FILES)
5173 +.IF "$(VERBOSE)" == "TRUE"
5174 @echo ------------------------------
5175 - @echo Making: $@
5176 +.ENDIF
5177 + @echo "Making: " $(@:f)
5178 @@-$(MKDIRHIER) $(BIN)/$(SCP9LINK_PRODUCT_TYPE)
5179 - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP9FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5180 + $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP9FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5181 .ENDIF
5182
5183 # Anweisungen fuer das Linken
5184 @@ -176,15 +194,17 @@ $(SCP9TARGETN): $(LOCALSCP9FILES)
5185 # try to get missing parfiles
5186 $(PAR)/%.par : $(SOLARPARDIR)/%.par
5187 @@-$(MKDIRHIER) $(@:d:d)
5188 - $(COPY) $< $@
5189 + $(COMMAND_ECHO)$(COPY) $< $@
5190
5191 LOCALSCP10FILES=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
5192
5193 $(SCP10TARGETN): $(LOCALSCP10FILES)
5194 +.IF "$(VERBOSE)" == "TRUE"
5195 @echo ------------------------------
5196 - @echo Making: $@
5197 +.ENDIF
5198 + @echo "Making: " $(@:f)
5199 @@-$(MKDIRHIER) $(BIN)/$(SCP10LINK_PRODUCT_TYPE)
5200 - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP10FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5201 + $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP10FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
5202 .ENDIF
5203
5204 # Anweisungen fuer das Linken
5205 diff --git solenv/inc/_tg_sdi.mk solenv/inc/_tg_sdi.mk
5206 index c10ad54..b2e40c3 100644
5207 --- solenv/inc/_tg_sdi.mk
5208 +++ solenv/inc/_tg_sdi.mk
5209 @@ -2,8 +2,10 @@
5210
5211 .IF "$(HIDSID1PARTICLE)"!=""
5212 $(HIDSID1PARTICLE): $(SDI1TARGET)
5213 +.IF "$(VERBOSE)" == "TRUE"
5214 @echo ------------------------------
5215 - @echo Making: $@
5216 +.ENDIF
5217 + @echo "Making: " $(@:f)
5218 @-$(RM) $@.$(ROUT).tmp $@
5219 @$(TYPE) $(MISC)/$(SDI1NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
5220 @-$(RM) $@
5221 @@ -12,10 +14,13 @@ $(HIDSID1PARTICLE): $(SDI1TARGET)
5222
5223 .IF "$(SDI1TARGET)"!=""
5224 $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
5225 +.IF "$(VERBOSE)" == "TRUE"
5226 @echo ------------------------------
5227 - @echo Making: $@
5228 +.ENDIF
5229 + @echo "Making: " $(@:f)
5230 @-$(RM) $@
5231 - $(SVIDL) @$(mktmp \
5232 + $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
5233 + $(VERBOSITY) \
5234 -fs$(INCCOMX)/$(SDI1NAME).hxx \
5235 -fd$(INCCOMX)/$(SDI1NAME).ilb \
5236 -fm$(MISC)/$(SDI1NAME).don \
5237 @@ -30,8 +35,10 @@ $(SDI1TARGET): $(SVSDI1DEPEND) $(SDI1NAME).sdi
5238
5239 .IF "$(HIDSID2PARTICLE)"!=""
5240 $(HIDSID2PARTICLE): $(SDI2TARGET)
5241 +.IF "$(VERBOSE)" == "TRUE"
5242 @echo ------------------------------
5243 - @echo Making: $@
5244 +.ENDIF
5245 + @echo "Making: " $(@:f)
5246 @-$(RM) $@.$(ROUT).tmp $@
5247 @$(TYPE) $(MISC)/$(SDI2NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
5248 @-$(RM) $@
5249 @@ -40,10 +47,13 @@ $(HIDSID2PARTICLE): $(SDI2TARGET)
5250
5251 .IF "$(SDI2TARGET)"!=""
5252 $(SDI2TARGET): $(SVSDI2DEPEND) $(SDI2NAME).sdi
5253 +.IF "$(VERBOSE)" == "TRUE"
5254 @echo ------------------------------
5255 - @echo Making: $@
5256 +.ENDIF
5257 + @echo "Making: " $(@:f)
5258 @-$(RM) $@
5259 - $(SVIDL) @$(mktmp \
5260 + $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
5261 + $(VERBOSITY) \
5262 -fs$(INCCOMX)/$(SDI2NAME).hxx \
5263 -fd$(INCCOMX)/$(SDI2NAME).ilb \
5264 -fm$(MISC)/$(SDI2NAME).don \
5265 @@ -58,8 +68,10 @@ $(SDI2TARGET): $(SVSDI2DEPEND) $(SDI2NAME).sdi
5266
5267 .IF "$(HIDSID3PARTICLE)"!=""
5268 $(HIDSID3PARTICLE): $(SDI3TARGET)
5269 +.IF "$(VERBOSE)" == "TRUE"
5270 @echo ------------------------------
5271 - @echo Making: $@
5272 +.ENDIF
5273 + @echo "Making: " $(@:f)
5274 @-$(RM) $@.$(ROUT).tmp $@
5275 @$(TYPE) $(MISC)/$(SDI3NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
5276 @-$(RM) $@
5277 @@ -68,10 +80,13 @@ $(HIDSID3PARTICLE): $(SDI3TARGET)
5278
5279 .IF "$(SDI3TARGET)"!=""
5280 $(SDI3TARGET): $(SVSDI3DEPEND) $(SDI3NAME).sdi
5281 +.IF "$(VERBOSE)" == "TRUE"
5282 @echo ------------------------------
5283 - @echo Making: $@
5284 +.ENDIF
5285 + @echo "Making: " $(@:f)
5286 @-$(RM) $@
5287 - $(SVIDL) @$(mktmp \
5288 + $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
5289 + $(VERBOSITY) \
5290 -fs$(INCCOMX)/$(SDI3NAME).hxx \
5291 -fd$(INCCOMX)/$(SDI3NAME).ilb \
5292 -fm$(MISC)/$(SDI3NAME).don \
5293 @@ -86,8 +101,10 @@ $(SDI3TARGET): $(SVSDI3DEPEND) $(SDI3NAME).sdi
5294
5295 .IF "$(HIDSID4PARTICLE)"!=""
5296 $(HIDSID4PARTICLE): $(SDI4TARGET)
5297 +.IF "$(VERBOSE)" == "TRUE"
5298 @echo ------------------------------
5299 - @echo Making: $@
5300 +.ENDIF
5301 + @echo "Making: " $(@:f)
5302 @-$(RM) $@.$(ROUT).tmp $@
5303 @$(TYPE) $(MISC)/$(SDI4NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
5304 @-$(RM) $@
5305 @@ -96,10 +113,13 @@ $(HIDSID4PARTICLE): $(SDI4TARGET)
5306
5307 .IF "$(SDI4TARGET)"!=""
5308 $(SDI4TARGET): $(SVSDI4DEPEND) $(SDI4NAME).sdi
5309 +.IF "$(VERBOSE)" == "TRUE"
5310 @echo ------------------------------
5311 - @echo Making: $@
5312 +.ENDIF
5313 + @echo "Making: " $(@:f)
5314 @-$(RM) $@
5315 - $(SVIDL) @$(mktmp \
5316 + $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
5317 + $(VERBOSITY) \
5318 -fs$(INCCOMX)/$(SDI4NAME).hxx \
5319 -fd$(INCCOMX)/$(SDI4NAME).ilb \
5320 -fm$(MISC)/$(SDI4NAME).don \
5321 @@ -114,8 +134,10 @@ $(SDI4TARGET): $(SVSDI4DEPEND) $(SDI4NAME).sdi
5322
5323 .IF "$(HIDSID5PARTICLE)"!=""
5324 $(HIDSID5PARTICLE): $(SDI5TARGET)
5325 +.IF "$(VERBOSE)" == "TRUE"
5326 @echo ------------------------------
5327 - @echo Making: $@
5328 +.ENDIF
5329 + @echo "Making: " $(@:f)
5330 @-$(RM) $@.$(ROUT).tmp $@
5331 @$(TYPE) $(MISC)/$(SDI5NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
5332 @-$(RM) $@
5333 @@ -124,10 +146,13 @@ $(HIDSID5PARTICLE): $(SDI5TARGET)
5334
5335 .IF "$(SDI5TARGET)"!=""
5336 $(SDI5TARGET): $(SVSDI5DEPEND) $(SDI5NAME).sdi
5337 +.IF "$(VERBOSE)" == "TRUE"
5338 @echo ------------------------------
5339 - @echo Making: $@
5340 +.ENDIF
5341 + @echo "Making: " $(@:f)
5342 @-$(RM) $@
5343 - $(SVIDL) @$(mktmp \
5344 + $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
5345 + $(VERBOSITY) \
5346 -fs$(INCCOMX)/$(SDI5NAME).hxx \
5347 -fd$(INCCOMX)/$(SDI5NAME).ilb \
5348 -fm$(MISC)/$(SDI5NAME).don \
5349 @@ -142,8 +167,10 @@ $(SDI5TARGET): $(SVSDI5DEPEND) $(SDI5NAME).sdi
5350
5351 .IF "$(HIDSID6PARTICLE)"!=""
5352 $(HIDSID6PARTICLE): $(SDI6TARGET)
5353 +.IF "$(VERBOSE)" == "TRUE"
5354 @echo ------------------------------
5355 - @echo Making: $@
5356 +.ENDIF
5357 + @echo "Making: " $(@:f)
5358 @-$(RM) $@.$(ROUT).tmp $@
5359 @$(TYPE) $(MISC)/$(SDI6NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
5360 @-$(RM) $@
5361 @@ -152,10 +179,13 @@ $(HIDSID6PARTICLE): $(SDI6TARGET)
5362
5363 .IF "$(SDI6TARGET)"!=""
5364 $(SDI6TARGET): $(SVSDI6DEPEND) $(SDI6NAME).sdi
5365 +.IF "$(VERBOSE)" == "TRUE"
5366 @echo ------------------------------
5367 - @echo Making: $@
5368 +.ENDIF
5369 + @echo "Making: " $(@:f)
5370 @-$(RM) $@
5371 - $(SVIDL) @$(mktmp \
5372 + $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
5373 + $(VERBOSITY) \
5374 -fs$(INCCOMX)/$(SDI6NAME).hxx \
5375 -fd$(INCCOMX)/$(SDI6NAME).ilb \
5376 -fm$(MISC)/$(SDI6NAME).don \
5377 @@ -170,8 +200,10 @@ $(SDI6TARGET): $(SVSDI6DEPEND) $(SDI6NAME).sdi
5378
5379 .IF "$(HIDSID7PARTICLE)"!=""
5380 $(HIDSID7PARTICLE): $(SDI7TARGET)
5381 +.IF "$(VERBOSE)" == "TRUE"
5382 @echo ------------------------------
5383 - @echo Making: $@
5384 +.ENDIF
5385 + @echo "Making: " $(@:f)
5386 @-$(RM) $@.$(ROUT).tmp $@
5387 @$(TYPE) $(MISC)/$(SDI7NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
5388 @-$(RM) $@
5389 @@ -180,10 +212,13 @@ $(HIDSID7PARTICLE): $(SDI7TARGET)
5390
5391 .IF "$(SDI7TARGET)"!=""
5392 $(SDI7TARGET): $(SVSDI7DEPEND) $(SDI7NAME).sdi
5393 +.IF "$(VERBOSE)" == "TRUE"
5394 @echo ------------------------------
5395 - @echo Making: $@
5396 +.ENDIF
5397 + @echo "Making: " $(@:f)
5398 @-$(RM) $@
5399 - $(SVIDL) @$(mktmp \
5400 + $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
5401 + $(VERBOSITY) \
5402 -fs$(INCCOMX)/$(SDI7NAME).hxx \
5403 -fd$(INCCOMX)/$(SDI7NAME).ilb \
5404 -fm$(MISC)/$(SDI7NAME).don \
5405 @@ -198,8 +233,10 @@ $(SDI7TARGET): $(SVSDI7DEPEND) $(SDI7NAME).sdi
5406
5407 .IF "$(HIDSID8PARTICLE)"!=""
5408 $(HIDSID8PARTICLE): $(SDI8TARGET)
5409 +.IF "$(VERBOSE)" == "TRUE"
5410 @echo ------------------------------
5411 - @echo Making: $@
5412 +.ENDIF
5413 + @echo "Making: " $(@:f)
5414 @-$(RM) $@.$(ROUT).tmp $@
5415 @$(TYPE) $(MISC)/$(SDI8NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
5416 @-$(RM) $@
5417 @@ -208,10 +245,13 @@ $(HIDSID8PARTICLE): $(SDI8TARGET)
5418
5419 .IF "$(SDI8TARGET)"!=""
5420 $(SDI8TARGET): $(SVSDI8DEPEND) $(SDI8NAME).sdi
5421 +.IF "$(VERBOSE)" == "TRUE"
5422 @echo ------------------------------
5423 - @echo Making: $@
5424 +.ENDIF
5425 + @echo "Making: " $(@:f)
5426 @-$(RM) $@
5427 - $(SVIDL) @$(mktmp \
5428 + $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
5429 + $(VERBOSITY) \
5430 -fs$(INCCOMX)/$(SDI8NAME).hxx \
5431 -fd$(INCCOMX)/$(SDI8NAME).ilb \
5432 -fm$(MISC)/$(SDI8NAME).don \
5433 @@ -226,8 +266,10 @@ $(SDI8TARGET): $(SVSDI8DEPEND) $(SDI8NAME).sdi
5434
5435 .IF "$(HIDSID9PARTICLE)"!=""
5436 $(HIDSID9PARTICLE): $(SDI9TARGET)
5437 +.IF "$(VERBOSE)" == "TRUE"
5438 @echo ------------------------------
5439 - @echo Making: $@
5440 +.ENDIF
5441 + @echo "Making: " $(@:f)
5442 @-$(RM) $@.$(ROUT).tmp $@
5443 @$(TYPE) $(MISC)/$(SDI9NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
5444 @-$(RM) $@
5445 @@ -236,10 +278,13 @@ $(HIDSID9PARTICLE): $(SDI9TARGET)
5446
5447 .IF "$(SDI9TARGET)"!=""
5448 $(SDI9TARGET): $(SVSDI9DEPEND) $(SDI9NAME).sdi
5449 +.IF "$(VERBOSE)" == "TRUE"
5450 @echo ------------------------------
5451 - @echo Making: $@
5452 +.ENDIF
5453 + @echo "Making: " $(@:f)
5454 @-$(RM) $@
5455 - $(SVIDL) @$(mktmp \
5456 + $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
5457 + $(VERBOSITY) \
5458 -fs$(INCCOMX)/$(SDI9NAME).hxx \
5459 -fd$(INCCOMX)/$(SDI9NAME).ilb \
5460 -fm$(MISC)/$(SDI9NAME).don \
5461 @@ -254,8 +299,10 @@ $(SDI9TARGET): $(SVSDI9DEPEND) $(SDI9NAME).sdi
5462
5463 .IF "$(HIDSID10PARTICLE)"!=""
5464 $(HIDSID10PARTICLE): $(SDI10TARGET)
5465 +.IF "$(VERBOSE)" == "TRUE"
5466 @echo ------------------------------
5467 - @echo Making: $@
5468 +.ENDIF
5469 + @echo "Making: " $(@:f)
5470 @-$(RM) $@.$(ROUT).tmp $@
5471 @$(TYPE) $(MISC)/$(SDI10NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
5472 @-$(RM) $@
5473 @@ -264,10 +311,13 @@ $(HIDSID10PARTICLE): $(SDI10TARGET)
5474
5475 .IF "$(SDI10TARGET)"!=""
5476 $(SDI10TARGET): $(SVSDI10DEPEND) $(SDI10NAME).sdi
5477 +.IF "$(VERBOSE)" == "TRUE"
5478 @echo ------------------------------
5479 - @echo Making: $@
5480 +.ENDIF
5481 + @echo "Making: " $(@:f)
5482 @-$(RM) $@
5483 - $(SVIDL) @$(mktmp \
5484 + $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
5485 + $(VERBOSITY) \
5486 -fs$(INCCOMX)/$(SDI10NAME).hxx \
5487 -fd$(INCCOMX)/$(SDI10NAME).ilb \
5488 -fm$(MISC)/$(SDI10NAME).don \
5489 diff --git solenv/inc/_tg_shl.mk solenv/inc/_tg_shl.mk
5490 index d648f1d..e4cb05f 100644
5491 --- solenv/inc/_tg_shl.mk
5492 +++ solenv/inc/_tg_shl.mk
5493 @@ -55,7 +55,7 @@ SHL1VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL1TARGET))}$(
5494 .ENDIF # "$(GUI)" == "UNX"
5495 $(MISC)/$(SHL1VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIONOBJ:b).h
5496 # $(COPY) $(SOLARENV)/src/version.c $@
5497 - $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ:b).h/ > $@
5498 + $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ:b).h/ > $@
5499
5500 .INIT : $(SHL1VERSIONOBJDEP)
5501 .ENDIF # "$(VERSIONOBJ)"!=""
5502 @@ -118,16 +118,20 @@ $(USE_SHL1VERSIONMAP): \
5503 .ENDIF
5504 .ENDIF # "$(SHL1OBJS)!"=""
5505 @$(TYPE) /dev/null $(SHL1LIBS:s/.lib/.dump/) >> $@.dump
5506 - $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL1INTERFACE) -f $(SHL1FILTERFILE) -m $@
5507 + $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL1INTERFACE) -f $(SHL1FILTERFILE) -m $@
5508
5509 .ELSE # "$(SHL1FILTERFILE)"!=""
5510 USE_SHL1VERSIONMAP=$(MISC)/$(SHL1TARGET).vmap
5511 $(USE_SHL1VERSIONMAP) :
5512 +.IF "$(VERBOSE)" == "TRUE"
5513 @echo -----------------------------
5514 @echo SHL1FILTERFILE not set!
5515 @echo -----------------------------
5516 @$(TOUCH) $@
5517 @echo dummy file to keep the dependencies for later use.
5518 +.ELSE
5519 + @$(TOUCH) $@
5520 +.ENDIF
5521 # force_dmake_to_error
5522 .ENDIF # "$(SHL1FILTERFILE)"!=""
5523 .ELSE # "$(USE_SHL1VERSIONMAP)"!=""
5524 @@ -154,25 +158,25 @@ $(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP)
5525 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
5526 # happens if somebody will change it in the future
5527 .IF "$(COMID)"=="gcc3"
5528 - tr -d "\015" < $(SHL1VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
5529 + $(COMMAND_ECHO) tr -d "\015" < $(SHL1VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
5530 .ELIF "$(COMNAME)"=="sunpro5"
5531 - tr -d "\015" < $(SHL1VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
5532 + $(COMMAND_ECHO) tr -d "\015" < $(SHL1VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
5533 .ELSE # "$(COMID)"=="gcc3"
5534 - tr -d "\015" < $(SHL1VERSIONMAP) > $@
5535 + $(COMMAND_ECHO) tr -d "\015" < $(SHL1VERSIONMAP) > $@
5536 .ENDIF # "$(COMID)"=="gcc3"
5537 @chmod a+w $@
5538 # Mac OS X post-processing generate an exported symbols list from the generated map file
5539 # for details on exported symbols list see man ld on Mac OS X
5540 .IF "$(OS)"=="MACOSX"
5541 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
5542 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
5543 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
5544 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
5545 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
5546 # Extract RTTI symbols from all the objects that will be used to build a shared library
5547 .IF "$(SHL1OBJS)"!=""
5548 -echo $(foreach,i,$(SHL1OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
5549 .ENDIF
5550 .IF "$(SHL1LIBS)"!=""
5551 - -$(TYPE) $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
5552 + $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL1LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
5553 .ENDIF
5554 # overwrite the map file generate into the local output tree with the generated
5555 # exported symbols list
5556 @@ -214,7 +218,7 @@ SHL1LINKRESO*=$(MISC)/$(SHL1TARGET)_res.o
5557 .IF "$(SHL1LIBS)"!=""
5558 $(MISC)/$(SHL1TARGET)_linkinc.ls .PHONY:
5559 @@-$(RM) $@
5560 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@
5561 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@
5562 .ENDIF # "$(SHL1LIBS)"!=""
5563 .ENDIF
5564
5565 @@ -230,14 +234,14 @@ SHL1LINKLIST=$(MISC)/$(SHL1TARGET)_link.lst
5566 SHL1LINKLISTPARAM=@$(SHL1LINKLIST)
5567 $(SHL1LINKLIST) : $(SHL1LIBS)
5568 @@-$(RM) $@
5569 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@
5570 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) >> $@
5571 .ENDIF # "$(SHL1LIBS)"!=""
5572 .ENDIF # "$(COM)"!="GCC"
5573 .ENDIF
5574 .ENDIF # "$(SHL1USE_EXPORTS)"=="name"
5575
5576 $(MISC)/%linkinc.ls:
5577 - echo . > $@
5578 + @echo . > $@
5579 .ENDIF # "$(linkinc)"!=""
5580
5581 .IF "$(GUI)" == "OS2"
5582 @@ -264,8 +268,10 @@ $(SHL1TARGETN) : \
5583 $(SHL1DEPN) \
5584 $(SHL1IMP_ORD) \
5585 $(SHL1LINKLIST)
5586 +.IF "$(VERBOSE)" == "TRUE"
5587 @echo ------------------------------
5588 - @echo Making: $(SHL1TARGETN)
5589 +.ENDIF
5590 + @echo "Making: " $(@:f)
5591 .IF "$(GUI)" == "WNT"
5592 .IF "$(SHL1DEFAULTRES)"!=""
5593 @@-$(RM) $(MISC)/$(SHL1DEFAULTRES:b).rc
5594 @@ -285,10 +291,10 @@ $(SHL1TARGETN) : \
5595 @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET:b) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
5596 @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL1DEFAULTRES:b).rc
5597 .ENDIF # "$(use_shl_versions)" != ""
5598 - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc
5599 + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc
5600 .ENDIF # "$(SHL1DEFAULTRES)"!=""
5601 .IF "$(SHL1ALLRES)"!=""
5602 - $(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES)
5603 + $(COMMAND_ECHO)$(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES)
5604 .IF "$(COM)"=="GCC"
5605 windres $(SHL1LINKRES) $(SHL1LINKRESO)
5606 .ENDIF # "$(COM)"=="GCC"
5607 @@ -335,15 +341,15 @@ $(SHL1TARGETN) : \
5608 @@$(LS) $@
5609 @echo linking $@.manifest ...
5610 .IF "$(VISTA_MANIFEST)"!=""
5611 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5612 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5613 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5614 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5615 .ELSE
5616 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5617 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5618 .ENDIF # "$(VISTA_MANIFEST)"!=""
5619 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5620 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
5621 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5622 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
5623 .ELSE # "$(USE_DEFFILE)"!=""
5624 - $(SHL1LINKER) @$(mktmp $(SHL1LINKFLAGS) \
5625 + $(COMMAND_ECHO)$(SHL1LINKER) @$(mktmp $(SHL1LINKFLAGS) \
5626 $(LINKFLAGSSHL) $(SHL1BASEX) \
5627 $(SHL1STACK) -out:$(SHL1TARGETN) \
5628 -map:$(MISC)/$(@:B).map \
5629 @@ -359,16 +365,16 @@ $(SHL1TARGETN) : \
5630 @@$(LS) $@
5631 @echo linking $@.manifest ...
5632 .IF "$(VISTA_MANIFEST)"!=""
5633 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5634 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5635 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5636 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5637 .ELSE
5638 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5639 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5640 .ENDIF # "$(VISTA_MANIFEST)"!=""
5641 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5642 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
5643 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5644 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
5645 .ENDIF # "$(USE_DEFFILE)"!=""
5646 .ELSE # "$(SHL1USE_EXPORTS)"!="name"
5647 - $(SHL1LINKER) @$(mktmp $(SHL1LINKFLAGS) \
5648 + $(COMMAND_ECHO)$(SHL1LINKER) @$(mktmp $(SHL1LINKFLAGS) \
5649 $(LINKFLAGSSHL) $(SHL1BASEX) \
5650 $(SHL1STACK) -out:$(SHL1TARGETN) \
5651 -map:$(MISC)/$(@:B).map \
5652 @@ -382,18 +388,18 @@ $(SHL1TARGETN) : \
5653 )
5654 @echo linking $@.manifest ...
5655 .IF "$(VISTA_MANIFEST)"!=""
5656 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5657 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5658 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5659 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5660 .ELSE
5661 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5662 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5663 .ENDIF # "$(VISTA_MANIFEST)"!=""
5664 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5665 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
5666 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5667 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
5668 .ENDIF # "$(SHL1USE_EXPORTS)"!="name"
5669 .ELSE # "$(linkinc)"==""
5670 - -$(RM) del $(MISC)/$(SHL1TARGET).lnk
5671 - -$(RM) $(MISC)/$(SHL1TARGET).lst
5672 - $(TYPE) $(mktmp \
5673 + $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL1TARGET).lnk
5674 + $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL1TARGET).lst
5675 + $(COMMAND_ECHO)$(TYPE) $(mktmp \
5676 $(SHL1LINKFLAGS) \
5677 $(LINKFLAGSSHL) $(SHL1BASEX) \
5678 $(SHL1STACK) $(MAPFILE) \
5679 @@ -405,17 +411,17 @@ $(SHL1TARGETN) : \
5680 $(SHL1STDSHL) $(STDSHL1) \
5681 $(SHL1LINKRES) \
5682 ) >> $(MISC)/$(SHL1TARGET).lnk
5683 - $(TYPE) $(MISC)/$(SHL1TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL1TARGET).lnk
5684 - $(SHL1LINKER) @$(MISC)/$(SHL1TARGET).lnk
5685 + $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL1TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL1TARGET).lnk
5686 + $(COMMAND_ECHO)$(SHL1LINKER) @$(MISC)/$(SHL1TARGET).lnk
5687 @echo linking $@.manifest ...
5688 .IF "$(VISTA_MANIFEST)"!=""
5689 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5690 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5691 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5692 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5693 .ELSE
5694 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5695 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5696 .ENDIF # "$(VISTA_MANIFEST)"!=""
5697 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5698 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
5699 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5700 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
5701 .ENDIF # "$(linkinc)"==""
5702 .ENDIF # "$(COM)"=="GCC"
5703 .ENDIF # "$(GUI)" == "WNT"
5704 @@ -431,11 +437,13 @@ $(SHL1TARGETN) : \
5705 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
5706 `cat $(MISC)/$(TARGET).$(@:b)_1.cmd` \
5707 >> $(MISC)/$(TARGET).$(@:b)_1.cmd
5708 + .IF "$(VERBOSE)" == "TRUE"
5709 @cat $(MISC)/$(TARGET).$(@:b)_1.cmd
5710 + .ENDIF
5711 @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
5712 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
5713 shl $(SHL1RPATH) $@
5714 - @echo "Making: $@.jnilib"
5715 + @echo "Making: " $(@:f).jnilib
5716 @macosx-create-bundle $@
5717 .IF "$(UPDATER)"=="YES"
5718 .IF "$(SHL1NOCHECK)"==""
5719 @@ -448,21 +456,29 @@ $(SHL1TARGETN) : \
5720 $(SHL1VERSIONOBJ) -o $@ \
5721 `cat /dev/null $(SHL1LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
5722 $(SHL1STDLIBS) $(SHL1ARCHIVES) $(SHL1STDSHL) $(STDSHL1) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_1.cmd
5723 + .IF "$(VERBOSE)" == "TRUE"
5724 @cat $(MISC)/$(TARGET).$(@:b)_1.cmd
5725 + .ENDIF
5726 @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
5727 .IF "$(UPDATER)"=="YES"
5728 .IF "$(SHL1NOCHECK)"==""
5729 - -$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
5730 - $(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
5731 - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
5732 + $(COMMAND_ECHO)-$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
5733 + $(COMMAND_ECHO)$(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
5734 +.IF "$(VERBOSE)"=="TRUE"
5735 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
5736 +.ELSE
5737 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) -- -s $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
5738 +.ENDIF
5739 .ENDIF # "$(SHL1NOCHECK)"!=""
5740 .ENDIF # "$(UPDATER)"=="YES"
5741 .ENDIF # "$(OS)"=="MACOSX"
5742 .IF "$(UNIXVERSIONNAMES)"!=""
5743 - $(RM) $(LB)/$(SHL1TARGETN:b)
5744 - cd $(LB) && ln -s $(SHL1TARGETN:f) $(SHL1TARGETN:b)
5745 + $(COMMAND_ECHO)$(RM) $(LB)/$(SHL1TARGETN:b)
5746 + $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL1TARGETN:f) $(SHL1TARGETN:b)
5747 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
5748 +.IF "$(VERBOSE)" == "TRUE"
5749 @ls -l $@
5750 +.ENDIF
5751 .ENDIF # "$(GUI)" == "UNX"
5752
5753 .IF "$(GUI)" == "OS2"
5754 @@ -480,16 +496,16 @@ $(SHL1TARGETN) : \
5755 # @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL1DEFAULTRES:b).rc
5756 .ENDIF # "$(use_shl_versions)" != ""
5757 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
5758 - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc
5759 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL1DEFAULTRES:b).rc
5760 .ENDIF # "$(SHL1DEFAULTRES)"!=""
5761
5762 .IF "$(SHL1ALLRES)"!=""
5763 - +$(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES)
5764 + $(COMMAND_ECHO)+$(TYPE) $(SHL1ALLRES) > $(SHL1LINKRES)
5765 .ENDIF # "$(SHL1ALLRES)"!=""
5766
5767 .IF "$(USE_DEFFILE)"!=""
5768
5769 - $(SHL1LINKER) $(SHL1LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
5770 + $(COMMAND_ECHO)$(SHL1LINKER) $(SHL1LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
5771 $(SHL1DEF) \
5772 $(STDOBJ) \
5773 -L$(LB) \
5774 @@ -502,7 +518,7 @@ $(SHL1TARGETN) : \
5775
5776 .ELSE # "$(USE_DEFFILE)"!=""
5777
5778 - $(SHL1LINKER) -v $(SHL1LINKFLAGS) \
5779 + $(COMMAND_ECHO)$(SHL1LINKER) -v $(SHL1LINKFLAGS) \
5780 $(LINKFLAGSSHL) $(SHL1BASEX) \
5781 $(SHL1STACK) -o $(SHL1TARGETN) \
5782 $(SHL1DEF) \
5783 @@ -520,7 +536,7 @@ $(SHL1TARGETN) : \
5784 .ENDIF # "$(USE_DEFFILE)"!=""
5785
5786 .IF "$(SHL1TARGET8)" != "$(SHL1TARGET)"
5787 - +$(COPY) $@ $(@:d)$(SHL1TARGET8).dll
5788 + $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL1TARGET8).dll
5789 .ENDIF
5790
5791 .ENDIF # "$(GUI)" == "OS2"
5792 @@ -594,7 +610,7 @@ SHL2VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL2TARGET))}$(
5793 .ENDIF # "$(GUI)" == "UNX"
5794 $(MISC)/$(SHL2VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIONOBJ:b).h
5795 # $(COPY) $(SOLARENV)/src/version.c $@
5796 - $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ:b).h/ > $@
5797 + $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ:b).h/ > $@
5798
5799 .INIT : $(SHL2VERSIONOBJDEP)
5800 .ENDIF # "$(VERSIONOBJ)"!=""
5801 @@ -657,16 +673,20 @@ $(USE_SHL2VERSIONMAP): \
5802 .ENDIF
5803 .ENDIF # "$(SHL2OBJS)!"=""
5804 @$(TYPE) /dev/null $(SHL2LIBS:s/.lib/.dump/) >> $@.dump
5805 - $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL2INTERFACE) -f $(SHL2FILTERFILE) -m $@
5806 + $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL2INTERFACE) -f $(SHL2FILTERFILE) -m $@
5807
5808 .ELSE # "$(SHL2FILTERFILE)"!=""
5809 USE_SHL2VERSIONMAP=$(MISC)/$(SHL2TARGET).vmap
5810 $(USE_SHL2VERSIONMAP) :
5811 +.IF "$(VERBOSE)" == "TRUE"
5812 @echo -----------------------------
5813 @echo SHL2FILTERFILE not set!
5814 @echo -----------------------------
5815 @$(TOUCH) $@
5816 @echo dummy file to keep the dependencies for later use.
5817 +.ELSE
5818 + @$(TOUCH) $@
5819 +.ENDIF
5820 # force_dmake_to_error
5821 .ENDIF # "$(SHL2FILTERFILE)"!=""
5822 .ELSE # "$(USE_SHL2VERSIONMAP)"!=""
5823 @@ -693,25 +713,25 @@ $(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP)
5824 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
5825 # happens if somebody will change it in the future
5826 .IF "$(COMID)"=="gcc3"
5827 - tr -d "\015" < $(SHL2VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
5828 + $(COMMAND_ECHO) tr -d "\015" < $(SHL2VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
5829 .ELIF "$(COMNAME)"=="sunpro5"
5830 - tr -d "\015" < $(SHL2VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
5831 + $(COMMAND_ECHO) tr -d "\015" < $(SHL2VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
5832 .ELSE # "$(COMID)"=="gcc3"
5833 - tr -d "\015" < $(SHL2VERSIONMAP) > $@
5834 + $(COMMAND_ECHO) tr -d "\015" < $(SHL2VERSIONMAP) > $@
5835 .ENDIF # "$(COMID)"=="gcc3"
5836 @chmod a+w $@
5837 # Mac OS X post-processing generate an exported symbols list from the generated map file
5838 # for details on exported symbols list see man ld on Mac OS X
5839 .IF "$(OS)"=="MACOSX"
5840 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
5841 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
5842 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
5843 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
5844 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
5845 # Extract RTTI symbols from all the objects that will be used to build a shared library
5846 .IF "$(SHL2OBJS)"!=""
5847 -echo $(foreach,i,$(SHL2OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
5848 .ENDIF
5849 .IF "$(SHL2LIBS)"!=""
5850 - -$(TYPE) $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
5851 + $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL2LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
5852 .ENDIF
5853 # overwrite the map file generate into the local output tree with the generated
5854 # exported symbols list
5855 @@ -753,7 +773,7 @@ SHL2LINKRESO*=$(MISC)/$(SHL2TARGET)_res.o
5856 .IF "$(SHL2LIBS)"!=""
5857 $(MISC)/$(SHL2TARGET)_linkinc.ls .PHONY:
5858 @@-$(RM) $@
5859 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@
5860 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@
5861 .ENDIF # "$(SHL2LIBS)"!=""
5862 .ENDIF
5863
5864 @@ -769,14 +789,14 @@ SHL2LINKLIST=$(MISC)/$(SHL2TARGET)_link.lst
5865 SHL2LINKLISTPARAM=@$(SHL2LINKLIST)
5866 $(SHL2LINKLIST) : $(SHL2LIBS)
5867 @@-$(RM) $@
5868 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@
5869 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) >> $@
5870 .ENDIF # "$(SHL2LIBS)"!=""
5871 .ENDIF # "$(COM)"!="GCC"
5872 .ENDIF
5873 .ENDIF # "$(SHL2USE_EXPORTS)"=="name"
5874
5875 $(MISC)/%linkinc.ls:
5876 - echo . > $@
5877 + @echo . > $@
5878 .ENDIF # "$(linkinc)"!=""
5879
5880 .IF "$(GUI)" == "OS2"
5881 @@ -803,8 +823,10 @@ $(SHL2TARGETN) : \
5882 $(SHL2DEPN) \
5883 $(SHL2IMP_ORD) \
5884 $(SHL2LINKLIST)
5885 +.IF "$(VERBOSE)" == "TRUE"
5886 @echo ------------------------------
5887 - @echo Making: $(SHL2TARGETN)
5888 +.ENDIF
5889 + @echo "Making: " $(@:f)
5890 .IF "$(GUI)" == "WNT"
5891 .IF "$(SHL2DEFAULTRES)"!=""
5892 @@-$(RM) $(MISC)/$(SHL2DEFAULTRES:b).rc
5893 @@ -824,10 +846,10 @@ $(SHL2TARGETN) : \
5894 @echo $(EMQ)#define INTERNAL_NAME $(SHL2TARGET:b) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
5895 @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL2DEFAULTRES:b).rc
5896 .ENDIF # "$(use_shl_versions)" != ""
5897 - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc
5898 + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc
5899 .ENDIF # "$(SHL2DEFAULTRES)"!=""
5900 .IF "$(SHL2ALLRES)"!=""
5901 - $(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES)
5902 + $(COMMAND_ECHO)$(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES)
5903 .IF "$(COM)"=="GCC"
5904 windres $(SHL2LINKRES) $(SHL2LINKRESO)
5905 .ENDIF # "$(COM)"=="GCC"
5906 @@ -874,15 +896,15 @@ $(SHL2TARGETN) : \
5907 @@$(LS) $@
5908 @echo linking $@.manifest ...
5909 .IF "$(VISTA_MANIFEST)"!=""
5910 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5911 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5912 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5913 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5914 .ELSE
5915 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5916 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5917 .ENDIF # "$(VISTA_MANIFEST)"!=""
5918 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5919 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
5920 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5921 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
5922 .ELSE # "$(USE_DEFFILE)"!=""
5923 - $(SHL2LINKER) @$(mktmp $(SHL2LINKFLAGS) \
5924 + $(COMMAND_ECHO)$(SHL2LINKER) @$(mktmp $(SHL2LINKFLAGS) \
5925 $(LINKFLAGSSHL) $(SHL2BASEX) \
5926 $(SHL2STACK) -out:$(SHL2TARGETN) \
5927 -map:$(MISC)/$(@:B).map \
5928 @@ -898,16 +920,16 @@ $(SHL2TARGETN) : \
5929 @@$(LS) $@
5930 @echo linking $@.manifest ...
5931 .IF "$(VISTA_MANIFEST)"!=""
5932 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5933 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5934 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5935 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5936 .ELSE
5937 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5938 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5939 .ENDIF # "$(VISTA_MANIFEST)"!=""
5940 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5941 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
5942 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5943 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
5944 .ENDIF # "$(USE_DEFFILE)"!=""
5945 .ELSE # "$(SHL2USE_EXPORTS)"!="name"
5946 - $(SHL2LINKER) @$(mktmp $(SHL2LINKFLAGS) \
5947 + $(COMMAND_ECHO)$(SHL2LINKER) @$(mktmp $(SHL2LINKFLAGS) \
5948 $(LINKFLAGSSHL) $(SHL2BASEX) \
5949 $(SHL2STACK) -out:$(SHL2TARGETN) \
5950 -map:$(MISC)/$(@:B).map \
5951 @@ -921,18 +943,18 @@ $(SHL2TARGETN) : \
5952 )
5953 @echo linking $@.manifest ...
5954 .IF "$(VISTA_MANIFEST)"!=""
5955 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5956 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5957 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5958 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5959 .ELSE
5960 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5961 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5962 .ENDIF # "$(VISTA_MANIFEST)"!=""
5963 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5964 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
5965 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5966 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
5967 .ENDIF # "$(SHL2USE_EXPORTS)"!="name"
5968 .ELSE # "$(linkinc)"==""
5969 - -$(RM) del $(MISC)/$(SHL2TARGET).lnk
5970 - -$(RM) $(MISC)/$(SHL2TARGET).lst
5971 - $(TYPE) $(mktmp \
5972 + $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL2TARGET).lnk
5973 + $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL2TARGET).lst
5974 + $(COMMAND_ECHO)$(TYPE) $(mktmp \
5975 $(SHL2LINKFLAGS) \
5976 $(LINKFLAGSSHL) $(SHL2BASEX) \
5977 $(SHL2STACK) $(MAPFILE) \
5978 @@ -944,17 +966,17 @@ $(SHL2TARGETN) : \
5979 $(SHL2STDSHL) $(STDSHL2) \
5980 $(SHL2LINKRES) \
5981 ) >> $(MISC)/$(SHL2TARGET).lnk
5982 - $(TYPE) $(MISC)/$(SHL2TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL2TARGET).lnk
5983 - $(SHL2LINKER) @$(MISC)/$(SHL2TARGET).lnk
5984 + $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL2TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL2TARGET).lnk
5985 + $(COMMAND_ECHO)$(SHL2LINKER) @$(MISC)/$(SHL2TARGET).lnk
5986 @echo linking $@.manifest ...
5987 .IF "$(VISTA_MANIFEST)"!=""
5988 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5989 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5990 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
5991 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
5992 .ELSE
5993 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5994 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
5995 .ENDIF # "$(VISTA_MANIFEST)"!=""
5996 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5997 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
5998 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
5999 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6000 .ENDIF # "$(linkinc)"==""
6001 .ENDIF # "$(COM)"=="GCC"
6002 .ENDIF # "$(GUI)" == "WNT"
6003 @@ -970,11 +992,13 @@ $(SHL2TARGETN) : \
6004 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
6005 `cat $(MISC)/$(TARGET).$(@:b)_2.cmd` \
6006 >> $(MISC)/$(TARGET).$(@:b)_2.cmd
6007 + .IF "$(VERBOSE)" == "TRUE"
6008 @cat $(MISC)/$(TARGET).$(@:b)_2.cmd
6009 + .ENDIF
6010 @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
6011 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
6012 shl $(SHL2RPATH) $@
6013 - @echo "Making: $@.jnilib"
6014 + @echo "Making: " $(@:f).jnilib
6015 @macosx-create-bundle $@
6016 .IF "$(UPDATER)"=="YES"
6017 .IF "$(SHL2NOCHECK)"==""
6018 @@ -987,21 +1011,29 @@ $(SHL2TARGETN) : \
6019 $(SHL2VERSIONOBJ) -o $@ \
6020 `cat /dev/null $(SHL2LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
6021 $(SHL2STDLIBS) $(SHL2ARCHIVES) $(SHL2STDSHL) $(STDSHL2) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_2.cmd
6022 + .IF "$(VERBOSE)" == "TRUE"
6023 @cat $(MISC)/$(TARGET).$(@:b)_2.cmd
6024 + .ENDIF
6025 @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
6026 .IF "$(UPDATER)"=="YES"
6027 .IF "$(SHL2NOCHECK)"==""
6028 - -$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
6029 - $(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
6030 - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
6031 + $(COMMAND_ECHO)-$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
6032 + $(COMMAND_ECHO)$(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
6033 +.IF "$(VERBOSE)"=="TRUE"
6034 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
6035 +.ELSE
6036 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) -- -s $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
6037 +.ENDIF
6038 .ENDIF # "$(SHL2NOCHECK)"!=""
6039 .ENDIF # "$(UPDATER)"=="YES"
6040 .ENDIF # "$(OS)"=="MACOSX"
6041 .IF "$(UNIXVERSIONNAMES)"!=""
6042 - $(RM) $(LB)/$(SHL2TARGETN:b)
6043 - cd $(LB) && ln -s $(SHL2TARGETN:f) $(SHL2TARGETN:b)
6044 + $(COMMAND_ECHO)$(RM) $(LB)/$(SHL2TARGETN:b)
6045 + $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL2TARGETN:f) $(SHL2TARGETN:b)
6046 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
6047 +.IF "$(VERBOSE)" == "TRUE"
6048 @ls -l $@
6049 +.ENDIF
6050 .ENDIF # "$(GUI)" == "UNX"
6051
6052 .IF "$(GUI)" == "OS2"
6053 @@ -1019,16 +1051,16 @@ $(SHL2TARGETN) : \
6054 # @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL2DEFAULTRES:b).rc
6055 .ENDIF # "$(use_shl_versions)" != ""
6056 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
6057 - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc
6058 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL2DEFAULTRES:b).rc
6059 .ENDIF # "$(SHL2DEFAULTRES)"!=""
6060
6061 .IF "$(SHL2ALLRES)"!=""
6062 - +$(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES)
6063 + $(COMMAND_ECHO)+$(TYPE) $(SHL2ALLRES) > $(SHL2LINKRES)
6064 .ENDIF # "$(SHL2ALLRES)"!=""
6065
6066 .IF "$(USE_DEFFILE)"!=""
6067
6068 - $(SHL2LINKER) $(SHL2LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
6069 + $(COMMAND_ECHO)$(SHL2LINKER) $(SHL2LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
6070 $(SHL2DEF) \
6071 $(STDOBJ) \
6072 -L$(LB) \
6073 @@ -1041,7 +1073,7 @@ $(SHL2TARGETN) : \
6074
6075 .ELSE # "$(USE_DEFFILE)"!=""
6076
6077 - $(SHL2LINKER) -v $(SHL2LINKFLAGS) \
6078 + $(COMMAND_ECHO)$(SHL2LINKER) -v $(SHL2LINKFLAGS) \
6079 $(LINKFLAGSSHL) $(SHL2BASEX) \
6080 $(SHL2STACK) -o $(SHL2TARGETN) \
6081 $(SHL2DEF) \
6082 @@ -1059,7 +1091,7 @@ $(SHL2TARGETN) : \
6083 .ENDIF # "$(USE_DEFFILE)"!=""
6084
6085 .IF "$(SHL2TARGET8)" != "$(SHL2TARGET)"
6086 - +$(COPY) $@ $(@:d)$(SHL2TARGET8).dll
6087 + $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL2TARGET8).dll
6088 .ENDIF
6089
6090 .ENDIF # "$(GUI)" == "OS2"
6091 @@ -1133,7 +1165,7 @@ SHL3VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL3TARGET))}$(
6092 .ENDIF # "$(GUI)" == "UNX"
6093 $(MISC)/$(SHL3VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL3VERSIONOBJ:b).h
6094 # $(COPY) $(SOLARENV)/src/version.c $@
6095 - $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL3VERSIONOBJ:b).h/ > $@
6096 + $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL3VERSIONOBJ:b).h/ > $@
6097
6098 .INIT : $(SHL3VERSIONOBJDEP)
6099 .ENDIF # "$(VERSIONOBJ)"!=""
6100 @@ -1196,16 +1228,20 @@ $(USE_SHL3VERSIONMAP): \
6101 .ENDIF
6102 .ENDIF # "$(SHL3OBJS)!"=""
6103 @$(TYPE) /dev/null $(SHL3LIBS:s/.lib/.dump/) >> $@.dump
6104 - $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL3INTERFACE) -f $(SHL3FILTERFILE) -m $@
6105 + $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL3INTERFACE) -f $(SHL3FILTERFILE) -m $@
6106
6107 .ELSE # "$(SHL3FILTERFILE)"!=""
6108 USE_SHL3VERSIONMAP=$(MISC)/$(SHL3TARGET).vmap
6109 $(USE_SHL3VERSIONMAP) :
6110 +.IF "$(VERBOSE)" == "TRUE"
6111 @echo -----------------------------
6112 @echo SHL3FILTERFILE not set!
6113 @echo -----------------------------
6114 @$(TOUCH) $@
6115 @echo dummy file to keep the dependencies for later use.
6116 +.ELSE
6117 + @$(TOUCH) $@
6118 +.ENDIF
6119 # force_dmake_to_error
6120 .ENDIF # "$(SHL3FILTERFILE)"!=""
6121 .ELSE # "$(USE_SHL3VERSIONMAP)"!=""
6122 @@ -1232,25 +1268,25 @@ $(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP)
6123 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
6124 # happens if somebody will change it in the future
6125 .IF "$(COMID)"=="gcc3"
6126 - tr -d "\015" < $(SHL3VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
6127 + $(COMMAND_ECHO) tr -d "\015" < $(SHL3VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
6128 .ELIF "$(COMNAME)"=="sunpro5"
6129 - tr -d "\015" < $(SHL3VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
6130 + $(COMMAND_ECHO) tr -d "\015" < $(SHL3VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
6131 .ELSE # "$(COMID)"=="gcc3"
6132 - tr -d "\015" < $(SHL3VERSIONMAP) > $@
6133 + $(COMMAND_ECHO) tr -d "\015" < $(SHL3VERSIONMAP) > $@
6134 .ENDIF # "$(COMID)"=="gcc3"
6135 @chmod a+w $@
6136 # Mac OS X post-processing generate an exported symbols list from the generated map file
6137 # for details on exported symbols list see man ld on Mac OS X
6138 .IF "$(OS)"=="MACOSX"
6139 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
6140 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
6141 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
6142 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
6143 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
6144 # Extract RTTI symbols from all the objects that will be used to build a shared library
6145 .IF "$(SHL3OBJS)"!=""
6146 -echo $(foreach,i,$(SHL3OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
6147 .ENDIF
6148 .IF "$(SHL3LIBS)"!=""
6149 - -$(TYPE) $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
6150 + $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL3LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
6151 .ENDIF
6152 # overwrite the map file generate into the local output tree with the generated
6153 # exported symbols list
6154 @@ -1292,7 +1328,7 @@ SHL3LINKRESO*=$(MISC)/$(SHL3TARGET)_res.o
6155 .IF "$(SHL3LIBS)"!=""
6156 $(MISC)/$(SHL3TARGET)_linkinc.ls .PHONY:
6157 @@-$(RM) $@
6158 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@
6159 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@
6160 .ENDIF # "$(SHL3LIBS)"!=""
6161 .ENDIF
6162
6163 @@ -1308,14 +1344,14 @@ SHL3LINKLIST=$(MISC)/$(SHL3TARGET)_link.lst
6164 SHL3LINKLISTPARAM=@$(SHL3LINKLIST)
6165 $(SHL3LINKLIST) : $(SHL3LIBS)
6166 @@-$(RM) $@
6167 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@
6168 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) >> $@
6169 .ENDIF # "$(SHL3LIBS)"!=""
6170 .ENDIF # "$(COM)"!="GCC"
6171 .ENDIF
6172 .ENDIF # "$(SHL3USE_EXPORTS)"=="name"
6173
6174 $(MISC)/%linkinc.ls:
6175 - echo . > $@
6176 + @echo . > $@
6177 .ENDIF # "$(linkinc)"!=""
6178
6179 .IF "$(GUI)" == "OS2"
6180 @@ -1342,8 +1378,10 @@ $(SHL3TARGETN) : \
6181 $(SHL3DEPN) \
6182 $(SHL3IMP_ORD) \
6183 $(SHL3LINKLIST)
6184 +.IF "$(VERBOSE)" == "TRUE"
6185 @echo ------------------------------
6186 - @echo Making: $(SHL3TARGETN)
6187 +.ENDIF
6188 + @echo "Making: " $(@:f)
6189 .IF "$(GUI)" == "WNT"
6190 .IF "$(SHL3DEFAULTRES)"!=""
6191 @@-$(RM) $(MISC)/$(SHL3DEFAULTRES:b).rc
6192 @@ -1363,10 +1401,10 @@ $(SHL3TARGETN) : \
6193 @echo $(EMQ)#define INTERNAL_NAME $(SHL3TARGET:b) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
6194 @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL3DEFAULTRES:b).rc
6195 .ENDIF # "$(use_shl_versions)" != ""
6196 - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc
6197 + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc
6198 .ENDIF # "$(SHL3DEFAULTRES)"!=""
6199 .IF "$(SHL3ALLRES)"!=""
6200 - $(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES)
6201 + $(COMMAND_ECHO)$(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES)
6202 .IF "$(COM)"=="GCC"
6203 windres $(SHL3LINKRES) $(SHL3LINKRESO)
6204 .ENDIF # "$(COM)"=="GCC"
6205 @@ -1413,15 +1451,15 @@ $(SHL3TARGETN) : \
6206 @@$(LS) $@
6207 @echo linking $@.manifest ...
6208 .IF "$(VISTA_MANIFEST)"!=""
6209 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6210 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6211 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6212 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6213 .ELSE
6214 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6215 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6216 .ENDIF # "$(VISTA_MANIFEST)"!=""
6217 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6218 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6219 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6220 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6221 .ELSE # "$(USE_DEFFILE)"!=""
6222 - $(SHL3LINKER) @$(mktmp $(SHL3LINKFLAGS) \
6223 + $(COMMAND_ECHO)$(SHL3LINKER) @$(mktmp $(SHL3LINKFLAGS) \
6224 $(LINKFLAGSSHL) $(SHL3BASEX) \
6225 $(SHL3STACK) -out:$(SHL3TARGETN) \
6226 -map:$(MISC)/$(@:B).map \
6227 @@ -1437,16 +1475,16 @@ $(SHL3TARGETN) : \
6228 @@$(LS) $@
6229 @echo linking $@.manifest ...
6230 .IF "$(VISTA_MANIFEST)"!=""
6231 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6232 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6233 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6234 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6235 .ELSE
6236 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6237 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6238 .ENDIF # "$(VISTA_MANIFEST)"!=""
6239 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6240 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6241 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6242 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6243 .ENDIF # "$(USE_DEFFILE)"!=""
6244 .ELSE # "$(SHL3USE_EXPORTS)"!="name"
6245 - $(SHL3LINKER) @$(mktmp $(SHL3LINKFLAGS) \
6246 + $(COMMAND_ECHO)$(SHL3LINKER) @$(mktmp $(SHL3LINKFLAGS) \
6247 $(LINKFLAGSSHL) $(SHL3BASEX) \
6248 $(SHL3STACK) -out:$(SHL3TARGETN) \
6249 -map:$(MISC)/$(@:B).map \
6250 @@ -1460,18 +1498,18 @@ $(SHL3TARGETN) : \
6251 )
6252 @echo linking $@.manifest ...
6253 .IF "$(VISTA_MANIFEST)"!=""
6254 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6255 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6256 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6257 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6258 .ELSE
6259 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6260 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6261 .ENDIF # "$(VISTA_MANIFEST)"!=""
6262 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6263 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6264 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6265 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6266 .ENDIF # "$(SHL3USE_EXPORTS)"!="name"
6267 .ELSE # "$(linkinc)"==""
6268 - -$(RM) del $(MISC)/$(SHL3TARGET).lnk
6269 - -$(RM) $(MISC)/$(SHL3TARGET).lst
6270 - $(TYPE) $(mktmp \
6271 + $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL3TARGET).lnk
6272 + $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL3TARGET).lst
6273 + $(COMMAND_ECHO)$(TYPE) $(mktmp \
6274 $(SHL3LINKFLAGS) \
6275 $(LINKFLAGSSHL) $(SHL3BASEX) \
6276 $(SHL3STACK) $(MAPFILE) \
6277 @@ -1483,17 +1521,17 @@ $(SHL3TARGETN) : \
6278 $(SHL3STDSHL) $(STDSHL3) \
6279 $(SHL3LINKRES) \
6280 ) >> $(MISC)/$(SHL3TARGET).lnk
6281 - $(TYPE) $(MISC)/$(SHL3TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL3TARGET).lnk
6282 - $(SHL3LINKER) @$(MISC)/$(SHL3TARGET).lnk
6283 + $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL3TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL3TARGET).lnk
6284 + $(COMMAND_ECHO)$(SHL3LINKER) @$(MISC)/$(SHL3TARGET).lnk
6285 @echo linking $@.manifest ...
6286 .IF "$(VISTA_MANIFEST)"!=""
6287 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6288 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6289 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6290 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6291 .ELSE
6292 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6293 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6294 .ENDIF # "$(VISTA_MANIFEST)"!=""
6295 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6296 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6297 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6298 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6299 .ENDIF # "$(linkinc)"==""
6300 .ENDIF # "$(COM)"=="GCC"
6301 .ENDIF # "$(GUI)" == "WNT"
6302 @@ -1509,11 +1547,13 @@ $(SHL3TARGETN) : \
6303 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
6304 `cat $(MISC)/$(TARGET).$(@:b)_3.cmd` \
6305 >> $(MISC)/$(TARGET).$(@:b)_3.cmd
6306 + .IF "$(VERBOSE)" == "TRUE"
6307 @cat $(MISC)/$(TARGET).$(@:b)_3.cmd
6308 + .ENDIF
6309 @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
6310 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
6311 shl $(SHL3RPATH) $@
6312 - @echo "Making: $@.jnilib"
6313 + @echo "Making: " $(@:f).jnilib
6314 @macosx-create-bundle $@
6315 .IF "$(UPDATER)"=="YES"
6316 .IF "$(SHL3NOCHECK)"==""
6317 @@ -1526,21 +1566,29 @@ $(SHL3TARGETN) : \
6318 $(SHL3VERSIONOBJ) -o $@ \
6319 `cat /dev/null $(SHL3LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
6320 $(SHL3STDLIBS) $(SHL3ARCHIVES) $(SHL3STDSHL) $(STDSHL3) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_3.cmd
6321 + .IF "$(VERBOSE)" == "TRUE"
6322 @cat $(MISC)/$(TARGET).$(@:b)_3.cmd
6323 + .ENDIF
6324 @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
6325 .IF "$(UPDATER)"=="YES"
6326 .IF "$(SHL3NOCHECK)"==""
6327 - -$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
6328 - $(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
6329 - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
6330 + $(COMMAND_ECHO)-$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
6331 + $(COMMAND_ECHO)$(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
6332 +.IF "$(VERBOSE)"=="TRUE"
6333 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
6334 +.ELSE
6335 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) -- -s $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
6336 +.ENDIF
6337 .ENDIF # "$(SHL3NOCHECK)"!=""
6338 .ENDIF # "$(UPDATER)"=="YES"
6339 .ENDIF # "$(OS)"=="MACOSX"
6340 .IF "$(UNIXVERSIONNAMES)"!=""
6341 - $(RM) $(LB)/$(SHL3TARGETN:b)
6342 - cd $(LB) && ln -s $(SHL3TARGETN:f) $(SHL3TARGETN:b)
6343 + $(COMMAND_ECHO)$(RM) $(LB)/$(SHL3TARGETN:b)
6344 + $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL3TARGETN:f) $(SHL3TARGETN:b)
6345 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
6346 +.IF "$(VERBOSE)" == "TRUE"
6347 @ls -l $@
6348 +.ENDIF
6349 .ENDIF # "$(GUI)" == "UNX"
6350
6351 .IF "$(GUI)" == "OS2"
6352 @@ -1558,16 +1606,16 @@ $(SHL3TARGETN) : \
6353 # @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL3DEFAULTRES:b).rc
6354 .ENDIF # "$(use_shl_versions)" != ""
6355 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
6356 - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc
6357 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL3DEFAULTRES:b).rc
6358 .ENDIF # "$(SHL3DEFAULTRES)"!=""
6359
6360 .IF "$(SHL3ALLRES)"!=""
6361 - +$(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES)
6362 + $(COMMAND_ECHO)+$(TYPE) $(SHL3ALLRES) > $(SHL3LINKRES)
6363 .ENDIF # "$(SHL3ALLRES)"!=""
6364
6365 .IF "$(USE_DEFFILE)"!=""
6366
6367 - $(SHL3LINKER) $(SHL3LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
6368 + $(COMMAND_ECHO)$(SHL3LINKER) $(SHL3LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
6369 $(SHL3DEF) \
6370 $(STDOBJ) \
6371 -L$(LB) \
6372 @@ -1580,7 +1628,7 @@ $(SHL3TARGETN) : \
6373
6374 .ELSE # "$(USE_DEFFILE)"!=""
6375
6376 - $(SHL3LINKER) -v $(SHL3LINKFLAGS) \
6377 + $(COMMAND_ECHO)$(SHL3LINKER) -v $(SHL3LINKFLAGS) \
6378 $(LINKFLAGSSHL) $(SHL3BASEX) \
6379 $(SHL3STACK) -o $(SHL3TARGETN) \
6380 $(SHL3DEF) \
6381 @@ -1598,7 +1646,7 @@ $(SHL3TARGETN) : \
6382 .ENDIF # "$(USE_DEFFILE)"!=""
6383
6384 .IF "$(SHL3TARGET8)" != "$(SHL3TARGET)"
6385 - +$(COPY) $@ $(@:d)$(SHL3TARGET8).dll
6386 + $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL3TARGET8).dll
6387 .ENDIF
6388
6389 .ENDIF # "$(GUI)" == "OS2"
6390 @@ -1672,7 +1720,7 @@ SHL4VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL4TARGET))}$(
6391 .ENDIF # "$(GUI)" == "UNX"
6392 $(MISC)/$(SHL4VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL4VERSIONOBJ:b).h
6393 # $(COPY) $(SOLARENV)/src/version.c $@
6394 - $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL4VERSIONOBJ:b).h/ > $@
6395 + $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL4VERSIONOBJ:b).h/ > $@
6396
6397 .INIT : $(SHL4VERSIONOBJDEP)
6398 .ENDIF # "$(VERSIONOBJ)"!=""
6399 @@ -1735,16 +1783,20 @@ $(USE_SHL4VERSIONMAP): \
6400 .ENDIF
6401 .ENDIF # "$(SHL4OBJS)!"=""
6402 @$(TYPE) /dev/null $(SHL4LIBS:s/.lib/.dump/) >> $@.dump
6403 - $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL4INTERFACE) -f $(SHL4FILTERFILE) -m $@
6404 + $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL4INTERFACE) -f $(SHL4FILTERFILE) -m $@
6405
6406 .ELSE # "$(SHL4FILTERFILE)"!=""
6407 USE_SHL4VERSIONMAP=$(MISC)/$(SHL4TARGET).vmap
6408 $(USE_SHL4VERSIONMAP) :
6409 +.IF "$(VERBOSE)" == "TRUE"
6410 @echo -----------------------------
6411 @echo SHL4FILTERFILE not set!
6412 @echo -----------------------------
6413 @$(TOUCH) $@
6414 @echo dummy file to keep the dependencies for later use.
6415 +.ELSE
6416 + @$(TOUCH) $@
6417 +.ENDIF
6418 # force_dmake_to_error
6419 .ENDIF # "$(SHL4FILTERFILE)"!=""
6420 .ELSE # "$(USE_SHL4VERSIONMAP)"!=""
6421 @@ -1771,25 +1823,25 @@ $(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP)
6422 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
6423 # happens if somebody will change it in the future
6424 .IF "$(COMID)"=="gcc3"
6425 - tr -d "\015" < $(SHL4VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
6426 + $(COMMAND_ECHO) tr -d "\015" < $(SHL4VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
6427 .ELIF "$(COMNAME)"=="sunpro5"
6428 - tr -d "\015" < $(SHL4VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
6429 + $(COMMAND_ECHO) tr -d "\015" < $(SHL4VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
6430 .ELSE # "$(COMID)"=="gcc3"
6431 - tr -d "\015" < $(SHL4VERSIONMAP) > $@
6432 + $(COMMAND_ECHO) tr -d "\015" < $(SHL4VERSIONMAP) > $@
6433 .ENDIF # "$(COMID)"=="gcc3"
6434 @chmod a+w $@
6435 # Mac OS X post-processing generate an exported symbols list from the generated map file
6436 # for details on exported symbols list see man ld on Mac OS X
6437 .IF "$(OS)"=="MACOSX"
6438 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
6439 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
6440 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
6441 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
6442 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
6443 # Extract RTTI symbols from all the objects that will be used to build a shared library
6444 .IF "$(SHL4OBJS)"!=""
6445 -echo $(foreach,i,$(SHL4OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
6446 .ENDIF
6447 .IF "$(SHL4LIBS)"!=""
6448 - -$(TYPE) $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
6449 + $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL4LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
6450 .ENDIF
6451 # overwrite the map file generate into the local output tree with the generated
6452 # exported symbols list
6453 @@ -1831,7 +1883,7 @@ SHL4LINKRESO*=$(MISC)/$(SHL4TARGET)_res.o
6454 .IF "$(SHL4LIBS)"!=""
6455 $(MISC)/$(SHL4TARGET)_linkinc.ls .PHONY:
6456 @@-$(RM) $@
6457 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@
6458 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@
6459 .ENDIF # "$(SHL4LIBS)"!=""
6460 .ENDIF
6461
6462 @@ -1847,14 +1899,14 @@ SHL4LINKLIST=$(MISC)/$(SHL4TARGET)_link.lst
6463 SHL4LINKLISTPARAM=@$(SHL4LINKLIST)
6464 $(SHL4LINKLIST) : $(SHL4LIBS)
6465 @@-$(RM) $@
6466 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@
6467 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) >> $@
6468 .ENDIF # "$(SHL4LIBS)"!=""
6469 .ENDIF # "$(COM)"!="GCC"
6470 .ENDIF
6471 .ENDIF # "$(SHL4USE_EXPORTS)"=="name"
6472
6473 $(MISC)/%linkinc.ls:
6474 - echo . > $@
6475 + @echo . > $@
6476 .ENDIF # "$(linkinc)"!=""
6477
6478 .IF "$(GUI)" == "OS2"
6479 @@ -1881,8 +1933,10 @@ $(SHL4TARGETN) : \
6480 $(SHL4DEPN) \
6481 $(SHL4IMP_ORD) \
6482 $(SHL4LINKLIST)
6483 +.IF "$(VERBOSE)" == "TRUE"
6484 @echo ------------------------------
6485 - @echo Making: $(SHL4TARGETN)
6486 +.ENDIF
6487 + @echo "Making: " $(@:f)
6488 .IF "$(GUI)" == "WNT"
6489 .IF "$(SHL4DEFAULTRES)"!=""
6490 @@-$(RM) $(MISC)/$(SHL4DEFAULTRES:b).rc
6491 @@ -1902,10 +1956,10 @@ $(SHL4TARGETN) : \
6492 @echo $(EMQ)#define INTERNAL_NAME $(SHL4TARGET:b) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
6493 @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL4DEFAULTRES:b).rc
6494 .ENDIF # "$(use_shl_versions)" != ""
6495 - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc
6496 + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc
6497 .ENDIF # "$(SHL4DEFAULTRES)"!=""
6498 .IF "$(SHL4ALLRES)"!=""
6499 - $(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES)
6500 + $(COMMAND_ECHO)$(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES)
6501 .IF "$(COM)"=="GCC"
6502 windres $(SHL4LINKRES) $(SHL4LINKRESO)
6503 .ENDIF # "$(COM)"=="GCC"
6504 @@ -1952,15 +2006,15 @@ $(SHL4TARGETN) : \
6505 @@$(LS) $@
6506 @echo linking $@.manifest ...
6507 .IF "$(VISTA_MANIFEST)"!=""
6508 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6509 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6510 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6511 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6512 .ELSE
6513 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6514 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6515 .ENDIF # "$(VISTA_MANIFEST)"!=""
6516 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6517 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6518 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6519 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6520 .ELSE # "$(USE_DEFFILE)"!=""
6521 - $(SHL4LINKER) @$(mktmp $(SHL4LINKFLAGS) \
6522 + $(COMMAND_ECHO)$(SHL4LINKER) @$(mktmp $(SHL4LINKFLAGS) \
6523 $(LINKFLAGSSHL) $(SHL4BASEX) \
6524 $(SHL4STACK) -out:$(SHL4TARGETN) \
6525 -map:$(MISC)/$(@:B).map \
6526 @@ -1976,16 +2030,16 @@ $(SHL4TARGETN) : \
6527 @@$(LS) $@
6528 @echo linking $@.manifest ...
6529 .IF "$(VISTA_MANIFEST)"!=""
6530 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6531 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6532 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6533 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6534 .ELSE
6535 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6536 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6537 .ENDIF # "$(VISTA_MANIFEST)"!=""
6538 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6539 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6540 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6541 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6542 .ENDIF # "$(USE_DEFFILE)"!=""
6543 .ELSE # "$(SHL4USE_EXPORTS)"!="name"
6544 - $(SHL4LINKER) @$(mktmp $(SHL4LINKFLAGS) \
6545 + $(COMMAND_ECHO)$(SHL4LINKER) @$(mktmp $(SHL4LINKFLAGS) \
6546 $(LINKFLAGSSHL) $(SHL4BASEX) \
6547 $(SHL4STACK) -out:$(SHL4TARGETN) \
6548 -map:$(MISC)/$(@:B).map \
6549 @@ -1999,18 +2053,18 @@ $(SHL4TARGETN) : \
6550 )
6551 @echo linking $@.manifest ...
6552 .IF "$(VISTA_MANIFEST)"!=""
6553 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6554 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6555 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6556 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6557 .ELSE
6558 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6559 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6560 .ENDIF # "$(VISTA_MANIFEST)"!=""
6561 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6562 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6563 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6564 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6565 .ENDIF # "$(SHL4USE_EXPORTS)"!="name"
6566 .ELSE # "$(linkinc)"==""
6567 - -$(RM) del $(MISC)/$(SHL4TARGET).lnk
6568 - -$(RM) $(MISC)/$(SHL4TARGET).lst
6569 - $(TYPE) $(mktmp \
6570 + $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL4TARGET).lnk
6571 + $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL4TARGET).lst
6572 + $(COMMAND_ECHO)$(TYPE) $(mktmp \
6573 $(SHL4LINKFLAGS) \
6574 $(LINKFLAGSSHL) $(SHL4BASEX) \
6575 $(SHL4STACK) $(MAPFILE) \
6576 @@ -2022,17 +2076,17 @@ $(SHL4TARGETN) : \
6577 $(SHL4STDSHL) $(STDSHL4) \
6578 $(SHL4LINKRES) \
6579 ) >> $(MISC)/$(SHL4TARGET).lnk
6580 - $(TYPE) $(MISC)/$(SHL4TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL4TARGET).lnk
6581 - $(SHL4LINKER) @$(MISC)/$(SHL4TARGET).lnk
6582 + $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL4TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL4TARGET).lnk
6583 + $(COMMAND_ECHO)$(SHL4LINKER) @$(MISC)/$(SHL4TARGET).lnk
6584 @echo linking $@.manifest ...
6585 .IF "$(VISTA_MANIFEST)"!=""
6586 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6587 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6588 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6589 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6590 .ELSE
6591 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6592 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6593 .ENDIF # "$(VISTA_MANIFEST)"!=""
6594 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6595 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6596 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6597 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6598 .ENDIF # "$(linkinc)"==""
6599 .ENDIF # "$(COM)"=="GCC"
6600 .ENDIF # "$(GUI)" == "WNT"
6601 @@ -2048,11 +2102,13 @@ $(SHL4TARGETN) : \
6602 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
6603 `cat $(MISC)/$(TARGET).$(@:b)_4.cmd` \
6604 >> $(MISC)/$(TARGET).$(@:b)_4.cmd
6605 + .IF "$(VERBOSE)" == "TRUE"
6606 @cat $(MISC)/$(TARGET).$(@:b)_4.cmd
6607 + .ENDIF
6608 @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
6609 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
6610 shl $(SHL4RPATH) $@
6611 - @echo "Making: $@.jnilib"
6612 + @echo "Making: " $(@:f).jnilib
6613 @macosx-create-bundle $@
6614 .IF "$(UPDATER)"=="YES"
6615 .IF "$(SHL4NOCHECK)"==""
6616 @@ -2065,21 +2121,29 @@ $(SHL4TARGETN) : \
6617 $(SHL4VERSIONOBJ) -o $@ \
6618 `cat /dev/null $(SHL4LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
6619 $(SHL4STDLIBS) $(SHL4ARCHIVES) $(SHL4STDSHL) $(STDSHL4) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_4.cmd
6620 + .IF "$(VERBOSE)" == "TRUE"
6621 @cat $(MISC)/$(TARGET).$(@:b)_4.cmd
6622 + .ENDIF
6623 @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
6624 .IF "$(UPDATER)"=="YES"
6625 .IF "$(SHL4NOCHECK)"==""
6626 - -$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
6627 - $(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
6628 - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
6629 + $(COMMAND_ECHO)-$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
6630 + $(COMMAND_ECHO)$(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
6631 +.IF "$(VERBOSE)"=="TRUE"
6632 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
6633 +.ELSE
6634 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) -- -s $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
6635 +.ENDIF
6636 .ENDIF # "$(SHL4NOCHECK)"!=""
6637 .ENDIF # "$(UPDATER)"=="YES"
6638 .ENDIF # "$(OS)"=="MACOSX"
6639 .IF "$(UNIXVERSIONNAMES)"!=""
6640 - $(RM) $(LB)/$(SHL4TARGETN:b)
6641 - cd $(LB) && ln -s $(SHL4TARGETN:f) $(SHL4TARGETN:b)
6642 + $(COMMAND_ECHO)$(RM) $(LB)/$(SHL4TARGETN:b)
6643 + $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL4TARGETN:f) $(SHL4TARGETN:b)
6644 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
6645 +.IF "$(VERBOSE)" == "TRUE"
6646 @ls -l $@
6647 +.ENDIF
6648 .ENDIF # "$(GUI)" == "UNX"
6649
6650 .IF "$(GUI)" == "OS2"
6651 @@ -2097,16 +2161,16 @@ $(SHL4TARGETN) : \
6652 # @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL4DEFAULTRES:b).rc
6653 .ENDIF # "$(use_shl_versions)" != ""
6654 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
6655 - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc
6656 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL4DEFAULTRES:b).rc
6657 .ENDIF # "$(SHL4DEFAULTRES)"!=""
6658
6659 .IF "$(SHL4ALLRES)"!=""
6660 - +$(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES)
6661 + $(COMMAND_ECHO)+$(TYPE) $(SHL4ALLRES) > $(SHL4LINKRES)
6662 .ENDIF # "$(SHL4ALLRES)"!=""
6663
6664 .IF "$(USE_DEFFILE)"!=""
6665
6666 - $(SHL4LINKER) $(SHL4LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
6667 + $(COMMAND_ECHO)$(SHL4LINKER) $(SHL4LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
6668 $(SHL4DEF) \
6669 $(STDOBJ) \
6670 -L$(LB) \
6671 @@ -2119,7 +2183,7 @@ $(SHL4TARGETN) : \
6672
6673 .ELSE # "$(USE_DEFFILE)"!=""
6674
6675 - $(SHL4LINKER) -v $(SHL4LINKFLAGS) \
6676 + $(COMMAND_ECHO)$(SHL4LINKER) -v $(SHL4LINKFLAGS) \
6677 $(LINKFLAGSSHL) $(SHL4BASEX) \
6678 $(SHL4STACK) -o $(SHL4TARGETN) \
6679 $(SHL4DEF) \
6680 @@ -2137,7 +2201,7 @@ $(SHL4TARGETN) : \
6681 .ENDIF # "$(USE_DEFFILE)"!=""
6682
6683 .IF "$(SHL4TARGET8)" != "$(SHL4TARGET)"
6684 - +$(COPY) $@ $(@:d)$(SHL4TARGET8).dll
6685 + $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL4TARGET8).dll
6686 .ENDIF
6687
6688 .ENDIF # "$(GUI)" == "OS2"
6689 @@ -2211,7 +2275,7 @@ SHL5VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL5TARGET))}$(
6690 .ENDIF # "$(GUI)" == "UNX"
6691 $(MISC)/$(SHL5VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL5VERSIONOBJ:b).h
6692 # $(COPY) $(SOLARENV)/src/version.c $@
6693 - $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL5VERSIONOBJ:b).h/ > $@
6694 + $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL5VERSIONOBJ:b).h/ > $@
6695
6696 .INIT : $(SHL5VERSIONOBJDEP)
6697 .ENDIF # "$(VERSIONOBJ)"!=""
6698 @@ -2274,16 +2338,20 @@ $(USE_SHL5VERSIONMAP): \
6699 .ENDIF
6700 .ENDIF # "$(SHL5OBJS)!"=""
6701 @$(TYPE) /dev/null $(SHL5LIBS:s/.lib/.dump/) >> $@.dump
6702 - $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL5INTERFACE) -f $(SHL5FILTERFILE) -m $@
6703 + $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL5INTERFACE) -f $(SHL5FILTERFILE) -m $@
6704
6705 .ELSE # "$(SHL5FILTERFILE)"!=""
6706 USE_SHL5VERSIONMAP=$(MISC)/$(SHL5TARGET).vmap
6707 $(USE_SHL5VERSIONMAP) :
6708 +.IF "$(VERBOSE)" == "TRUE"
6709 @echo -----------------------------
6710 @echo SHL5FILTERFILE not set!
6711 @echo -----------------------------
6712 @$(TOUCH) $@
6713 @echo dummy file to keep the dependencies for later use.
6714 +.ELSE
6715 + @$(TOUCH) $@
6716 +.ENDIF
6717 # force_dmake_to_error
6718 .ENDIF # "$(SHL5FILTERFILE)"!=""
6719 .ELSE # "$(USE_SHL5VERSIONMAP)"!=""
6720 @@ -2310,25 +2378,25 @@ $(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP)
6721 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
6722 # happens if somebody will change it in the future
6723 .IF "$(COMID)"=="gcc3"
6724 - tr -d "\015" < $(SHL5VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
6725 + $(COMMAND_ECHO) tr -d "\015" < $(SHL5VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
6726 .ELIF "$(COMNAME)"=="sunpro5"
6727 - tr -d "\015" < $(SHL5VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
6728 + $(COMMAND_ECHO) tr -d "\015" < $(SHL5VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
6729 .ELSE # "$(COMID)"=="gcc3"
6730 - tr -d "\015" < $(SHL5VERSIONMAP) > $@
6731 + $(COMMAND_ECHO) tr -d "\015" < $(SHL5VERSIONMAP) > $@
6732 .ENDIF # "$(COMID)"=="gcc3"
6733 @chmod a+w $@
6734 # Mac OS X post-processing generate an exported symbols list from the generated map file
6735 # for details on exported symbols list see man ld on Mac OS X
6736 .IF "$(OS)"=="MACOSX"
6737 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
6738 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
6739 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
6740 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
6741 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
6742 # Extract RTTI symbols from all the objects that will be used to build a shared library
6743 .IF "$(SHL5OBJS)"!=""
6744 -echo $(foreach,i,$(SHL5OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
6745 .ENDIF
6746 .IF "$(SHL5LIBS)"!=""
6747 - -$(TYPE) $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
6748 + $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL5LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
6749 .ENDIF
6750 # overwrite the map file generate into the local output tree with the generated
6751 # exported symbols list
6752 @@ -2370,7 +2438,7 @@ SHL5LINKRESO*=$(MISC)/$(SHL5TARGET)_res.o
6753 .IF "$(SHL5LIBS)"!=""
6754 $(MISC)/$(SHL5TARGET)_linkinc.ls .PHONY:
6755 @@-$(RM) $@
6756 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@
6757 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@
6758 .ENDIF # "$(SHL5LIBS)"!=""
6759 .ENDIF
6760
6761 @@ -2386,14 +2454,14 @@ SHL5LINKLIST=$(MISC)/$(SHL5TARGET)_link.lst
6762 SHL5LINKLISTPARAM=@$(SHL5LINKLIST)
6763 $(SHL5LINKLIST) : $(SHL5LIBS)
6764 @@-$(RM) $@
6765 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@
6766 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL5LIBS) $(i:s/.lib/.lin/)) >> $@
6767 .ENDIF # "$(SHL5LIBS)"!=""
6768 .ENDIF # "$(COM)"!="GCC"
6769 .ENDIF
6770 .ENDIF # "$(SHL5USE_EXPORTS)"=="name"
6771
6772 $(MISC)/%linkinc.ls:
6773 - echo . > $@
6774 + @echo . > $@
6775 .ENDIF # "$(linkinc)"!=""
6776
6777 .IF "$(GUI)" == "OS2"
6778 @@ -2420,8 +2488,10 @@ $(SHL5TARGETN) : \
6779 $(SHL5DEPN) \
6780 $(SHL5IMP_ORD) \
6781 $(SHL5LINKLIST)
6782 +.IF "$(VERBOSE)" == "TRUE"
6783 @echo ------------------------------
6784 - @echo Making: $(SHL5TARGETN)
6785 +.ENDIF
6786 + @echo "Making: " $(@:f)
6787 .IF "$(GUI)" == "WNT"
6788 .IF "$(SHL5DEFAULTRES)"!=""
6789 @@-$(RM) $(MISC)/$(SHL5DEFAULTRES:b).rc
6790 @@ -2441,10 +2511,10 @@ $(SHL5TARGETN) : \
6791 @echo $(EMQ)#define INTERNAL_NAME $(SHL5TARGET:b) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
6792 @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL5DEFAULTRES:b).rc
6793 .ENDIF # "$(use_shl_versions)" != ""
6794 - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc
6795 + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc
6796 .ENDIF # "$(SHL5DEFAULTRES)"!=""
6797 .IF "$(SHL5ALLRES)"!=""
6798 - $(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES)
6799 + $(COMMAND_ECHO)$(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES)
6800 .IF "$(COM)"=="GCC"
6801 windres $(SHL5LINKRES) $(SHL5LINKRESO)
6802 .ENDIF # "$(COM)"=="GCC"
6803 @@ -2491,15 +2561,15 @@ $(SHL5TARGETN) : \
6804 @@$(LS) $@
6805 @echo linking $@.manifest ...
6806 .IF "$(VISTA_MANIFEST)"!=""
6807 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6808 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6809 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6810 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6811 .ELSE
6812 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6813 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6814 .ENDIF # "$(VISTA_MANIFEST)"!=""
6815 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6816 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6817 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6818 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6819 .ELSE # "$(USE_DEFFILE)"!=""
6820 - $(SHL5LINKER) @$(mktmp $(SHL5LINKFLAGS) \
6821 + $(COMMAND_ECHO)$(SHL5LINKER) @$(mktmp $(SHL5LINKFLAGS) \
6822 $(LINKFLAGSSHL) $(SHL5BASEX) \
6823 $(SHL5STACK) -out:$(SHL5TARGETN) \
6824 -map:$(MISC)/$(@:B).map \
6825 @@ -2515,16 +2585,16 @@ $(SHL5TARGETN) : \
6826 @@$(LS) $@
6827 @echo linking $@.manifest ...
6828 .IF "$(VISTA_MANIFEST)"!=""
6829 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6830 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6831 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6832 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6833 .ELSE
6834 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6835 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6836 .ENDIF # "$(VISTA_MANIFEST)"!=""
6837 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6838 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6839 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6840 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6841 .ENDIF # "$(USE_DEFFILE)"!=""
6842 .ELSE # "$(SHL5USE_EXPORTS)"!="name"
6843 - $(SHL5LINKER) @$(mktmp $(SHL5LINKFLAGS) \
6844 + $(COMMAND_ECHO)$(SHL5LINKER) @$(mktmp $(SHL5LINKFLAGS) \
6845 $(LINKFLAGSSHL) $(SHL5BASEX) \
6846 $(SHL5STACK) -out:$(SHL5TARGETN) \
6847 -map:$(MISC)/$(@:B).map \
6848 @@ -2538,18 +2608,18 @@ $(SHL5TARGETN) : \
6849 )
6850 @echo linking $@.manifest ...
6851 .IF "$(VISTA_MANIFEST)"!=""
6852 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6853 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6854 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6855 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6856 .ELSE
6857 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6858 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6859 .ENDIF # "$(VISTA_MANIFEST)"!=""
6860 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6861 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6862 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6863 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6864 .ENDIF # "$(SHL5USE_EXPORTS)"!="name"
6865 .ELSE # "$(linkinc)"==""
6866 - -$(RM) del $(MISC)/$(SHL5TARGET).lnk
6867 - -$(RM) $(MISC)/$(SHL5TARGET).lst
6868 - $(TYPE) $(mktmp \
6869 + $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL5TARGET).lnk
6870 + $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL5TARGET).lst
6871 + $(COMMAND_ECHO)$(TYPE) $(mktmp \
6872 $(SHL5LINKFLAGS) \
6873 $(LINKFLAGSSHL) $(SHL5BASEX) \
6874 $(SHL5STACK) $(MAPFILE) \
6875 @@ -2561,17 +2631,17 @@ $(SHL5TARGETN) : \
6876 $(SHL5STDSHL) $(STDSHL5) \
6877 $(SHL5LINKRES) \
6878 ) >> $(MISC)/$(SHL5TARGET).lnk
6879 - $(TYPE) $(MISC)/$(SHL5TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL5TARGET).lnk
6880 - $(SHL5LINKER) @$(MISC)/$(SHL5TARGET).lnk
6881 + $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL5TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL5TARGET).lnk
6882 + $(COMMAND_ECHO)$(SHL5LINKER) @$(MISC)/$(SHL5TARGET).lnk
6883 @echo linking $@.manifest ...
6884 .IF "$(VISTA_MANIFEST)"!=""
6885 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6886 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6887 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
6888 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
6889 .ELSE
6890 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6891 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
6892 .ENDIF # "$(VISTA_MANIFEST)"!=""
6893 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6894 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6895 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
6896 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
6897 .ENDIF # "$(linkinc)"==""
6898 .ENDIF # "$(COM)"=="GCC"
6899 .ENDIF # "$(GUI)" == "WNT"
6900 @@ -2587,11 +2657,13 @@ $(SHL5TARGETN) : \
6901 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
6902 `cat $(MISC)/$(TARGET).$(@:b)_5.cmd` \
6903 >> $(MISC)/$(TARGET).$(@:b)_5.cmd
6904 + .IF "$(VERBOSE)" == "TRUE"
6905 @cat $(MISC)/$(TARGET).$(@:b)_5.cmd
6906 + .ENDIF
6907 @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
6908 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
6909 shl $(SHL5RPATH) $@
6910 - @echo "Making: $@.jnilib"
6911 + @echo "Making: " $(@:f).jnilib
6912 @macosx-create-bundle $@
6913 .IF "$(UPDATER)"=="YES"
6914 .IF "$(SHL5NOCHECK)"==""
6915 @@ -2604,21 +2676,29 @@ $(SHL5TARGETN) : \
6916 $(SHL5VERSIONOBJ) -o $@ \
6917 `cat /dev/null $(SHL5LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
6918 $(SHL5STDLIBS) $(SHL5ARCHIVES) $(SHL5STDSHL) $(STDSHL5) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_5.cmd
6919 + .IF "$(VERBOSE)" == "TRUE"
6920 @cat $(MISC)/$(TARGET).$(@:b)_5.cmd
6921 + .ENDIF
6922 @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
6923 .IF "$(UPDATER)"=="YES"
6924 .IF "$(SHL5NOCHECK)"==""
6925 - -$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
6926 - $(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
6927 - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
6928 + $(COMMAND_ECHO)-$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
6929 + $(COMMAND_ECHO)$(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
6930 +.IF "$(VERBOSE)"=="TRUE"
6931 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
6932 +.ELSE
6933 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) -- -s $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
6934 +.ENDIF
6935 .ENDIF # "$(SHL5NOCHECK)"!=""
6936 .ENDIF # "$(UPDATER)"=="YES"
6937 .ENDIF # "$(OS)"=="MACOSX"
6938 .IF "$(UNIXVERSIONNAMES)"!=""
6939 - $(RM) $(LB)/$(SHL5TARGETN:b)
6940 - cd $(LB) && ln -s $(SHL5TARGETN:f) $(SHL5TARGETN:b)
6941 + $(COMMAND_ECHO)$(RM) $(LB)/$(SHL5TARGETN:b)
6942 + $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL5TARGETN:f) $(SHL5TARGETN:b)
6943 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
6944 +.IF "$(VERBOSE)" == "TRUE"
6945 @ls -l $@
6946 +.ENDIF
6947 .ENDIF # "$(GUI)" == "UNX"
6948
6949 .IF "$(GUI)" == "OS2"
6950 @@ -2636,16 +2716,16 @@ $(SHL5TARGETN) : \
6951 # @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL5DEFAULTRES:b).rc
6952 .ENDIF # "$(use_shl_versions)" != ""
6953 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
6954 - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc
6955 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL5DEFAULTRES:b).rc
6956 .ENDIF # "$(SHL5DEFAULTRES)"!=""
6957
6958 .IF "$(SHL5ALLRES)"!=""
6959 - +$(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES)
6960 + $(COMMAND_ECHO)+$(TYPE) $(SHL5ALLRES) > $(SHL5LINKRES)
6961 .ENDIF # "$(SHL5ALLRES)"!=""
6962
6963 .IF "$(USE_DEFFILE)"!=""
6964
6965 - $(SHL5LINKER) $(SHL5LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
6966 + $(COMMAND_ECHO)$(SHL5LINKER) $(SHL5LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
6967 $(SHL5DEF) \
6968 $(STDOBJ) \
6969 -L$(LB) \
6970 @@ -2658,7 +2738,7 @@ $(SHL5TARGETN) : \
6971
6972 .ELSE # "$(USE_DEFFILE)"!=""
6973
6974 - $(SHL5LINKER) -v $(SHL5LINKFLAGS) \
6975 + $(COMMAND_ECHO)$(SHL5LINKER) -v $(SHL5LINKFLAGS) \
6976 $(LINKFLAGSSHL) $(SHL5BASEX) \
6977 $(SHL5STACK) -o $(SHL5TARGETN) \
6978 $(SHL5DEF) \
6979 @@ -2676,7 +2756,7 @@ $(SHL5TARGETN) : \
6980 .ENDIF # "$(USE_DEFFILE)"!=""
6981
6982 .IF "$(SHL5TARGET8)" != "$(SHL5TARGET)"
6983 - +$(COPY) $@ $(@:d)$(SHL5TARGET8).dll
6984 + $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL5TARGET8).dll
6985 .ENDIF
6986
6987 .ENDIF # "$(GUI)" == "OS2"
6988 @@ -2750,7 +2830,7 @@ SHL6VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL6TARGET))}$(
6989 .ENDIF # "$(GUI)" == "UNX"
6990 $(MISC)/$(SHL6VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL6VERSIONOBJ:b).h
6991 # $(COPY) $(SOLARENV)/src/version.c $@
6992 - $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL6VERSIONOBJ:b).h/ > $@
6993 + $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL6VERSIONOBJ:b).h/ > $@
6994
6995 .INIT : $(SHL6VERSIONOBJDEP)
6996 .ENDIF # "$(VERSIONOBJ)"!=""
6997 @@ -2813,16 +2893,20 @@ $(USE_SHL6VERSIONMAP): \
6998 .ENDIF
6999 .ENDIF # "$(SHL6OBJS)!"=""
7000 @$(TYPE) /dev/null $(SHL6LIBS:s/.lib/.dump/) >> $@.dump
7001 - $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL6INTERFACE) -f $(SHL6FILTERFILE) -m $@
7002 + $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL6INTERFACE) -f $(SHL6FILTERFILE) -m $@
7003
7004 .ELSE # "$(SHL6FILTERFILE)"!=""
7005 USE_SHL6VERSIONMAP=$(MISC)/$(SHL6TARGET).vmap
7006 $(USE_SHL6VERSIONMAP) :
7007 +.IF "$(VERBOSE)" == "TRUE"
7008 @echo -----------------------------
7009 @echo SHL6FILTERFILE not set!
7010 @echo -----------------------------
7011 @$(TOUCH) $@
7012 @echo dummy file to keep the dependencies for later use.
7013 +.ELSE
7014 + @$(TOUCH) $@
7015 +.ENDIF
7016 # force_dmake_to_error
7017 .ENDIF # "$(SHL6FILTERFILE)"!=""
7018 .ELSE # "$(USE_SHL6VERSIONMAP)"!=""
7019 @@ -2849,25 +2933,25 @@ $(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP)
7020 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
7021 # happens if somebody will change it in the future
7022 .IF "$(COMID)"=="gcc3"
7023 - tr -d "\015" < $(SHL6VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
7024 + $(COMMAND_ECHO) tr -d "\015" < $(SHL6VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
7025 .ELIF "$(COMNAME)"=="sunpro5"
7026 - tr -d "\015" < $(SHL6VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
7027 + $(COMMAND_ECHO) tr -d "\015" < $(SHL6VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
7028 .ELSE # "$(COMID)"=="gcc3"
7029 - tr -d "\015" < $(SHL6VERSIONMAP) > $@
7030 + $(COMMAND_ECHO) tr -d "\015" < $(SHL6VERSIONMAP) > $@
7031 .ENDIF # "$(COMID)"=="gcc3"
7032 @chmod a+w $@
7033 # Mac OS X post-processing generate an exported symbols list from the generated map file
7034 # for details on exported symbols list see man ld on Mac OS X
7035 .IF "$(OS)"=="MACOSX"
7036 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
7037 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
7038 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
7039 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
7040 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
7041 # Extract RTTI symbols from all the objects that will be used to build a shared library
7042 .IF "$(SHL6OBJS)"!=""
7043 -echo $(foreach,i,$(SHL6OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
7044 .ENDIF
7045 .IF "$(SHL6LIBS)"!=""
7046 - -$(TYPE) $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
7047 + $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL6LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
7048 .ENDIF
7049 # overwrite the map file generate into the local output tree with the generated
7050 # exported symbols list
7051 @@ -2909,7 +2993,7 @@ SHL6LINKRESO*=$(MISC)/$(SHL6TARGET)_res.o
7052 .IF "$(SHL6LIBS)"!=""
7053 $(MISC)/$(SHL6TARGET)_linkinc.ls .PHONY:
7054 @@-$(RM) $@
7055 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@
7056 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@
7057 .ENDIF # "$(SHL6LIBS)"!=""
7058 .ENDIF
7059
7060 @@ -2925,14 +3009,14 @@ SHL6LINKLIST=$(MISC)/$(SHL6TARGET)_link.lst
7061 SHL6LINKLISTPARAM=@$(SHL6LINKLIST)
7062 $(SHL6LINKLIST) : $(SHL6LIBS)
7063 @@-$(RM) $@
7064 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@
7065 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL6LIBS) $(i:s/.lib/.lin/)) >> $@
7066 .ENDIF # "$(SHL6LIBS)"!=""
7067 .ENDIF # "$(COM)"!="GCC"
7068 .ENDIF
7069 .ENDIF # "$(SHL6USE_EXPORTS)"=="name"
7070
7071 $(MISC)/%linkinc.ls:
7072 - echo . > $@
7073 + @echo . > $@
7074 .ENDIF # "$(linkinc)"!=""
7075
7076 .IF "$(GUI)" == "OS2"
7077 @@ -2959,8 +3043,10 @@ $(SHL6TARGETN) : \
7078 $(SHL6DEPN) \
7079 $(SHL6IMP_ORD) \
7080 $(SHL6LINKLIST)
7081 +.IF "$(VERBOSE)" == "TRUE"
7082 @echo ------------------------------
7083 - @echo Making: $(SHL6TARGETN)
7084 +.ENDIF
7085 + @echo "Making: " $(@:f)
7086 .IF "$(GUI)" == "WNT"
7087 .IF "$(SHL6DEFAULTRES)"!=""
7088 @@-$(RM) $(MISC)/$(SHL6DEFAULTRES:b).rc
7089 @@ -2980,10 +3066,10 @@ $(SHL6TARGETN) : \
7090 @echo $(EMQ)#define INTERNAL_NAME $(SHL6TARGET:b) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
7091 @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL6DEFAULTRES:b).rc
7092 .ENDIF # "$(use_shl_versions)" != ""
7093 - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc
7094 + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc
7095 .ENDIF # "$(SHL6DEFAULTRES)"!=""
7096 .IF "$(SHL6ALLRES)"!=""
7097 - $(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES)
7098 + $(COMMAND_ECHO)$(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES)
7099 .IF "$(COM)"=="GCC"
7100 windres $(SHL6LINKRES) $(SHL6LINKRESO)
7101 .ENDIF # "$(COM)"=="GCC"
7102 @@ -3030,15 +3116,15 @@ $(SHL6TARGETN) : \
7103 @@$(LS) $@
7104 @echo linking $@.manifest ...
7105 .IF "$(VISTA_MANIFEST)"!=""
7106 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7107 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7108 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7109 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7110 .ELSE
7111 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7112 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7113 .ENDIF # "$(VISTA_MANIFEST)"!=""
7114 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7115 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7116 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7117 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7118 .ELSE # "$(USE_DEFFILE)"!=""
7119 - $(SHL6LINKER) @$(mktmp $(SHL6LINKFLAGS) \
7120 + $(COMMAND_ECHO)$(SHL6LINKER) @$(mktmp $(SHL6LINKFLAGS) \
7121 $(LINKFLAGSSHL) $(SHL6BASEX) \
7122 $(SHL6STACK) -out:$(SHL6TARGETN) \
7123 -map:$(MISC)/$(@:B).map \
7124 @@ -3054,16 +3140,16 @@ $(SHL6TARGETN) : \
7125 @@$(LS) $@
7126 @echo linking $@.manifest ...
7127 .IF "$(VISTA_MANIFEST)"!=""
7128 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7129 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7130 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7131 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7132 .ELSE
7133 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7134 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7135 .ENDIF # "$(VISTA_MANIFEST)"!=""
7136 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7137 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7138 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7139 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7140 .ENDIF # "$(USE_DEFFILE)"!=""
7141 .ELSE # "$(SHL6USE_EXPORTS)"!="name"
7142 - $(SHL6LINKER) @$(mktmp $(SHL6LINKFLAGS) \
7143 + $(COMMAND_ECHO)$(SHL6LINKER) @$(mktmp $(SHL6LINKFLAGS) \
7144 $(LINKFLAGSSHL) $(SHL6BASEX) \
7145 $(SHL6STACK) -out:$(SHL6TARGETN) \
7146 -map:$(MISC)/$(@:B).map \
7147 @@ -3077,18 +3163,18 @@ $(SHL6TARGETN) : \
7148 )
7149 @echo linking $@.manifest ...
7150 .IF "$(VISTA_MANIFEST)"!=""
7151 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7152 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7153 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7154 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7155 .ELSE
7156 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7157 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7158 .ENDIF # "$(VISTA_MANIFEST)"!=""
7159 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7160 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7161 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7162 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7163 .ENDIF # "$(SHL6USE_EXPORTS)"!="name"
7164 .ELSE # "$(linkinc)"==""
7165 - -$(RM) del $(MISC)/$(SHL6TARGET).lnk
7166 - -$(RM) $(MISC)/$(SHL6TARGET).lst
7167 - $(TYPE) $(mktmp \
7168 + $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL6TARGET).lnk
7169 + $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL6TARGET).lst
7170 + $(COMMAND_ECHO)$(TYPE) $(mktmp \
7171 $(SHL6LINKFLAGS) \
7172 $(LINKFLAGSSHL) $(SHL6BASEX) \
7173 $(SHL6STACK) $(MAPFILE) \
7174 @@ -3100,17 +3186,17 @@ $(SHL6TARGETN) : \
7175 $(SHL6STDSHL) $(STDSHL6) \
7176 $(SHL6LINKRES) \
7177 ) >> $(MISC)/$(SHL6TARGET).lnk
7178 - $(TYPE) $(MISC)/$(SHL6TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL6TARGET).lnk
7179 - $(SHL6LINKER) @$(MISC)/$(SHL6TARGET).lnk
7180 + $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL6TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL6TARGET).lnk
7181 + $(COMMAND_ECHO)$(SHL6LINKER) @$(MISC)/$(SHL6TARGET).lnk
7182 @echo linking $@.manifest ...
7183 .IF "$(VISTA_MANIFEST)"!=""
7184 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7185 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7186 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7187 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7188 .ELSE
7189 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7190 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7191 .ENDIF # "$(VISTA_MANIFEST)"!=""
7192 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7193 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7194 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7195 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7196 .ENDIF # "$(linkinc)"==""
7197 .ENDIF # "$(COM)"=="GCC"
7198 .ENDIF # "$(GUI)" == "WNT"
7199 @@ -3126,11 +3212,13 @@ $(SHL6TARGETN) : \
7200 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
7201 `cat $(MISC)/$(TARGET).$(@:b)_6.cmd` \
7202 >> $(MISC)/$(TARGET).$(@:b)_6.cmd
7203 + .IF "$(VERBOSE)" == "TRUE"
7204 @cat $(MISC)/$(TARGET).$(@:b)_6.cmd
7205 + .ENDIF
7206 @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
7207 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
7208 shl $(SHL6RPATH) $@
7209 - @echo "Making: $@.jnilib"
7210 + @echo "Making: " $(@:f).jnilib
7211 @macosx-create-bundle $@
7212 .IF "$(UPDATER)"=="YES"
7213 .IF "$(SHL6NOCHECK)"==""
7214 @@ -3143,21 +3231,29 @@ $(SHL6TARGETN) : \
7215 $(SHL6VERSIONOBJ) -o $@ \
7216 `cat /dev/null $(SHL6LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
7217 $(SHL6STDLIBS) $(SHL6ARCHIVES) $(SHL6STDSHL) $(STDSHL6) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_6.cmd
7218 + .IF "$(VERBOSE)" == "TRUE"
7219 @cat $(MISC)/$(TARGET).$(@:b)_6.cmd
7220 + .ENDIF
7221 @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
7222 .IF "$(UPDATER)"=="YES"
7223 .IF "$(SHL6NOCHECK)"==""
7224 - -$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
7225 - $(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
7226 - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
7227 + $(COMMAND_ECHO)-$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
7228 + $(COMMAND_ECHO)$(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
7229 +.IF "$(VERBOSE)"=="TRUE"
7230 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
7231 +.ELSE
7232 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) -- -s $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
7233 +.ENDIF
7234 .ENDIF # "$(SHL6NOCHECK)"!=""
7235 .ENDIF # "$(UPDATER)"=="YES"
7236 .ENDIF # "$(OS)"=="MACOSX"
7237 .IF "$(UNIXVERSIONNAMES)"!=""
7238 - $(RM) $(LB)/$(SHL6TARGETN:b)
7239 - cd $(LB) && ln -s $(SHL6TARGETN:f) $(SHL6TARGETN:b)
7240 + $(COMMAND_ECHO)$(RM) $(LB)/$(SHL6TARGETN:b)
7241 + $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL6TARGETN:f) $(SHL6TARGETN:b)
7242 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
7243 +.IF "$(VERBOSE)" == "TRUE"
7244 @ls -l $@
7245 +.ENDIF
7246 .ENDIF # "$(GUI)" == "UNX"
7247
7248 .IF "$(GUI)" == "OS2"
7249 @@ -3175,16 +3271,16 @@ $(SHL6TARGETN) : \
7250 # @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL6DEFAULTRES:b).rc
7251 .ENDIF # "$(use_shl_versions)" != ""
7252 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
7253 - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc
7254 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL6DEFAULTRES:b).rc
7255 .ENDIF # "$(SHL6DEFAULTRES)"!=""
7256
7257 .IF "$(SHL6ALLRES)"!=""
7258 - +$(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES)
7259 + $(COMMAND_ECHO)+$(TYPE) $(SHL6ALLRES) > $(SHL6LINKRES)
7260 .ENDIF # "$(SHL6ALLRES)"!=""
7261
7262 .IF "$(USE_DEFFILE)"!=""
7263
7264 - $(SHL6LINKER) $(SHL6LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
7265 + $(COMMAND_ECHO)$(SHL6LINKER) $(SHL6LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
7266 $(SHL6DEF) \
7267 $(STDOBJ) \
7268 -L$(LB) \
7269 @@ -3197,7 +3293,7 @@ $(SHL6TARGETN) : \
7270
7271 .ELSE # "$(USE_DEFFILE)"!=""
7272
7273 - $(SHL6LINKER) -v $(SHL6LINKFLAGS) \
7274 + $(COMMAND_ECHO)$(SHL6LINKER) -v $(SHL6LINKFLAGS) \
7275 $(LINKFLAGSSHL) $(SHL6BASEX) \
7276 $(SHL6STACK) -o $(SHL6TARGETN) \
7277 $(SHL6DEF) \
7278 @@ -3215,7 +3311,7 @@ $(SHL6TARGETN) : \
7279 .ENDIF # "$(USE_DEFFILE)"!=""
7280
7281 .IF "$(SHL6TARGET8)" != "$(SHL6TARGET)"
7282 - +$(COPY) $@ $(@:d)$(SHL6TARGET8).dll
7283 + $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL6TARGET8).dll
7284 .ENDIF
7285
7286 .ENDIF # "$(GUI)" == "OS2"
7287 @@ -3289,7 +3385,7 @@ SHL7VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL7TARGET))}$(
7288 .ENDIF # "$(GUI)" == "UNX"
7289 $(MISC)/$(SHL7VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL7VERSIONOBJ:b).h
7290 # $(COPY) $(SOLARENV)/src/version.c $@
7291 - $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL7VERSIONOBJ:b).h/ > $@
7292 + $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL7VERSIONOBJ:b).h/ > $@
7293
7294 .INIT : $(SHL7VERSIONOBJDEP)
7295 .ENDIF # "$(VERSIONOBJ)"!=""
7296 @@ -3352,16 +3448,20 @@ $(USE_SHL7VERSIONMAP): \
7297 .ENDIF
7298 .ENDIF # "$(SHL7OBJS)!"=""
7299 @$(TYPE) /dev/null $(SHL7LIBS:s/.lib/.dump/) >> $@.dump
7300 - $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL7INTERFACE) -f $(SHL7FILTERFILE) -m $@
7301 + $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL7INTERFACE) -f $(SHL7FILTERFILE) -m $@
7302
7303 .ELSE # "$(SHL7FILTERFILE)"!=""
7304 USE_SHL7VERSIONMAP=$(MISC)/$(SHL7TARGET).vmap
7305 $(USE_SHL7VERSIONMAP) :
7306 +.IF "$(VERBOSE)" == "TRUE"
7307 @echo -----------------------------
7308 @echo SHL7FILTERFILE not set!
7309 @echo -----------------------------
7310 @$(TOUCH) $@
7311 @echo dummy file to keep the dependencies for later use.
7312 +.ELSE
7313 + @$(TOUCH) $@
7314 +.ENDIF
7315 # force_dmake_to_error
7316 .ENDIF # "$(SHL7FILTERFILE)"!=""
7317 .ELSE # "$(USE_SHL7VERSIONMAP)"!=""
7318 @@ -3388,25 +3488,25 @@ $(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP)
7319 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
7320 # happens if somebody will change it in the future
7321 .IF "$(COMID)"=="gcc3"
7322 - tr -d "\015" < $(SHL7VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
7323 + $(COMMAND_ECHO) tr -d "\015" < $(SHL7VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
7324 .ELIF "$(COMNAME)"=="sunpro5"
7325 - tr -d "\015" < $(SHL7VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
7326 + $(COMMAND_ECHO) tr -d "\015" < $(SHL7VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
7327 .ELSE # "$(COMID)"=="gcc3"
7328 - tr -d "\015" < $(SHL7VERSIONMAP) > $@
7329 + $(COMMAND_ECHO) tr -d "\015" < $(SHL7VERSIONMAP) > $@
7330 .ENDIF # "$(COMID)"=="gcc3"
7331 @chmod a+w $@
7332 # Mac OS X post-processing generate an exported symbols list from the generated map file
7333 # for details on exported symbols list see man ld on Mac OS X
7334 .IF "$(OS)"=="MACOSX"
7335 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
7336 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
7337 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
7338 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
7339 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
7340 # Extract RTTI symbols from all the objects that will be used to build a shared library
7341 .IF "$(SHL7OBJS)"!=""
7342 -echo $(foreach,i,$(SHL7OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
7343 .ENDIF
7344 .IF "$(SHL7LIBS)"!=""
7345 - -$(TYPE) $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
7346 + $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL7LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
7347 .ENDIF
7348 # overwrite the map file generate into the local output tree with the generated
7349 # exported symbols list
7350 @@ -3448,7 +3548,7 @@ SHL7LINKRESO*=$(MISC)/$(SHL7TARGET)_res.o
7351 .IF "$(SHL7LIBS)"!=""
7352 $(MISC)/$(SHL7TARGET)_linkinc.ls .PHONY:
7353 @@-$(RM) $@
7354 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@
7355 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@
7356 .ENDIF # "$(SHL7LIBS)"!=""
7357 .ENDIF
7358
7359 @@ -3464,14 +3564,14 @@ SHL7LINKLIST=$(MISC)/$(SHL7TARGET)_link.lst
7360 SHL7LINKLISTPARAM=@$(SHL7LINKLIST)
7361 $(SHL7LINKLIST) : $(SHL7LIBS)
7362 @@-$(RM) $@
7363 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@
7364 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL7LIBS) $(i:s/.lib/.lin/)) >> $@
7365 .ENDIF # "$(SHL7LIBS)"!=""
7366 .ENDIF # "$(COM)"!="GCC"
7367 .ENDIF
7368 .ENDIF # "$(SHL7USE_EXPORTS)"=="name"
7369
7370 $(MISC)/%linkinc.ls:
7371 - echo . > $@
7372 + @echo . > $@
7373 .ENDIF # "$(linkinc)"!=""
7374
7375 .IF "$(GUI)" == "OS2"
7376 @@ -3498,8 +3598,10 @@ $(SHL7TARGETN) : \
7377 $(SHL7DEPN) \
7378 $(SHL7IMP_ORD) \
7379 $(SHL7LINKLIST)
7380 +.IF "$(VERBOSE)" == "TRUE"
7381 @echo ------------------------------
7382 - @echo Making: $(SHL7TARGETN)
7383 +.ENDIF
7384 + @echo "Making: " $(@:f)
7385 .IF "$(GUI)" == "WNT"
7386 .IF "$(SHL7DEFAULTRES)"!=""
7387 @@-$(RM) $(MISC)/$(SHL7DEFAULTRES:b).rc
7388 @@ -3519,10 +3621,10 @@ $(SHL7TARGETN) : \
7389 @echo $(EMQ)#define INTERNAL_NAME $(SHL7TARGET:b) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
7390 @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL7DEFAULTRES:b).rc
7391 .ENDIF # "$(use_shl_versions)" != ""
7392 - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc
7393 + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc
7394 .ENDIF # "$(SHL7DEFAULTRES)"!=""
7395 .IF "$(SHL7ALLRES)"!=""
7396 - $(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES)
7397 + $(COMMAND_ECHO)$(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES)
7398 .IF "$(COM)"=="GCC"
7399 windres $(SHL7LINKRES) $(SHL7LINKRESO)
7400 .ENDIF # "$(COM)"=="GCC"
7401 @@ -3569,15 +3671,15 @@ $(SHL7TARGETN) : \
7402 @@$(LS) $@
7403 @echo linking $@.manifest ...
7404 .IF "$(VISTA_MANIFEST)"!=""
7405 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7406 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7407 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7408 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7409 .ELSE
7410 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7411 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7412 .ENDIF # "$(VISTA_MANIFEST)"!=""
7413 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7414 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7415 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7416 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7417 .ELSE # "$(USE_DEFFILE)"!=""
7418 - $(SHL7LINKER) @$(mktmp $(SHL7LINKFLAGS) \
7419 + $(COMMAND_ECHO)$(SHL7LINKER) @$(mktmp $(SHL7LINKFLAGS) \
7420 $(LINKFLAGSSHL) $(SHL7BASEX) \
7421 $(SHL7STACK) -out:$(SHL7TARGETN) \
7422 -map:$(MISC)/$(@:B).map \
7423 @@ -3593,16 +3695,16 @@ $(SHL7TARGETN) : \
7424 @@$(LS) $@
7425 @echo linking $@.manifest ...
7426 .IF "$(VISTA_MANIFEST)"!=""
7427 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7428 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7429 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7430 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7431 .ELSE
7432 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7433 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7434 .ENDIF # "$(VISTA_MANIFEST)"!=""
7435 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7436 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7437 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7438 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7439 .ENDIF # "$(USE_DEFFILE)"!=""
7440 .ELSE # "$(SHL7USE_EXPORTS)"!="name"
7441 - $(SHL7LINKER) @$(mktmp $(SHL7LINKFLAGS) \
7442 + $(COMMAND_ECHO)$(SHL7LINKER) @$(mktmp $(SHL7LINKFLAGS) \
7443 $(LINKFLAGSSHL) $(SHL7BASEX) \
7444 $(SHL7STACK) -out:$(SHL7TARGETN) \
7445 -map:$(MISC)/$(@:B).map \
7446 @@ -3616,18 +3718,18 @@ $(SHL7TARGETN) : \
7447 )
7448 @echo linking $@.manifest ...
7449 .IF "$(VISTA_MANIFEST)"!=""
7450 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7451 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7452 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7453 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7454 .ELSE
7455 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7456 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7457 .ENDIF # "$(VISTA_MANIFEST)"!=""
7458 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7459 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7460 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7461 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7462 .ENDIF # "$(SHL7USE_EXPORTS)"!="name"
7463 .ELSE # "$(linkinc)"==""
7464 - -$(RM) del $(MISC)/$(SHL7TARGET).lnk
7465 - -$(RM) $(MISC)/$(SHL7TARGET).lst
7466 - $(TYPE) $(mktmp \
7467 + $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL7TARGET).lnk
7468 + $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL7TARGET).lst
7469 + $(COMMAND_ECHO)$(TYPE) $(mktmp \
7470 $(SHL7LINKFLAGS) \
7471 $(LINKFLAGSSHL) $(SHL7BASEX) \
7472 $(SHL7STACK) $(MAPFILE) \
7473 @@ -3639,17 +3741,17 @@ $(SHL7TARGETN) : \
7474 $(SHL7STDSHL) $(STDSHL7) \
7475 $(SHL7LINKRES) \
7476 ) >> $(MISC)/$(SHL7TARGET).lnk
7477 - $(TYPE) $(MISC)/$(SHL7TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL7TARGET).lnk
7478 - $(SHL7LINKER) @$(MISC)/$(SHL7TARGET).lnk
7479 + $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL7TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL7TARGET).lnk
7480 + $(COMMAND_ECHO)$(SHL7LINKER) @$(MISC)/$(SHL7TARGET).lnk
7481 @echo linking $@.manifest ...
7482 .IF "$(VISTA_MANIFEST)"!=""
7483 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7484 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7485 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7486 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7487 .ELSE
7488 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7489 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7490 .ENDIF # "$(VISTA_MANIFEST)"!=""
7491 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7492 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7493 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7494 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7495 .ENDIF # "$(linkinc)"==""
7496 .ENDIF # "$(COM)"=="GCC"
7497 .ENDIF # "$(GUI)" == "WNT"
7498 @@ -3665,11 +3767,13 @@ $(SHL7TARGETN) : \
7499 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
7500 `cat $(MISC)/$(TARGET).$(@:b)_7.cmd` \
7501 >> $(MISC)/$(TARGET).$(@:b)_7.cmd
7502 + .IF "$(VERBOSE)" == "TRUE"
7503 @cat $(MISC)/$(TARGET).$(@:b)_7.cmd
7504 + .ENDIF
7505 @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
7506 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
7507 shl $(SHL7RPATH) $@
7508 - @echo "Making: $@.jnilib"
7509 + @echo "Making: " $(@:f).jnilib
7510 @macosx-create-bundle $@
7511 .IF "$(UPDATER)"=="YES"
7512 .IF "$(SHL7NOCHECK)"==""
7513 @@ -3682,21 +3786,29 @@ $(SHL7TARGETN) : \
7514 $(SHL7VERSIONOBJ) -o $@ \
7515 `cat /dev/null $(SHL7LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
7516 $(SHL7STDLIBS) $(SHL7ARCHIVES) $(SHL7STDSHL) $(STDSHL7) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_7.cmd
7517 + .IF "$(VERBOSE)" == "TRUE"
7518 @cat $(MISC)/$(TARGET).$(@:b)_7.cmd
7519 + .ENDIF
7520 @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
7521 .IF "$(UPDATER)"=="YES"
7522 .IF "$(SHL7NOCHECK)"==""
7523 - -$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
7524 - $(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
7525 - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
7526 + $(COMMAND_ECHO)-$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
7527 + $(COMMAND_ECHO)$(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
7528 +.IF "$(VERBOSE)"=="TRUE"
7529 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
7530 +.ELSE
7531 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) -- -s $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
7532 +.ENDIF
7533 .ENDIF # "$(SHL7NOCHECK)"!=""
7534 .ENDIF # "$(UPDATER)"=="YES"
7535 .ENDIF # "$(OS)"=="MACOSX"
7536 .IF "$(UNIXVERSIONNAMES)"!=""
7537 - $(RM) $(LB)/$(SHL7TARGETN:b)
7538 - cd $(LB) && ln -s $(SHL7TARGETN:f) $(SHL7TARGETN:b)
7539 + $(COMMAND_ECHO)$(RM) $(LB)/$(SHL7TARGETN:b)
7540 + $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL7TARGETN:f) $(SHL7TARGETN:b)
7541 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
7542 +.IF "$(VERBOSE)" == "TRUE"
7543 @ls -l $@
7544 +.ENDIF
7545 .ENDIF # "$(GUI)" == "UNX"
7546
7547 .IF "$(GUI)" == "OS2"
7548 @@ -3714,16 +3826,16 @@ $(SHL7TARGETN) : \
7549 # @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL7DEFAULTRES:b).rc
7550 .ENDIF # "$(use_shl_versions)" != ""
7551 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
7552 - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc
7553 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL7DEFAULTRES:b).rc
7554 .ENDIF # "$(SHL7DEFAULTRES)"!=""
7555
7556 .IF "$(SHL7ALLRES)"!=""
7557 - +$(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES)
7558 + $(COMMAND_ECHO)+$(TYPE) $(SHL7ALLRES) > $(SHL7LINKRES)
7559 .ENDIF # "$(SHL7ALLRES)"!=""
7560
7561 .IF "$(USE_DEFFILE)"!=""
7562
7563 - $(SHL7LINKER) $(SHL7LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
7564 + $(COMMAND_ECHO)$(SHL7LINKER) $(SHL7LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
7565 $(SHL7DEF) \
7566 $(STDOBJ) \
7567 -L$(LB) \
7568 @@ -3736,7 +3848,7 @@ $(SHL7TARGETN) : \
7569
7570 .ELSE # "$(USE_DEFFILE)"!=""
7571
7572 - $(SHL7LINKER) -v $(SHL7LINKFLAGS) \
7573 + $(COMMAND_ECHO)$(SHL7LINKER) -v $(SHL7LINKFLAGS) \
7574 $(LINKFLAGSSHL) $(SHL7BASEX) \
7575 $(SHL7STACK) -o $(SHL7TARGETN) \
7576 $(SHL7DEF) \
7577 @@ -3754,7 +3866,7 @@ $(SHL7TARGETN) : \
7578 .ENDIF # "$(USE_DEFFILE)"!=""
7579
7580 .IF "$(SHL7TARGET8)" != "$(SHL7TARGET)"
7581 - +$(COPY) $@ $(@:d)$(SHL7TARGET8).dll
7582 + $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL7TARGET8).dll
7583 .ENDIF
7584
7585 .ENDIF # "$(GUI)" == "OS2"
7586 @@ -3828,7 +3940,7 @@ SHL8VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL8TARGET))}$(
7587 .ENDIF # "$(GUI)" == "UNX"
7588 $(MISC)/$(SHL8VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL8VERSIONOBJ:b).h
7589 # $(COPY) $(SOLARENV)/src/version.c $@
7590 - $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL8VERSIONOBJ:b).h/ > $@
7591 + $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL8VERSIONOBJ:b).h/ > $@
7592
7593 .INIT : $(SHL8VERSIONOBJDEP)
7594 .ENDIF # "$(VERSIONOBJ)"!=""
7595 @@ -3891,16 +4003,20 @@ $(USE_SHL8VERSIONMAP): \
7596 .ENDIF
7597 .ENDIF # "$(SHL8OBJS)!"=""
7598 @$(TYPE) /dev/null $(SHL8LIBS:s/.lib/.dump/) >> $@.dump
7599 - $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL8INTERFACE) -f $(SHL8FILTERFILE) -m $@
7600 + $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL8INTERFACE) -f $(SHL8FILTERFILE) -m $@
7601
7602 .ELSE # "$(SHL8FILTERFILE)"!=""
7603 USE_SHL8VERSIONMAP=$(MISC)/$(SHL8TARGET).vmap
7604 $(USE_SHL8VERSIONMAP) :
7605 +.IF "$(VERBOSE)" == "TRUE"
7606 @echo -----------------------------
7607 @echo SHL8FILTERFILE not set!
7608 @echo -----------------------------
7609 @$(TOUCH) $@
7610 @echo dummy file to keep the dependencies for later use.
7611 +.ELSE
7612 + @$(TOUCH) $@
7613 +.ENDIF
7614 # force_dmake_to_error
7615 .ENDIF # "$(SHL8FILTERFILE)"!=""
7616 .ELSE # "$(USE_SHL8VERSIONMAP)"!=""
7617 @@ -3927,25 +4043,25 @@ $(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP)
7618 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
7619 # happens if somebody will change it in the future
7620 .IF "$(COMID)"=="gcc3"
7621 - tr -d "\015" < $(SHL8VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
7622 + $(COMMAND_ECHO) tr -d "\015" < $(SHL8VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
7623 .ELIF "$(COMNAME)"=="sunpro5"
7624 - tr -d "\015" < $(SHL8VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
7625 + $(COMMAND_ECHO) tr -d "\015" < $(SHL8VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
7626 .ELSE # "$(COMID)"=="gcc3"
7627 - tr -d "\015" < $(SHL8VERSIONMAP) > $@
7628 + $(COMMAND_ECHO) tr -d "\015" < $(SHL8VERSIONMAP) > $@
7629 .ENDIF # "$(COMID)"=="gcc3"
7630 @chmod a+w $@
7631 # Mac OS X post-processing generate an exported symbols list from the generated map file
7632 # for details on exported symbols list see man ld on Mac OS X
7633 .IF "$(OS)"=="MACOSX"
7634 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
7635 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
7636 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
7637 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
7638 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
7639 # Extract RTTI symbols from all the objects that will be used to build a shared library
7640 .IF "$(SHL8OBJS)"!=""
7641 -echo $(foreach,i,$(SHL8OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
7642 .ENDIF
7643 .IF "$(SHL8LIBS)"!=""
7644 - -$(TYPE) $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
7645 + $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL8LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
7646 .ENDIF
7647 # overwrite the map file generate into the local output tree with the generated
7648 # exported symbols list
7649 @@ -3987,7 +4103,7 @@ SHL8LINKRESO*=$(MISC)/$(SHL8TARGET)_res.o
7650 .IF "$(SHL8LIBS)"!=""
7651 $(MISC)/$(SHL8TARGET)_linkinc.ls .PHONY:
7652 @@-$(RM) $@
7653 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@
7654 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@
7655 .ENDIF # "$(SHL8LIBS)"!=""
7656 .ENDIF
7657
7658 @@ -4003,14 +4119,14 @@ SHL8LINKLIST=$(MISC)/$(SHL8TARGET)_link.lst
7659 SHL8LINKLISTPARAM=@$(SHL8LINKLIST)
7660 $(SHL8LINKLIST) : $(SHL8LIBS)
7661 @@-$(RM) $@
7662 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@
7663 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL8LIBS) $(i:s/.lib/.lin/)) >> $@
7664 .ENDIF # "$(SHL8LIBS)"!=""
7665 .ENDIF # "$(COM)"!="GCC"
7666 .ENDIF
7667 .ENDIF # "$(SHL8USE_EXPORTS)"=="name"
7668
7669 $(MISC)/%linkinc.ls:
7670 - echo . > $@
7671 + @echo . > $@
7672 .ENDIF # "$(linkinc)"!=""
7673
7674 .IF "$(GUI)" == "OS2"
7675 @@ -4037,8 +4153,10 @@ $(SHL8TARGETN) : \
7676 $(SHL8DEPN) \
7677 $(SHL8IMP_ORD) \
7678 $(SHL8LINKLIST)
7679 +.IF "$(VERBOSE)" == "TRUE"
7680 @echo ------------------------------
7681 - @echo Making: $(SHL8TARGETN)
7682 +.ENDIF
7683 + @echo "Making: " $(@:f)
7684 .IF "$(GUI)" == "WNT"
7685 .IF "$(SHL8DEFAULTRES)"!=""
7686 @@-$(RM) $(MISC)/$(SHL8DEFAULTRES:b).rc
7687 @@ -4058,10 +4176,10 @@ $(SHL8TARGETN) : \
7688 @echo $(EMQ)#define INTERNAL_NAME $(SHL8TARGET:b) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
7689 @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL8DEFAULTRES:b).rc
7690 .ENDIF # "$(use_shl_versions)" != ""
7691 - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc
7692 + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc
7693 .ENDIF # "$(SHL8DEFAULTRES)"!=""
7694 .IF "$(SHL8ALLRES)"!=""
7695 - $(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES)
7696 + $(COMMAND_ECHO)$(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES)
7697 .IF "$(COM)"=="GCC"
7698 windres $(SHL8LINKRES) $(SHL8LINKRESO)
7699 .ENDIF # "$(COM)"=="GCC"
7700 @@ -4108,15 +4226,15 @@ $(SHL8TARGETN) : \
7701 @@$(LS) $@
7702 @echo linking $@.manifest ...
7703 .IF "$(VISTA_MANIFEST)"!=""
7704 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7705 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7706 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7707 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7708 .ELSE
7709 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7710 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7711 .ENDIF # "$(VISTA_MANIFEST)"!=""
7712 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7713 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7714 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7715 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7716 .ELSE # "$(USE_DEFFILE)"!=""
7717 - $(SHL8LINKER) @$(mktmp $(SHL8LINKFLAGS) \
7718 + $(COMMAND_ECHO)$(SHL8LINKER) @$(mktmp $(SHL8LINKFLAGS) \
7719 $(LINKFLAGSSHL) $(SHL8BASEX) \
7720 $(SHL8STACK) -out:$(SHL8TARGETN) \
7721 -map:$(MISC)/$(@:B).map \
7722 @@ -4132,16 +4250,16 @@ $(SHL8TARGETN) : \
7723 @@$(LS) $@
7724 @echo linking $@.manifest ...
7725 .IF "$(VISTA_MANIFEST)"!=""
7726 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7727 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7728 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7729 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7730 .ELSE
7731 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7732 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7733 .ENDIF # "$(VISTA_MANIFEST)"!=""
7734 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7735 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7736 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7737 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7738 .ENDIF # "$(USE_DEFFILE)"!=""
7739 .ELSE # "$(SHL8USE_EXPORTS)"!="name"
7740 - $(SHL8LINKER) @$(mktmp $(SHL8LINKFLAGS) \
7741 + $(COMMAND_ECHO)$(SHL8LINKER) @$(mktmp $(SHL8LINKFLAGS) \
7742 $(LINKFLAGSSHL) $(SHL8BASEX) \
7743 $(SHL8STACK) -out:$(SHL8TARGETN) \
7744 -map:$(MISC)/$(@:B).map \
7745 @@ -4155,18 +4273,18 @@ $(SHL8TARGETN) : \
7746 )
7747 @echo linking $@.manifest ...
7748 .IF "$(VISTA_MANIFEST)"!=""
7749 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7750 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7751 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7752 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7753 .ELSE
7754 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7755 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7756 .ENDIF # "$(VISTA_MANIFEST)"!=""
7757 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7758 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7759 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7760 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7761 .ENDIF # "$(SHL8USE_EXPORTS)"!="name"
7762 .ELSE # "$(linkinc)"==""
7763 - -$(RM) del $(MISC)/$(SHL8TARGET).lnk
7764 - -$(RM) $(MISC)/$(SHL8TARGET).lst
7765 - $(TYPE) $(mktmp \
7766 + $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL8TARGET).lnk
7767 + $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL8TARGET).lst
7768 + $(COMMAND_ECHO)$(TYPE) $(mktmp \
7769 $(SHL8LINKFLAGS) \
7770 $(LINKFLAGSSHL) $(SHL8BASEX) \
7771 $(SHL8STACK) $(MAPFILE) \
7772 @@ -4178,17 +4296,17 @@ $(SHL8TARGETN) : \
7773 $(SHL8STDSHL) $(STDSHL8) \
7774 $(SHL8LINKRES) \
7775 ) >> $(MISC)/$(SHL8TARGET).lnk
7776 - $(TYPE) $(MISC)/$(SHL8TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL8TARGET).lnk
7777 - $(SHL8LINKER) @$(MISC)/$(SHL8TARGET).lnk
7778 + $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL8TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL8TARGET).lnk
7779 + $(COMMAND_ECHO)$(SHL8LINKER) @$(MISC)/$(SHL8TARGET).lnk
7780 @echo linking $@.manifest ...
7781 .IF "$(VISTA_MANIFEST)"!=""
7782 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7783 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7784 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
7785 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
7786 .ELSE
7787 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7788 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
7789 .ENDIF # "$(VISTA_MANIFEST)"!=""
7790 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7791 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7792 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
7793 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
7794 .ENDIF # "$(linkinc)"==""
7795 .ENDIF # "$(COM)"=="GCC"
7796 .ENDIF # "$(GUI)" == "WNT"
7797 @@ -4204,11 +4322,13 @@ $(SHL8TARGETN) : \
7798 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
7799 `cat $(MISC)/$(TARGET).$(@:b)_8.cmd` \
7800 >> $(MISC)/$(TARGET).$(@:b)_8.cmd
7801 + .IF "$(VERBOSE)" == "TRUE"
7802 @cat $(MISC)/$(TARGET).$(@:b)_8.cmd
7803 + .ENDIF
7804 @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
7805 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
7806 shl $(SHL8RPATH) $@
7807 - @echo "Making: $@.jnilib"
7808 + @echo "Making: " $(@:f).jnilib
7809 @macosx-create-bundle $@
7810 .IF "$(UPDATER)"=="YES"
7811 .IF "$(SHL8NOCHECK)"==""
7812 @@ -4221,21 +4341,29 @@ $(SHL8TARGETN) : \
7813 $(SHL8VERSIONOBJ) -o $@ \
7814 `cat /dev/null $(SHL8LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
7815 $(SHL8STDLIBS) $(SHL8ARCHIVES) $(SHL8STDSHL) $(STDSHL8) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_8.cmd
7816 + .IF "$(VERBOSE)" == "TRUE"
7817 @cat $(MISC)/$(TARGET).$(@:b)_8.cmd
7818 + .ENDIF
7819 @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
7820 .IF "$(UPDATER)"=="YES"
7821 .IF "$(SHL8NOCHECK)"==""
7822 - -$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
7823 - $(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
7824 - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
7825 + $(COMMAND_ECHO)-$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
7826 + $(COMMAND_ECHO)$(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
7827 +.IF "$(VERBOSE)"=="TRUE"
7828 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
7829 +.ELSE
7830 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) -- -s $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
7831 +.ENDIF
7832 .ENDIF # "$(SHL8NOCHECK)"!=""
7833 .ENDIF # "$(UPDATER)"=="YES"
7834 .ENDIF # "$(OS)"=="MACOSX"
7835 .IF "$(UNIXVERSIONNAMES)"!=""
7836 - $(RM) $(LB)/$(SHL8TARGETN:b)
7837 - cd $(LB) && ln -s $(SHL8TARGETN:f) $(SHL8TARGETN:b)
7838 + $(COMMAND_ECHO)$(RM) $(LB)/$(SHL8TARGETN:b)
7839 + $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL8TARGETN:f) $(SHL8TARGETN:b)
7840 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
7841 +.IF "$(VERBOSE)" == "TRUE"
7842 @ls -l $@
7843 +.ENDIF
7844 .ENDIF # "$(GUI)" == "UNX"
7845
7846 .IF "$(GUI)" == "OS2"
7847 @@ -4253,16 +4381,16 @@ $(SHL8TARGETN) : \
7848 # @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL8DEFAULTRES:b).rc
7849 .ENDIF # "$(use_shl_versions)" != ""
7850 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
7851 - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc
7852 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL8DEFAULTRES:b).rc
7853 .ENDIF # "$(SHL8DEFAULTRES)"!=""
7854
7855 .IF "$(SHL8ALLRES)"!=""
7856 - +$(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES)
7857 + $(COMMAND_ECHO)+$(TYPE) $(SHL8ALLRES) > $(SHL8LINKRES)
7858 .ENDIF # "$(SHL8ALLRES)"!=""
7859
7860 .IF "$(USE_DEFFILE)"!=""
7861
7862 - $(SHL8LINKER) $(SHL8LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
7863 + $(COMMAND_ECHO)$(SHL8LINKER) $(SHL8LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
7864 $(SHL8DEF) \
7865 $(STDOBJ) \
7866 -L$(LB) \
7867 @@ -4275,7 +4403,7 @@ $(SHL8TARGETN) : \
7868
7869 .ELSE # "$(USE_DEFFILE)"!=""
7870
7871 - $(SHL8LINKER) -v $(SHL8LINKFLAGS) \
7872 + $(COMMAND_ECHO)$(SHL8LINKER) -v $(SHL8LINKFLAGS) \
7873 $(LINKFLAGSSHL) $(SHL8BASEX) \
7874 $(SHL8STACK) -o $(SHL8TARGETN) \
7875 $(SHL8DEF) \
7876 @@ -4293,7 +4421,7 @@ $(SHL8TARGETN) : \
7877 .ENDIF # "$(USE_DEFFILE)"!=""
7878
7879 .IF "$(SHL8TARGET8)" != "$(SHL8TARGET)"
7880 - +$(COPY) $@ $(@:d)$(SHL8TARGET8).dll
7881 + $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL8TARGET8).dll
7882 .ENDIF
7883
7884 .ENDIF # "$(GUI)" == "OS2"
7885 @@ -4367,7 +4495,7 @@ SHL9VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL9TARGET))}$(
7886 .ENDIF # "$(GUI)" == "UNX"
7887 $(MISC)/$(SHL9VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL9VERSIONOBJ:b).h
7888 # $(COPY) $(SOLARENV)/src/version.c $@
7889 - $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL9VERSIONOBJ:b).h/ > $@
7890 + $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL9VERSIONOBJ:b).h/ > $@
7891
7892 .INIT : $(SHL9VERSIONOBJDEP)
7893 .ENDIF # "$(VERSIONOBJ)"!=""
7894 @@ -4430,16 +4558,20 @@ $(USE_SHL9VERSIONMAP): \
7895 .ENDIF
7896 .ENDIF # "$(SHL9OBJS)!"=""
7897 @$(TYPE) /dev/null $(SHL9LIBS:s/.lib/.dump/) >> $@.dump
7898 - $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL9INTERFACE) -f $(SHL9FILTERFILE) -m $@
7899 + $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL9INTERFACE) -f $(SHL9FILTERFILE) -m $@
7900
7901 .ELSE # "$(SHL9FILTERFILE)"!=""
7902 USE_SHL9VERSIONMAP=$(MISC)/$(SHL9TARGET).vmap
7903 $(USE_SHL9VERSIONMAP) :
7904 +.IF "$(VERBOSE)" == "TRUE"
7905 @echo -----------------------------
7906 @echo SHL9FILTERFILE not set!
7907 @echo -----------------------------
7908 @$(TOUCH) $@
7909 @echo dummy file to keep the dependencies for later use.
7910 +.ELSE
7911 + @$(TOUCH) $@
7912 +.ENDIF
7913 # force_dmake_to_error
7914 .ENDIF # "$(SHL9FILTERFILE)"!=""
7915 .ELSE # "$(USE_SHL9VERSIONMAP)"!=""
7916 @@ -4466,25 +4598,25 @@ $(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP)
7917 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
7918 # happens if somebody will change it in the future
7919 .IF "$(COMID)"=="gcc3"
7920 - tr -d "\015" < $(SHL9VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
7921 + $(COMMAND_ECHO) tr -d "\015" < $(SHL9VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
7922 .ELIF "$(COMNAME)"=="sunpro5"
7923 - tr -d "\015" < $(SHL9VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
7924 + $(COMMAND_ECHO) tr -d "\015" < $(SHL9VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
7925 .ELSE # "$(COMID)"=="gcc3"
7926 - tr -d "\015" < $(SHL9VERSIONMAP) > $@
7927 + $(COMMAND_ECHO) tr -d "\015" < $(SHL9VERSIONMAP) > $@
7928 .ENDIF # "$(COMID)"=="gcc3"
7929 @chmod a+w $@
7930 # Mac OS X post-processing generate an exported symbols list from the generated map file
7931 # for details on exported symbols list see man ld on Mac OS X
7932 .IF "$(OS)"=="MACOSX"
7933 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
7934 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
7935 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
7936 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
7937 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
7938 # Extract RTTI symbols from all the objects that will be used to build a shared library
7939 .IF "$(SHL9OBJS)"!=""
7940 -echo $(foreach,i,$(SHL9OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
7941 .ENDIF
7942 .IF "$(SHL9LIBS)"!=""
7943 - -$(TYPE) $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
7944 + $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL9LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
7945 .ENDIF
7946 # overwrite the map file generate into the local output tree with the generated
7947 # exported symbols list
7948 @@ -4526,7 +4658,7 @@ SHL9LINKRESO*=$(MISC)/$(SHL9TARGET)_res.o
7949 .IF "$(SHL9LIBS)"!=""
7950 $(MISC)/$(SHL9TARGET)_linkinc.ls .PHONY:
7951 @@-$(RM) $@
7952 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@
7953 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@
7954 .ENDIF # "$(SHL9LIBS)"!=""
7955 .ENDIF
7956
7957 @@ -4542,14 +4674,14 @@ SHL9LINKLIST=$(MISC)/$(SHL9TARGET)_link.lst
7958 SHL9LINKLISTPARAM=@$(SHL9LINKLIST)
7959 $(SHL9LINKLIST) : $(SHL9LIBS)
7960 @@-$(RM) $@
7961 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@
7962 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL9LIBS) $(i:s/.lib/.lin/)) >> $@
7963 .ENDIF # "$(SHL9LIBS)"!=""
7964 .ENDIF # "$(COM)"!="GCC"
7965 .ENDIF
7966 .ENDIF # "$(SHL9USE_EXPORTS)"=="name"
7967
7968 $(MISC)/%linkinc.ls:
7969 - echo . > $@
7970 + @echo . > $@
7971 .ENDIF # "$(linkinc)"!=""
7972
7973 .IF "$(GUI)" == "OS2"
7974 @@ -4576,8 +4708,10 @@ $(SHL9TARGETN) : \
7975 $(SHL9DEPN) \
7976 $(SHL9IMP_ORD) \
7977 $(SHL9LINKLIST)
7978 +.IF "$(VERBOSE)" == "TRUE"
7979 @echo ------------------------------
7980 - @echo Making: $(SHL9TARGETN)
7981 +.ENDIF
7982 + @echo "Making: " $(@:f)
7983 .IF "$(GUI)" == "WNT"
7984 .IF "$(SHL9DEFAULTRES)"!=""
7985 @@-$(RM) $(MISC)/$(SHL9DEFAULTRES:b).rc
7986 @@ -4597,10 +4731,10 @@ $(SHL9TARGETN) : \
7987 @echo $(EMQ)#define INTERNAL_NAME $(SHL9TARGET:b) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
7988 @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL9DEFAULTRES:b).rc
7989 .ENDIF # "$(use_shl_versions)" != ""
7990 - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc
7991 + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc
7992 .ENDIF # "$(SHL9DEFAULTRES)"!=""
7993 .IF "$(SHL9ALLRES)"!=""
7994 - $(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES)
7995 + $(COMMAND_ECHO)$(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES)
7996 .IF "$(COM)"=="GCC"
7997 windres $(SHL9LINKRES) $(SHL9LINKRESO)
7998 .ENDIF # "$(COM)"=="GCC"
7999 @@ -4647,15 +4781,15 @@ $(SHL9TARGETN) : \
8000 @@$(LS) $@
8001 @echo linking $@.manifest ...
8002 .IF "$(VISTA_MANIFEST)"!=""
8003 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8004 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8005 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8006 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8007 .ELSE
8008 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8009 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8010 .ENDIF # "$(VISTA_MANIFEST)"!=""
8011 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8012 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8013 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8014 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8015 .ELSE # "$(USE_DEFFILE)"!=""
8016 - $(SHL9LINKER) @$(mktmp $(SHL9LINKFLAGS) \
8017 + $(COMMAND_ECHO)$(SHL9LINKER) @$(mktmp $(SHL9LINKFLAGS) \
8018 $(LINKFLAGSSHL) $(SHL9BASEX) \
8019 $(SHL9STACK) -out:$(SHL9TARGETN) \
8020 -map:$(MISC)/$(@:B).map \
8021 @@ -4671,16 +4805,16 @@ $(SHL9TARGETN) : \
8022 @@$(LS) $@
8023 @echo linking $@.manifest ...
8024 .IF "$(VISTA_MANIFEST)"!=""
8025 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8026 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8027 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8028 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8029 .ELSE
8030 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8031 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8032 .ENDIF # "$(VISTA_MANIFEST)"!=""
8033 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8034 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8035 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8036 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8037 .ENDIF # "$(USE_DEFFILE)"!=""
8038 .ELSE # "$(SHL9USE_EXPORTS)"!="name"
8039 - $(SHL9LINKER) @$(mktmp $(SHL9LINKFLAGS) \
8040 + $(COMMAND_ECHO)$(SHL9LINKER) @$(mktmp $(SHL9LINKFLAGS) \
8041 $(LINKFLAGSSHL) $(SHL9BASEX) \
8042 $(SHL9STACK) -out:$(SHL9TARGETN) \
8043 -map:$(MISC)/$(@:B).map \
8044 @@ -4694,18 +4828,18 @@ $(SHL9TARGETN) : \
8045 )
8046 @echo linking $@.manifest ...
8047 .IF "$(VISTA_MANIFEST)"!=""
8048 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8049 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8050 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8051 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8052 .ELSE
8053 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8054 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8055 .ENDIF # "$(VISTA_MANIFEST)"!=""
8056 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8057 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8058 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8059 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8060 .ENDIF # "$(SHL9USE_EXPORTS)"!="name"
8061 .ELSE # "$(linkinc)"==""
8062 - -$(RM) del $(MISC)/$(SHL9TARGET).lnk
8063 - -$(RM) $(MISC)/$(SHL9TARGET).lst
8064 - $(TYPE) $(mktmp \
8065 + $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL9TARGET).lnk
8066 + $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL9TARGET).lst
8067 + $(COMMAND_ECHO)$(TYPE) $(mktmp \
8068 $(SHL9LINKFLAGS) \
8069 $(LINKFLAGSSHL) $(SHL9BASEX) \
8070 $(SHL9STACK) $(MAPFILE) \
8071 @@ -4717,17 +4851,17 @@ $(SHL9TARGETN) : \
8072 $(SHL9STDSHL) $(STDSHL9) \
8073 $(SHL9LINKRES) \
8074 ) >> $(MISC)/$(SHL9TARGET).lnk
8075 - $(TYPE) $(MISC)/$(SHL9TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL9TARGET).lnk
8076 - $(SHL9LINKER) @$(MISC)/$(SHL9TARGET).lnk
8077 + $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL9TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL9TARGET).lnk
8078 + $(COMMAND_ECHO)$(SHL9LINKER) @$(MISC)/$(SHL9TARGET).lnk
8079 @echo linking $@.manifest ...
8080 .IF "$(VISTA_MANIFEST)"!=""
8081 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8082 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8083 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8084 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8085 .ELSE
8086 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8087 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8088 .ENDIF # "$(VISTA_MANIFEST)"!=""
8089 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8090 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8091 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8092 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8093 .ENDIF # "$(linkinc)"==""
8094 .ENDIF # "$(COM)"=="GCC"
8095 .ENDIF # "$(GUI)" == "WNT"
8096 @@ -4743,11 +4877,13 @@ $(SHL9TARGETN) : \
8097 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
8098 `cat $(MISC)/$(TARGET).$(@:b)_9.cmd` \
8099 >> $(MISC)/$(TARGET).$(@:b)_9.cmd
8100 + .IF "$(VERBOSE)" == "TRUE"
8101 @cat $(MISC)/$(TARGET).$(@:b)_9.cmd
8102 + .ENDIF
8103 @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
8104 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
8105 shl $(SHL9RPATH) $@
8106 - @echo "Making: $@.jnilib"
8107 + @echo "Making: " $(@:f).jnilib
8108 @macosx-create-bundle $@
8109 .IF "$(UPDATER)"=="YES"
8110 .IF "$(SHL9NOCHECK)"==""
8111 @@ -4760,21 +4896,29 @@ $(SHL9TARGETN) : \
8112 $(SHL9VERSIONOBJ) -o $@ \
8113 `cat /dev/null $(SHL9LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
8114 $(SHL9STDLIBS) $(SHL9ARCHIVES) $(SHL9STDSHL) $(STDSHL9) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_9.cmd
8115 + .IF "$(VERBOSE)" == "TRUE"
8116 @cat $(MISC)/$(TARGET).$(@:b)_9.cmd
8117 + .ENDIF
8118 @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
8119 .IF "$(UPDATER)"=="YES"
8120 .IF "$(SHL9NOCHECK)"==""
8121 - -$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
8122 - $(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
8123 - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
8124 + $(COMMAND_ECHO)-$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
8125 + $(COMMAND_ECHO)$(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
8126 +.IF "$(VERBOSE)"=="TRUE"
8127 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
8128 +.ELSE
8129 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) -- -s $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
8130 +.ENDIF
8131 .ENDIF # "$(SHL9NOCHECK)"!=""
8132 .ENDIF # "$(UPDATER)"=="YES"
8133 .ENDIF # "$(OS)"=="MACOSX"
8134 .IF "$(UNIXVERSIONNAMES)"!=""
8135 - $(RM) $(LB)/$(SHL9TARGETN:b)
8136 - cd $(LB) && ln -s $(SHL9TARGETN:f) $(SHL9TARGETN:b)
8137 + $(COMMAND_ECHO)$(RM) $(LB)/$(SHL9TARGETN:b)
8138 + $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL9TARGETN:f) $(SHL9TARGETN:b)
8139 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
8140 +.IF "$(VERBOSE)" == "TRUE"
8141 @ls -l $@
8142 +.ENDIF
8143 .ENDIF # "$(GUI)" == "UNX"
8144
8145 .IF "$(GUI)" == "OS2"
8146 @@ -4792,16 +4936,16 @@ $(SHL9TARGETN) : \
8147 # @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL9DEFAULTRES:b).rc
8148 .ENDIF # "$(use_shl_versions)" != ""
8149 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
8150 - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc
8151 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL9DEFAULTRES:b).rc
8152 .ENDIF # "$(SHL9DEFAULTRES)"!=""
8153
8154 .IF "$(SHL9ALLRES)"!=""
8155 - +$(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES)
8156 + $(COMMAND_ECHO)+$(TYPE) $(SHL9ALLRES) > $(SHL9LINKRES)
8157 .ENDIF # "$(SHL9ALLRES)"!=""
8158
8159 .IF "$(USE_DEFFILE)"!=""
8160
8161 - $(SHL9LINKER) $(SHL9LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
8162 + $(COMMAND_ECHO)$(SHL9LINKER) $(SHL9LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
8163 $(SHL9DEF) \
8164 $(STDOBJ) \
8165 -L$(LB) \
8166 @@ -4814,7 +4958,7 @@ $(SHL9TARGETN) : \
8167
8168 .ELSE # "$(USE_DEFFILE)"!=""
8169
8170 - $(SHL9LINKER) -v $(SHL9LINKFLAGS) \
8171 + $(COMMAND_ECHO)$(SHL9LINKER) -v $(SHL9LINKFLAGS) \
8172 $(LINKFLAGSSHL) $(SHL9BASEX) \
8173 $(SHL9STACK) -o $(SHL9TARGETN) \
8174 $(SHL9DEF) \
8175 @@ -4832,7 +4976,7 @@ $(SHL9TARGETN) : \
8176 .ENDIF # "$(USE_DEFFILE)"!=""
8177
8178 .IF "$(SHL9TARGET8)" != "$(SHL9TARGET)"
8179 - +$(COPY) $@ $(@:d)$(SHL9TARGET8).dll
8180 + $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL9TARGET8).dll
8181 .ENDIF
8182
8183 .ENDIF # "$(GUI)" == "OS2"
8184 @@ -4906,7 +5050,7 @@ SHL10VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL10TARGET))}
8185 .ENDIF # "$(GUI)" == "UNX"
8186 $(MISC)/$(SHL10VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL10VERSIONOBJ:b).h
8187 # $(COPY) $(SOLARENV)/src/version.c $@
8188 - $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL10VERSIONOBJ:b).h/ > $@
8189 + $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL10VERSIONOBJ:b).h/ > $@
8190
8191 .INIT : $(SHL10VERSIONOBJDEP)
8192 .ENDIF # "$(VERSIONOBJ)"!=""
8193 @@ -4969,16 +5113,20 @@ $(USE_SHL10VERSIONMAP): \
8194 .ENDIF
8195 .ENDIF # "$(SHL10OBJS)!"=""
8196 @$(TYPE) /dev/null $(SHL10LIBS:s/.lib/.dump/) >> $@.dump
8197 - $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL10INTERFACE) -f $(SHL10FILTERFILE) -m $@
8198 + $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL10INTERFACE) -f $(SHL10FILTERFILE) -m $@
8199
8200 .ELSE # "$(SHL10FILTERFILE)"!=""
8201 USE_SHL10VERSIONMAP=$(MISC)/$(SHL10TARGET).vmap
8202 $(USE_SHL10VERSIONMAP) :
8203 +.IF "$(VERBOSE)" == "TRUE"
8204 @echo -----------------------------
8205 @echo SHL10FILTERFILE not set!
8206 @echo -----------------------------
8207 @$(TOUCH) $@
8208 @echo dummy file to keep the dependencies for later use.
8209 +.ELSE
8210 + @$(TOUCH) $@
8211 +.ENDIF
8212 # force_dmake_to_error
8213 .ENDIF # "$(SHL10FILTERFILE)"!=""
8214 .ELSE # "$(USE_SHL10VERSIONMAP)"!=""
8215 @@ -5005,25 +5153,25 @@ $(USE_SHL10VERSIONMAP): $(SHL10VERSIONMAP)
8216 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
8217 # happens if somebody will change it in the future
8218 .IF "$(COMID)"=="gcc3"
8219 - tr -d "\015" < $(SHL10VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
8220 + $(COMMAND_ECHO) tr -d "\015" < $(SHL10VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
8221 .ELIF "$(COMNAME)"=="sunpro5"
8222 - tr -d "\015" < $(SHL10VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
8223 + $(COMMAND_ECHO) tr -d "\015" < $(SHL10VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
8224 .ELSE # "$(COMID)"=="gcc3"
8225 - tr -d "\015" < $(SHL10VERSIONMAP) > $@
8226 + $(COMMAND_ECHO) tr -d "\015" < $(SHL10VERSIONMAP) > $@
8227 .ENDIF # "$(COMID)"=="gcc3"
8228 @chmod a+w $@
8229 # Mac OS X post-processing generate an exported symbols list from the generated map file
8230 # for details on exported symbols list see man ld on Mac OS X
8231 .IF "$(OS)"=="MACOSX"
8232 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
8233 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
8234 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
8235 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
8236 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
8237 # Extract RTTI symbols from all the objects that will be used to build a shared library
8238 .IF "$(SHL10OBJS)"!=""
8239 -echo $(foreach,i,$(SHL10OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
8240 .ENDIF
8241 .IF "$(SHL10LIBS)"!=""
8242 - -$(TYPE) $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
8243 + $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL10LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
8244 .ENDIF
8245 # overwrite the map file generate into the local output tree with the generated
8246 # exported symbols list
8247 @@ -5065,7 +5213,7 @@ SHL10LINKRESO*=$(MISC)/$(SHL10TARGET)_res.o
8248 .IF "$(SHL10LIBS)"!=""
8249 $(MISC)/$(SHL10TARGET)_linkinc.ls .PHONY:
8250 @@-$(RM) $@
8251 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@
8252 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@
8253 .ENDIF # "$(SHL10LIBS)"!=""
8254 .ENDIF
8255
8256 @@ -5081,14 +5229,14 @@ SHL10LINKLIST=$(MISC)/$(SHL10TARGET)_link.lst
8257 SHL10LINKLISTPARAM=@$(SHL10LINKLIST)
8258 $(SHL10LINKLIST) : $(SHL10LIBS)
8259 @@-$(RM) $@
8260 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@
8261 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL10LIBS) $(i:s/.lib/.lin/)) >> $@
8262 .ENDIF # "$(SHL10LIBS)"!=""
8263 .ENDIF # "$(COM)"!="GCC"
8264 .ENDIF
8265 .ENDIF # "$(SHL10USE_EXPORTS)"=="name"
8266
8267 $(MISC)/%linkinc.ls:
8268 - echo . > $@
8269 + @echo . > $@
8270 .ENDIF # "$(linkinc)"!=""
8271
8272 .IF "$(GUI)" == "OS2"
8273 @@ -5115,8 +5263,10 @@ $(SHL10TARGETN) : \
8274 $(SHL10DEPN) \
8275 $(SHL10IMP_ORD) \
8276 $(SHL10LINKLIST)
8277 +.IF "$(VERBOSE)" == "TRUE"
8278 @echo ------------------------------
8279 - @echo Making: $(SHL10TARGETN)
8280 +.ENDIF
8281 + @echo "Making: " $(@:f)
8282 .IF "$(GUI)" == "WNT"
8283 .IF "$(SHL10DEFAULTRES)"!=""
8284 @@-$(RM) $(MISC)/$(SHL10DEFAULTRES:b).rc
8285 @@ -5136,10 +5286,10 @@ $(SHL10TARGETN) : \
8286 @echo $(EMQ)#define INTERNAL_NAME $(SHL10TARGET:b) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
8287 @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL10DEFAULTRES:b).rc
8288 .ENDIF # "$(use_shl_versions)" != ""
8289 - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc
8290 + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc
8291 .ENDIF # "$(SHL10DEFAULTRES)"!=""
8292 .IF "$(SHL10ALLRES)"!=""
8293 - $(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES)
8294 + $(COMMAND_ECHO)$(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES)
8295 .IF "$(COM)"=="GCC"
8296 windres $(SHL10LINKRES) $(SHL10LINKRESO)
8297 .ENDIF # "$(COM)"=="GCC"
8298 @@ -5186,15 +5336,15 @@ $(SHL10TARGETN) : \
8299 @@$(LS) $@
8300 @echo linking $@.manifest ...
8301 .IF "$(VISTA_MANIFEST)"!=""
8302 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8303 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8304 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8305 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8306 .ELSE
8307 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8308 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8309 .ENDIF # "$(VISTA_MANIFEST)"!=""
8310 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8311 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8312 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8313 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8314 .ELSE # "$(USE_DEFFILE)"!=""
8315 - $(SHL10LINKER) @$(mktmp $(SHL10LINKFLAGS) \
8316 + $(COMMAND_ECHO)$(SHL10LINKER) @$(mktmp $(SHL10LINKFLAGS) \
8317 $(LINKFLAGSSHL) $(SHL10BASEX) \
8318 $(SHL10STACK) -out:$(SHL10TARGETN) \
8319 -map:$(MISC)/$(@:B).map \
8320 @@ -5210,16 +5360,16 @@ $(SHL10TARGETN) : \
8321 @@$(LS) $@
8322 @echo linking $@.manifest ...
8323 .IF "$(VISTA_MANIFEST)"!=""
8324 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8325 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8326 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8327 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8328 .ELSE
8329 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8330 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8331 .ENDIF # "$(VISTA_MANIFEST)"!=""
8332 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8333 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8334 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8335 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8336 .ENDIF # "$(USE_DEFFILE)"!=""
8337 .ELSE # "$(SHL10USE_EXPORTS)"!="name"
8338 - $(SHL10LINKER) @$(mktmp $(SHL10LINKFLAGS) \
8339 + $(COMMAND_ECHO)$(SHL10LINKER) @$(mktmp $(SHL10LINKFLAGS) \
8340 $(LINKFLAGSSHL) $(SHL10BASEX) \
8341 $(SHL10STACK) -out:$(SHL10TARGETN) \
8342 -map:$(MISC)/$(@:B).map \
8343 @@ -5233,18 +5383,18 @@ $(SHL10TARGETN) : \
8344 )
8345 @echo linking $@.manifest ...
8346 .IF "$(VISTA_MANIFEST)"!=""
8347 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8348 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8349 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8350 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8351 .ELSE
8352 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8353 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8354 .ENDIF # "$(VISTA_MANIFEST)"!=""
8355 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8356 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8357 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8358 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8359 .ENDIF # "$(SHL10USE_EXPORTS)"!="name"
8360 .ELSE # "$(linkinc)"==""
8361 - -$(RM) del $(MISC)/$(SHL10TARGET).lnk
8362 - -$(RM) $(MISC)/$(SHL10TARGET).lst
8363 - $(TYPE) $(mktmp \
8364 + $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL10TARGET).lnk
8365 + $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL10TARGET).lst
8366 + $(COMMAND_ECHO)$(TYPE) $(mktmp \
8367 $(SHL10LINKFLAGS) \
8368 $(LINKFLAGSSHL) $(SHL10BASEX) \
8369 $(SHL10STACK) $(MAPFILE) \
8370 @@ -5256,17 +5406,17 @@ $(SHL10TARGETN) : \
8371 $(SHL10STDSHL) $(STDSHL10) \
8372 $(SHL10LINKRES) \
8373 ) >> $(MISC)/$(SHL10TARGET).lnk
8374 - $(TYPE) $(MISC)/$(SHL10TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL10TARGET).lnk
8375 - $(SHL10LINKER) @$(MISC)/$(SHL10TARGET).lnk
8376 + $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL10TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL10TARGET).lnk
8377 + $(COMMAND_ECHO)$(SHL10LINKER) @$(MISC)/$(SHL10TARGET).lnk
8378 @echo linking $@.manifest ...
8379 .IF "$(VISTA_MANIFEST)"!=""
8380 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8381 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8382 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
8383 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
8384 .ELSE
8385 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8386 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
8387 .ENDIF # "$(VISTA_MANIFEST)"!=""
8388 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8389 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8390 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
8391 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
8392 .ENDIF # "$(linkinc)"==""
8393 .ENDIF # "$(COM)"=="GCC"
8394 .ENDIF # "$(GUI)" == "WNT"
8395 @@ -5282,11 +5432,13 @@ $(SHL10TARGETN) : \
8396 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
8397 `cat $(MISC)/$(TARGET).$(@:b)_10.cmd` \
8398 >> $(MISC)/$(TARGET).$(@:b)_10.cmd
8399 + .IF "$(VERBOSE)" == "TRUE"
8400 @cat $(MISC)/$(TARGET).$(@:b)_10.cmd
8401 + .ENDIF
8402 @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
8403 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
8404 shl $(SHL10RPATH) $@
8405 - @echo "Making: $@.jnilib"
8406 + @echo "Making: " $(@:f).jnilib
8407 @macosx-create-bundle $@
8408 .IF "$(UPDATER)"=="YES"
8409 .IF "$(SHL10NOCHECK)"==""
8410 @@ -5299,21 +5451,29 @@ $(SHL10TARGETN) : \
8411 $(SHL10VERSIONOBJ) -o $@ \
8412 `cat /dev/null $(SHL10LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
8413 $(SHL10STDLIBS) $(SHL10ARCHIVES) $(SHL10STDSHL) $(STDSHL10) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_10.cmd
8414 + .IF "$(VERBOSE)" == "TRUE"
8415 @cat $(MISC)/$(TARGET).$(@:b)_10.cmd
8416 + .ENDIF
8417 @+source $(MISC)/$(TARGET).$(@:b)_10.cmd
8418 .IF "$(UPDATER)"=="YES"
8419 .IF "$(SHL10NOCHECK)"==""
8420 - -$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
8421 - $(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
8422 - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
8423 + $(COMMAND_ECHO)-$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
8424 + $(COMMAND_ECHO)$(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
8425 +.IF "$(VERBOSE)"=="TRUE"
8426 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
8427 +.ELSE
8428 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) -- -s $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
8429 +.ENDIF
8430 .ENDIF # "$(SHL10NOCHECK)"!=""
8431 .ENDIF # "$(UPDATER)"=="YES"
8432 .ENDIF # "$(OS)"=="MACOSX"
8433 .IF "$(UNIXVERSIONNAMES)"!=""
8434 - $(RM) $(LB)/$(SHL10TARGETN:b)
8435 - cd $(LB) && ln -s $(SHL10TARGETN:f) $(SHL10TARGETN:b)
8436 + $(COMMAND_ECHO)$(RM) $(LB)/$(SHL10TARGETN:b)
8437 + $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL10TARGETN:f) $(SHL10TARGETN:b)
8438 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
8439 +.IF "$(VERBOSE)" == "TRUE"
8440 @ls -l $@
8441 +.ENDIF
8442 .ENDIF # "$(GUI)" == "UNX"
8443
8444 .IF "$(GUI)" == "OS2"
8445 @@ -5331,16 +5491,16 @@ $(SHL10TARGETN) : \
8446 # @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL10DEFAULTRES:b).rc
8447 .ENDIF # "$(use_shl_versions)" != ""
8448 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
8449 - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc
8450 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL10DEFAULTRES:b).rc
8451 .ENDIF # "$(SHL10DEFAULTRES)"!=""
8452
8453 .IF "$(SHL10ALLRES)"!=""
8454 - +$(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES)
8455 + $(COMMAND_ECHO)+$(TYPE) $(SHL10ALLRES) > $(SHL10LINKRES)
8456 .ENDIF # "$(SHL10ALLRES)"!=""
8457
8458 .IF "$(USE_DEFFILE)"!=""
8459
8460 - $(SHL10LINKER) $(SHL10LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
8461 + $(COMMAND_ECHO)$(SHL10LINKER) $(SHL10LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
8462 $(SHL10DEF) \
8463 $(STDOBJ) \
8464 -L$(LB) \
8465 @@ -5353,7 +5513,7 @@ $(SHL10TARGETN) : \
8466
8467 .ELSE # "$(USE_DEFFILE)"!=""
8468
8469 - $(SHL10LINKER) -v $(SHL10LINKFLAGS) \
8470 + $(COMMAND_ECHO)$(SHL10LINKER) -v $(SHL10LINKFLAGS) \
8471 $(LINKFLAGSSHL) $(SHL10BASEX) \
8472 $(SHL10STACK) -o $(SHL10TARGETN) \
8473 $(SHL10DEF) \
8474 @@ -5371,7 +5531,7 @@ $(SHL10TARGETN) : \
8475 .ENDIF # "$(USE_DEFFILE)"!=""
8476
8477 .IF "$(SHL10TARGET8)" != "$(SHL10TARGET)"
8478 - +$(COPY) $@ $(@:d)$(SHL10TARGET8).dll
8479 + $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL10TARGET8).dll
8480 .ENDIF
8481
8482 .ENDIF # "$(GUI)" == "OS2"
8483 @@ -5411,8 +5571,10 @@ $(SHL1IMPLIBN): \
8484 $(SHL1IMPLIBN): \
8485 $(SHL1LIBS)
8486 .ENDIF
8487 - @echo ------------------------------1
8488 - @echo Making: $(SHL1IMPLIBN)
8489 +.IF "$(VERBOSE)" == "TRUE"
8490 + @echo -------------------------------
8491 +.ENDIF
8492 + @echo "Making: " $(@:f)
8493 .IF "$(GUI)" == "WNT"
8494 .IF "$(COM)"=="GCC"
8495 @echo no ImportLibs on mingw
8496 @@ -5433,7 +5595,7 @@ $(SHL1IMPLIBN): \
8497
8498 # touch creates an empty file, but this is not good for emxomfar, so
8499 # create a dummy lib here
8500 - -$(LIBMGR) $(LIBFLAGS) $@ $(SHL1VERSIONOBJ)
8501 + $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL1VERSIONOBJ)
8502 +@echo build of $(SHL1TARGETN) creates $@
8503
8504 .ELSE
8505 @@ -5466,8 +5628,10 @@ $(SHL2IMPLIBN): \
8506 $(SHL2IMPLIBN): \
8507 $(SHL2LIBS)
8508 .ENDIF
8509 - @echo ------------------------------1
8510 - @echo Making: $(SHL2IMPLIBN)
8511 +.IF "$(VERBOSE)" == "TRUE"
8512 + @echo -------------------------------
8513 +.ENDIF
8514 + @echo "Making: " $(@:f)
8515 .IF "$(GUI)" == "WNT"
8516 .IF "$(COM)"=="GCC"
8517 @echo no ImportLibs on mingw
8518 @@ -5488,7 +5652,7 @@ $(SHL2IMPLIBN): \
8519
8520 # touch creates an empty file, but this is not good for emxomfar, so
8521 # create a dummy lib here
8522 - -$(LIBMGR) $(LIBFLAGS) $@ $(SHL2VERSIONOBJ)
8523 + $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL2VERSIONOBJ)
8524 +@echo build of $(SHL2TARGETN) creates $@
8525
8526 .ELSE
8527 @@ -5521,8 +5685,10 @@ $(SHL3IMPLIBN): \
8528 $(SHL3IMPLIBN): \
8529 $(SHL3LIBS)
8530 .ENDIF
8531 - @echo ------------------------------1
8532 - @echo Making: $(SHL3IMPLIBN)
8533 +.IF "$(VERBOSE)" == "TRUE"
8534 + @echo -------------------------------
8535 +.ENDIF
8536 + @echo "Making: " $(@:f)
8537 .IF "$(GUI)" == "WNT"
8538 .IF "$(COM)"=="GCC"
8539 @echo no ImportLibs on mingw
8540 @@ -5543,7 +5709,7 @@ $(SHL3IMPLIBN): \
8541
8542 # touch creates an empty file, but this is not good for emxomfar, so
8543 # create a dummy lib here
8544 - -$(LIBMGR) $(LIBFLAGS) $@ $(SHL3VERSIONOBJ)
8545 + $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL3VERSIONOBJ)
8546 +@echo build of $(SHL3TARGETN) creates $@
8547
8548 .ELSE
8549 @@ -5576,8 +5742,10 @@ $(SHL4IMPLIBN): \
8550 $(SHL4IMPLIBN): \
8551 $(SHL4LIBS)
8552 .ENDIF
8553 - @echo ------------------------------1
8554 - @echo Making: $(SHL4IMPLIBN)
8555 +.IF "$(VERBOSE)" == "TRUE"
8556 + @echo -------------------------------
8557 +.ENDIF
8558 + @echo "Making: " $(@:f)
8559 .IF "$(GUI)" == "WNT"
8560 .IF "$(COM)"=="GCC"
8561 @echo no ImportLibs on mingw
8562 @@ -5598,7 +5766,7 @@ $(SHL4IMPLIBN): \
8563
8564 # touch creates an empty file, but this is not good for emxomfar, so
8565 # create a dummy lib here
8566 - -$(LIBMGR) $(LIBFLAGS) $@ $(SHL4VERSIONOBJ)
8567 + $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL4VERSIONOBJ)
8568 +@echo build of $(SHL4TARGETN) creates $@
8569
8570 .ELSE
8571 @@ -5631,8 +5799,10 @@ $(SHL5IMPLIBN): \
8572 $(SHL5IMPLIBN): \
8573 $(SHL5LIBS)
8574 .ENDIF
8575 - @echo ------------------------------1
8576 - @echo Making: $(SHL5IMPLIBN)
8577 +.IF "$(VERBOSE)" == "TRUE"
8578 + @echo -------------------------------
8579 +.ENDIF
8580 + @echo "Making: " $(@:f)
8581 .IF "$(GUI)" == "WNT"
8582 .IF "$(COM)"=="GCC"
8583 @echo no ImportLibs on mingw
8584 @@ -5653,7 +5823,7 @@ $(SHL5IMPLIBN): \
8585
8586 # touch creates an empty file, but this is not good for emxomfar, so
8587 # create a dummy lib here
8588 - -$(LIBMGR) $(LIBFLAGS) $@ $(SHL5VERSIONOBJ)
8589 + $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL5VERSIONOBJ)
8590 +@echo build of $(SHL5TARGETN) creates $@
8591
8592 .ELSE
8593 @@ -5686,8 +5856,10 @@ $(SHL6IMPLIBN): \
8594 $(SHL6IMPLIBN): \
8595 $(SHL6LIBS)
8596 .ENDIF
8597 - @echo ------------------------------1
8598 - @echo Making: $(SHL6IMPLIBN)
8599 +.IF "$(VERBOSE)" == "TRUE"
8600 + @echo -------------------------------
8601 +.ENDIF
8602 + @echo "Making: " $(@:f)
8603 .IF "$(GUI)" == "WNT"
8604 .IF "$(COM)"=="GCC"
8605 @echo no ImportLibs on mingw
8606 @@ -5708,7 +5880,7 @@ $(SHL6IMPLIBN): \
8607
8608 # touch creates an empty file, but this is not good for emxomfar, so
8609 # create a dummy lib here
8610 - -$(LIBMGR) $(LIBFLAGS) $@ $(SHL6VERSIONOBJ)
8611 + $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL6VERSIONOBJ)
8612 +@echo build of $(SHL6TARGETN) creates $@
8613
8614 .ELSE
8615 @@ -5741,8 +5913,10 @@ $(SHL7IMPLIBN): \
8616 $(SHL7IMPLIBN): \
8617 $(SHL7LIBS)
8618 .ENDIF
8619 - @echo ------------------------------1
8620 - @echo Making: $(SHL7IMPLIBN)
8621 +.IF "$(VERBOSE)" == "TRUE"
8622 + @echo -------------------------------
8623 +.ENDIF
8624 + @echo "Making: " $(@:f)
8625 .IF "$(GUI)" == "WNT"
8626 .IF "$(COM)"=="GCC"
8627 @echo no ImportLibs on mingw
8628 @@ -5763,7 +5937,7 @@ $(SHL7IMPLIBN): \
8629
8630 # touch creates an empty file, but this is not good for emxomfar, so
8631 # create a dummy lib here
8632 - -$(LIBMGR) $(LIBFLAGS) $@ $(SHL7VERSIONOBJ)
8633 + $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL7VERSIONOBJ)
8634 +@echo build of $(SHL7TARGETN) creates $@
8635
8636 .ELSE
8637 @@ -5796,8 +5970,10 @@ $(SHL8IMPLIBN): \
8638 $(SHL8IMPLIBN): \
8639 $(SHL8LIBS)
8640 .ENDIF
8641 - @echo ------------------------------1
8642 - @echo Making: $(SHL8IMPLIBN)
8643 +.IF "$(VERBOSE)" == "TRUE"
8644 + @echo -------------------------------
8645 +.ENDIF
8646 + @echo "Making: " $(@:f)
8647 .IF "$(GUI)" == "WNT"
8648 .IF "$(COM)"=="GCC"
8649 @echo no ImportLibs on mingw
8650 @@ -5818,7 +5994,7 @@ $(SHL8IMPLIBN): \
8651
8652 # touch creates an empty file, but this is not good for emxomfar, so
8653 # create a dummy lib here
8654 - -$(LIBMGR) $(LIBFLAGS) $@ $(SHL8VERSIONOBJ)
8655 + $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL8VERSIONOBJ)
8656 +@echo build of $(SHL8TARGETN) creates $@
8657
8658 .ELSE
8659 @@ -5851,8 +6027,10 @@ $(SHL9IMPLIBN): \
8660 $(SHL9IMPLIBN): \
8661 $(SHL9LIBS)
8662 .ENDIF
8663 - @echo ------------------------------1
8664 - @echo Making: $(SHL9IMPLIBN)
8665 +.IF "$(VERBOSE)" == "TRUE"
8666 + @echo -------------------------------
8667 +.ENDIF
8668 + @echo "Making: " $(@:f)
8669 .IF "$(GUI)" == "WNT"
8670 .IF "$(COM)"=="GCC"
8671 @echo no ImportLibs on mingw
8672 @@ -5873,7 +6051,7 @@ $(SHL9IMPLIBN): \
8673
8674 # touch creates an empty file, but this is not good for emxomfar, so
8675 # create a dummy lib here
8676 - -$(LIBMGR) $(LIBFLAGS) $@ $(SHL9VERSIONOBJ)
8677 + $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL9VERSIONOBJ)
8678 +@echo build of $(SHL9TARGETN) creates $@
8679
8680 .ELSE
8681 @@ -5906,8 +6084,10 @@ $(SHL10IMPLIBN): \
8682 $(SHL10IMPLIBN): \
8683 $(SHL10LIBS)
8684 .ENDIF
8685 - @echo ------------------------------1
8686 - @echo Making: $(SHL10IMPLIBN)
8687 +.IF "$(VERBOSE)" == "TRUE"
8688 + @echo -------------------------------
8689 +.ENDIF
8690 + @echo "Making: " $(@:f)
8691 .IF "$(GUI)" == "WNT"
8692 .IF "$(COM)"=="GCC"
8693 @echo no ImportLibs on mingw
8694 @@ -5928,7 +6108,7 @@ $(SHL10IMPLIBN): \
8695
8696 # touch creates an empty file, but this is not good for emxomfar, so
8697 # create a dummy lib here
8698 - -$(LIBMGR) $(LIBFLAGS) $@ $(SHL10VERSIONOBJ)
8699 + $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL10VERSIONOBJ)
8700 +@echo build of $(SHL10TARGETN) creates $@
8701
8702 .ELSE
8703 diff --git solenv/inc/_tg_srs.mk solenv/inc/_tg_srs.mk
8704 index d3d4c07..bc5ae3f 100644
8705 --- solenv/inc/_tg_srs.mk
8706 +++ solenv/inc/_tg_srs.mk
8707 @@ -5,10 +5,12 @@
8708 HID1FILES=$(foreach,i,$(SRC1FILES:f) $(SRS)/$(i:s/.src/.hid/))
8709 HIDSRS1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS1NAME)_srs.hid
8710 $(HIDSRS1PARTICLE) : $(HID1FILES)
8711 +.IF "$(VERBOSE)" == "TRUE"
8712 @echo ------------------------------
8713 - @echo Making: $@
8714 +.ENDIF
8715 + @echo "Making: " $(@:f)
8716 @-$(RM) $@
8717 - $(TYPE) $(mktmp $(subst,/,/ $(HID1FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8718 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID1FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8719 @$(RENAME) $@.$(ROUT).tmp $@
8720
8721 ALLTAR : $(HIDSRS1PARTICLE)
8722 @@ -60,10 +62,12 @@ $(SRS)/$(SRS1NAME).srs: $(SRC1FILES)
8723 HID2FILES=$(foreach,i,$(SRC2FILES:f) $(SRS)/$(i:s/.src/.hid/))
8724 HIDSRS2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS2NAME)_srs.hid
8725 $(HIDSRS2PARTICLE) : $(HID2FILES)
8726 +.IF "$(VERBOSE)" == "TRUE"
8727 @echo ------------------------------
8728 - @echo Making: $@
8729 +.ENDIF
8730 + @echo "Making: " $(@:f)
8731 @-$(RM) $@
8732 - $(TYPE) $(mktmp $(subst,/,/ $(HID2FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8733 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID2FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8734 @$(RENAME) $@.$(ROUT).tmp $@
8735
8736 ALLTAR : $(HIDSRS2PARTICLE)
8737 @@ -115,10 +119,12 @@ $(SRS)/$(SRS2NAME).srs: $(SRC2FILES)
8738 HID3FILES=$(foreach,i,$(SRC3FILES:f) $(SRS)/$(i:s/.src/.hid/))
8739 HIDSRS3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS3NAME)_srs.hid
8740 $(HIDSRS3PARTICLE) : $(HID3FILES)
8741 +.IF "$(VERBOSE)" == "TRUE"
8742 @echo ------------------------------
8743 - @echo Making: $@
8744 +.ENDIF
8745 + @echo "Making: " $(@:f)
8746 @-$(RM) $@
8747 - $(TYPE) $(mktmp $(subst,/,/ $(HID3FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8748 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID3FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8749 @$(RENAME) $@.$(ROUT).tmp $@
8750
8751 ALLTAR : $(HIDSRS3PARTICLE)
8752 @@ -170,10 +176,12 @@ $(SRS)/$(SRS3NAME).srs: $(SRC3FILES)
8753 HID4FILES=$(foreach,i,$(SRC4FILES:f) $(SRS)/$(i:s/.src/.hid/))
8754 HIDSRS4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS4NAME)_srs.hid
8755 $(HIDSRS4PARTICLE) : $(HID4FILES)
8756 +.IF "$(VERBOSE)" == "TRUE"
8757 @echo ------------------------------
8758 - @echo Making: $@
8759 +.ENDIF
8760 + @echo "Making: " $(@:f)
8761 @-$(RM) $@
8762 - $(TYPE) $(mktmp $(subst,/,/ $(HID4FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8763 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID4FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8764 @$(RENAME) $@.$(ROUT).tmp $@
8765
8766 ALLTAR : $(HIDSRS4PARTICLE)
8767 @@ -225,10 +233,12 @@ $(SRS)/$(SRS4NAME).srs: $(SRC4FILES)
8768 HID5FILES=$(foreach,i,$(SRC5FILES:f) $(SRS)/$(i:s/.src/.hid/))
8769 HIDSRS5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS5NAME)_srs.hid
8770 $(HIDSRS5PARTICLE) : $(HID5FILES)
8771 +.IF "$(VERBOSE)" == "TRUE"
8772 @echo ------------------------------
8773 - @echo Making: $@
8774 +.ENDIF
8775 + @echo "Making: " $(@:f)
8776 @-$(RM) $@
8777 - $(TYPE) $(mktmp $(subst,/,/ $(HID5FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8778 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID5FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8779 @$(RENAME) $@.$(ROUT).tmp $@
8780
8781 ALLTAR : $(HIDSRS5PARTICLE)
8782 @@ -280,10 +290,12 @@ $(SRS)/$(SRS5NAME).srs: $(SRC5FILES)
8783 HID6FILES=$(foreach,i,$(SRC6FILES:f) $(SRS)/$(i:s/.src/.hid/))
8784 HIDSRS6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS6NAME)_srs.hid
8785 $(HIDSRS6PARTICLE) : $(HID6FILES)
8786 +.IF "$(VERBOSE)" == "TRUE"
8787 @echo ------------------------------
8788 - @echo Making: $@
8789 +.ENDIF
8790 + @echo "Making: " $(@:f)
8791 @-$(RM) $@
8792 - $(TYPE) $(mktmp $(subst,/,/ $(HID6FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8793 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID6FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8794 @$(RENAME) $@.$(ROUT).tmp $@
8795
8796 ALLTAR : $(HIDSRS6PARTICLE)
8797 @@ -335,10 +347,12 @@ $(SRS)/$(SRS6NAME).srs: $(SRC6FILES)
8798 HID7FILES=$(foreach,i,$(SRC7FILES:f) $(SRS)/$(i:s/.src/.hid/))
8799 HIDSRS7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS7NAME)_srs.hid
8800 $(HIDSRS7PARTICLE) : $(HID7FILES)
8801 +.IF "$(VERBOSE)" == "TRUE"
8802 @echo ------------------------------
8803 - @echo Making: $@
8804 +.ENDIF
8805 + @echo "Making: " $(@:f)
8806 @-$(RM) $@
8807 - $(TYPE) $(mktmp $(subst,/,/ $(HID7FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8808 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID7FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8809 @$(RENAME) $@.$(ROUT).tmp $@
8810
8811 ALLTAR : $(HIDSRS7PARTICLE)
8812 @@ -390,10 +404,12 @@ $(SRS)/$(SRS7NAME).srs: $(SRC7FILES)
8813 HID8FILES=$(foreach,i,$(SRC8FILES:f) $(SRS)/$(i:s/.src/.hid/))
8814 HIDSRS8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS8NAME)_srs.hid
8815 $(HIDSRS8PARTICLE) : $(HID8FILES)
8816 +.IF "$(VERBOSE)" == "TRUE"
8817 @echo ------------------------------
8818 - @echo Making: $@
8819 +.ENDIF
8820 + @echo "Making: " $(@:f)
8821 @-$(RM) $@
8822 - $(TYPE) $(mktmp $(subst,/,/ $(HID8FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8823 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID8FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8824 @$(RENAME) $@.$(ROUT).tmp $@
8825
8826 ALLTAR : $(HIDSRS8PARTICLE)
8827 @@ -445,10 +461,12 @@ $(SRS)/$(SRS8NAME).srs: $(SRC8FILES)
8828 HID9FILES=$(foreach,i,$(SRC9FILES:f) $(SRS)/$(i:s/.src/.hid/))
8829 HIDSRS9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS9NAME)_srs.hid
8830 $(HIDSRS9PARTICLE) : $(HID9FILES)
8831 +.IF "$(VERBOSE)" == "TRUE"
8832 @echo ------------------------------
8833 - @echo Making: $@
8834 +.ENDIF
8835 + @echo "Making: " $(@:f)
8836 @-$(RM) $@
8837 - $(TYPE) $(mktmp $(subst,/,/ $(HID9FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8838 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID9FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8839 @$(RENAME) $@.$(ROUT).tmp $@
8840
8841 ALLTAR : $(HIDSRS9PARTICLE)
8842 @@ -500,10 +518,12 @@ $(SRS)/$(SRS9NAME).srs: $(SRC9FILES)
8843 HID10FILES=$(foreach,i,$(SRC10FILES:f) $(SRS)/$(i:s/.src/.hid/))
8844 HIDSRS10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS10NAME)_srs.hid
8845 $(HIDSRS10PARTICLE) : $(HID10FILES)
8846 +.IF "$(VERBOSE)" == "TRUE"
8847 @echo ------------------------------
8848 - @echo Making: $@
8849 +.ENDIF
8850 + @echo "Making: " $(@:f)
8851 @-$(RM) $@
8852 - $(TYPE) $(mktmp $(subst,/,/ $(HID10FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8853 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID10FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
8854 @$(RENAME) $@.$(ROUT).tmp $@
8855
8856 ALLTAR : $(HIDSRS10PARTICLE)
8857 diff --git solenv/inc/_tg_zip.mk solenv/inc/_tg_zip.mk
8858 index 79ced98..65d0c4e 100644
8859 --- solenv/inc/_tg_zip.mk
8860 +++ solenv/inc/_tg_zip.mk
8861 @@ -58,50 +58,48 @@ ZIP1HELPVAR=$(BIN)/$(ZIP1TARGET)
8862 .ENDIF # "$(common_build_zip)"!=""
8863
8864 $(ZIP1DEPFILE) :
8865 - echo # > $(MISC)/$(@:f)
8866 + @echo # > $(MISC)/$(@:f)
8867 .IF "$(common_build_zip)"!=""
8868 .IF "$(ZIP1DIR)" != ""
8869 - @echo type 1
8870 - -$(MKDIRHIER) $(ZIP1DIR)
8871 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
8872 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP1DIR)
8873 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
8874 .ELSE # "$(ZIP1DIR)" != ""
8875 - @echo type 2
8876 - -$(ZIPDEP) $(ZIP1FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
8877 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP1FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/))) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP1TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
8878 .ENDIF # "$(ZIP1DIR)" != ""
8879 .ELSE # "$(common_build_zip)"!=""
8880 .IF "$(ZIP1DIR)" != ""
8881 - @echo type 3
8882 - -$(MKDIRHIER) $(ZIP1DIR)
8883 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
8884 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP1DIR)
8885 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) $(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
8886 .ELSE # "$(ZIP1DIR)" != ""
8887 - @echo type 4
8888 - -$(ZIPDEP) $(ZIP1FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
8889 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP1FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
8890 .ENDIF # "$(ZIP1DIR)" != ""
8891 .ENDIF # "$(common_build_zip)"!=""
8892 @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
8893
8894
8895 $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
8896 +.IF "$(VERBOSE)" == "TRUE"
8897 @echo ------------------------------
8898 - @echo Making: $@
8899 +.ENDIF
8900 + @echo "Making: " $(@:f)
8901 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
8902 @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
8903 @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
8904 .IF "$(common_build_zip)"!=""
8905 .IF "$(ZIP1DIR)" != ""
8906 @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
8907 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
8908 - $(IFEXIST) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \
8909 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
8910 - $(FI)
8911 - $(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $@.$(INPATH)
8912 - $(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
8913 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
8914 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \
8915 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
8916 + $(FI)
8917 + $(COMMAND_ECHO)$(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $@.$(INPATH)
8918 + $(COMMAND_ECHO)$(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
8919 .ELSE # "$(ZIP1DIR)" != ""
8920 @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
8921 - zip $(ZIP1FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
8922 - $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
8923 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
8924 - $(FI)
8925 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
8926 + $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
8927 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
8928 + $(FI)
8929 @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
8930 @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
8931 .ENDIF # "$(ZIP1DIR)" != ""
8932 @@ -111,17 +109,17 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
8933 .ELSE # "$(common_build_zip)"!=""
8934 .IF "$(ZIP1DIR)" != ""
8935 @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
8936 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
8937 - $(IFEXIST) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \
8938 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
8939 - $(FI)
8940 - $(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $@
8941 - $(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
8942 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} $(ZIP1DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
8943 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \
8944 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
8945 + $(FI)
8946 + $(COMMAND_ECHO)$(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $@
8947 + $(COMMAND_ECHO)$(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT)
8948 .ELSE # "$(ZIP1DIR)" != ""
8949 - zip $(ZIP1FLAGS) $@ $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
8950 - $(IFEXIST) $@ $(THEN) \
8951 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
8952 - $(FI)
8953 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $@ $(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
8954 + $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
8955 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
8956 + $(FI)
8957 .ENDIF # "$(ZIP1DIR)" != ""
8958 .ENDIF # "$(common_build_zip)"!=""
8959 .ENDIF
8960 @@ -186,50 +184,48 @@ ZIP2HELPVAR=$(BIN)/$(ZIP2TARGET)
8961 .ENDIF # "$(common_build_zip)"!=""
8962
8963 $(ZIP2DEPFILE) :
8964 - echo # > $(MISC)/$(@:f)
8965 + @echo # > $(MISC)/$(@:f)
8966 .IF "$(common_build_zip)"!=""
8967 .IF "$(ZIP2DIR)" != ""
8968 - @echo type 1
8969 - -$(MKDIRHIER) $(ZIP2DIR)
8970 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
8971 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP2DIR)
8972 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
8973 .ELSE # "$(ZIP2DIR)" != ""
8974 - @echo type 2
8975 - -$(ZIPDEP) $(ZIP2FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
8976 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP2FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/))) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP2TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
8977 .ENDIF # "$(ZIP2DIR)" != ""
8978 .ELSE # "$(common_build_zip)"!=""
8979 .IF "$(ZIP2DIR)" != ""
8980 - @echo type 3
8981 - -$(MKDIRHIER) $(ZIP2DIR)
8982 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
8983 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP2DIR)
8984 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) $(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
8985 .ELSE # "$(ZIP2DIR)" != ""
8986 - @echo type 4
8987 - -$(ZIPDEP) $(ZIP2FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
8988 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP2FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) $(foreach,j,$(ZIP2LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
8989 .ENDIF # "$(ZIP2DIR)" != ""
8990 .ENDIF # "$(common_build_zip)"!=""
8991 @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
8992
8993
8994 $(ZIP2TARGETN) : delzip $(ZIP2DEPS)
8995 +.IF "$(VERBOSE)" == "TRUE"
8996 @echo ------------------------------
8997 - @echo Making: $@
8998 +.ENDIF
8999 + @echo "Making: " $(@:f)
9000 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
9001 @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
9002 @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
9003 .IF "$(common_build_zip)"!=""
9004 .IF "$(ZIP2DIR)" != ""
9005 @@-$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
9006 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9007 - $(IFEXIST) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(THEN) \
9008 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) \
9009 - $(FI)
9010 - $(COPY) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $@.$(INPATH)
9011 - $(RM) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
9012 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9013 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(THEN) \
9014 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) \
9015 + $(FI)
9016 + $(COMMAND_ECHO)$(COPY) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $@.$(INPATH)
9017 + $(COMMAND_ECHO)$(RM) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
9018 .ELSE # "$(ZIP2DIR)" != ""
9019 @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9020 - zip $(ZIP2FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9021 - $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9022 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9023 - $(FI)
9024 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP2FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9025 + $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9026 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9027 + $(FI)
9028 @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
9029 @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9030 .ENDIF # "$(ZIP2DIR)" != ""
9031 @@ -239,17 +235,17 @@ $(ZIP2TARGETN) : delzip $(ZIP2DEPS)
9032 .ELSE # "$(common_build_zip)"!=""
9033 .IF "$(ZIP2DIR)" != ""
9034 @@-$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
9035 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9036 - $(IFEXIST) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(THEN) \
9037 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) \
9038 - $(FI)
9039 - $(COPY) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $@
9040 - $(RM) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
9041 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP2HELPVAR)_, $(@:db))} $(ZIP2DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP2FLAGS) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(subst,LANGDIR_away/, $(ZIP2LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9042 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $(THEN) \
9043 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) \
9044 + $(FI)
9045 + $(COMMAND_ECHO)$(COPY) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT) $@
9046 + $(COMMAND_ECHO)$(RM) $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ $(@:db))}$(ZIP2EXT)
9047 .ELSE # "$(ZIP2DIR)" != ""
9048 - zip $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9049 - $(IFEXIST) $@ $(THEN) \
9050 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9051 - $(FI)
9052 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP2FLAGS) $@ $(foreach,j,$(ZIP2LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9053 + $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
9054 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9055 + $(FI)
9056 .ENDIF # "$(ZIP2DIR)" != ""
9057 .ENDIF # "$(common_build_zip)"!=""
9058 .ENDIF
9059 @@ -314,50 +310,48 @@ ZIP3HELPVAR=$(BIN)/$(ZIP3TARGET)
9060 .ENDIF # "$(common_build_zip)"!=""
9061
9062 $(ZIP3DEPFILE) :
9063 - echo # > $(MISC)/$(@:f)
9064 + @echo # > $(MISC)/$(@:f)
9065 .IF "$(common_build_zip)"!=""
9066 .IF "$(ZIP3DIR)" != ""
9067 - @echo type 1
9068 - -$(MKDIRHIER) $(ZIP3DIR)
9069 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9070 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP3DIR)
9071 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9072 .ELSE # "$(ZIP3DIR)" != ""
9073 - @echo type 2
9074 - -$(ZIPDEP) $(ZIP3FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9075 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP3FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/))) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP3TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9076 .ENDIF # "$(ZIP3DIR)" != ""
9077 .ELSE # "$(common_build_zip)"!=""
9078 .IF "$(ZIP3DIR)" != ""
9079 - @echo type 3
9080 - -$(MKDIRHIER) $(ZIP3DIR)
9081 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9082 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP3DIR)
9083 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR))) $(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9084 .ELSE # "$(ZIP3DIR)" != ""
9085 - @echo type 4
9086 - -$(ZIPDEP) $(ZIP3FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9087 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP3FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/)) $(foreach,j,$(ZIP3LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9088 .ENDIF # "$(ZIP3DIR)" != ""
9089 .ENDIF # "$(common_build_zip)"!=""
9090 @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
9091
9092
9093 $(ZIP3TARGETN) : delzip $(ZIP3DEPS)
9094 +.IF "$(VERBOSE)" == "TRUE"
9095 @echo ------------------------------
9096 - @echo Making: $@
9097 +.ENDIF
9098 + @echo "Making: " $(@:f)
9099 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
9100 @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
9101 @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
9102 .IF "$(common_build_zip)"!=""
9103 .IF "$(ZIP3DIR)" != ""
9104 @@-$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
9105 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9106 - $(IFEXIST) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(THEN) \
9107 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) \
9108 - $(FI)
9109 - $(COPY) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $@.$(INPATH)
9110 - $(RM) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
9111 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9112 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(THEN) \
9113 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) \
9114 + $(FI)
9115 + $(COMMAND_ECHO)$(COPY) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $@.$(INPATH)
9116 + $(COMMAND_ECHO)$(RM) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
9117 .ELSE # "$(ZIP3DIR)" != ""
9118 @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9119 - zip $(ZIP3FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9120 - $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9121 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9122 - $(FI)
9123 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP3FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9124 + $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9125 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9126 + $(FI)
9127 @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
9128 @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9129 .ENDIF # "$(ZIP3DIR)" != ""
9130 @@ -367,17 +361,17 @@ $(ZIP3TARGETN) : delzip $(ZIP3DEPS)
9131 .ELSE # "$(common_build_zip)"!=""
9132 .IF "$(ZIP3DIR)" != ""
9133 @@-$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
9134 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9135 - $(IFEXIST) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(THEN) \
9136 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) \
9137 - $(FI)
9138 - $(COPY) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $@
9139 - $(RM) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
9140 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP3HELPVAR)_, $(@:db))} $(ZIP3DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP3FLAGS) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(subst,LANGDIR_away/, $(ZIP3LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9141 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $(THEN) \
9142 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) \
9143 + $(FI)
9144 + $(COMMAND_ECHO)$(COPY) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT) $@
9145 + $(COMMAND_ECHO)$(RM) $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ $(@:db))}$(ZIP3EXT)
9146 .ELSE # "$(ZIP3DIR)" != ""
9147 - zip $(ZIP3FLAGS) $@ $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9148 - $(IFEXIST) $@ $(THEN) \
9149 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9150 - $(FI)
9151 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP3FLAGS) $@ $(foreach,j,$(ZIP3LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9152 + $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
9153 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9154 + $(FI)
9155 .ENDIF # "$(ZIP3DIR)" != ""
9156 .ENDIF # "$(common_build_zip)"!=""
9157 .ENDIF
9158 @@ -442,50 +436,48 @@ ZIP4HELPVAR=$(BIN)/$(ZIP4TARGET)
9159 .ENDIF # "$(common_build_zip)"!=""
9160
9161 $(ZIP4DEPFILE) :
9162 - echo # > $(MISC)/$(@:f)
9163 + @echo # > $(MISC)/$(@:f)
9164 .IF "$(common_build_zip)"!=""
9165 .IF "$(ZIP4DIR)" != ""
9166 - @echo type 1
9167 - -$(MKDIRHIER) $(ZIP4DIR)
9168 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9169 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP4DIR)
9170 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9171 .ELSE # "$(ZIP4DIR)" != ""
9172 - @echo type 2
9173 - -$(ZIPDEP) $(ZIP4FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9174 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP4FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/))) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP4TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9175 .ENDIF # "$(ZIP4DIR)" != ""
9176 .ELSE # "$(common_build_zip)"!=""
9177 .IF "$(ZIP4DIR)" != ""
9178 - @echo type 3
9179 - -$(MKDIRHIER) $(ZIP4DIR)
9180 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9181 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP4DIR)
9182 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR))) $(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9183 .ELSE # "$(ZIP4DIR)" != ""
9184 - @echo type 4
9185 - -$(ZIPDEP) $(ZIP4FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9186 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP4FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/)) $(foreach,j,$(ZIP4LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9187 .ENDIF # "$(ZIP4DIR)" != ""
9188 .ENDIF # "$(common_build_zip)"!=""
9189 @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
9190
9191
9192 $(ZIP4TARGETN) : delzip $(ZIP4DEPS)
9193 +.IF "$(VERBOSE)" == "TRUE"
9194 @echo ------------------------------
9195 - @echo Making: $@
9196 +.ENDIF
9197 + @echo "Making: " $(@:f)
9198 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
9199 @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
9200 @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
9201 .IF "$(common_build_zip)"!=""
9202 .IF "$(ZIP4DIR)" != ""
9203 @@-$(GNUCOPY) -p $@ $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
9204 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9205 - $(IFEXIST) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(THEN) \
9206 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) \
9207 - $(FI)
9208 - $(COPY) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $@.$(INPATH)
9209 - $(RM) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
9210 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9211 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(THEN) \
9212 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) \
9213 + $(FI)
9214 + $(COMMAND_ECHO)$(COPY) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $@.$(INPATH)
9215 + $(COMMAND_ECHO)$(RM) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
9216 .ELSE # "$(ZIP4DIR)" != ""
9217 @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9218 - zip $(ZIP4FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9219 - $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9220 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9221 - $(FI)
9222 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP4FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9223 + $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9224 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9225 + $(FI)
9226 @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
9227 @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9228 .ENDIF # "$(ZIP4DIR)" != ""
9229 @@ -495,17 +487,17 @@ $(ZIP4TARGETN) : delzip $(ZIP4DEPS)
9230 .ELSE # "$(common_build_zip)"!=""
9231 .IF "$(ZIP4DIR)" != ""
9232 @@-$(GNUCOPY) -p $@ $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
9233 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9234 - $(IFEXIST) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(THEN) \
9235 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) \
9236 - $(FI)
9237 - $(COPY) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $@
9238 - $(RM) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
9239 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP4HELPVAR)_, $(@:db))} $(ZIP4DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP4FLAGS) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(subst,LANGDIR_away/, $(ZIP4LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9240 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $(THEN) \
9241 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) \
9242 + $(FI)
9243 + $(COMMAND_ECHO)$(COPY) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT) $@
9244 + $(COMMAND_ECHO)$(RM) $(ZIP4TMP).$(ZIP4TARGET){$(subst,$(ZIP4HELPVAR),_ $(@:db))}$(ZIP4EXT)
9245 .ELSE # "$(ZIP4DIR)" != ""
9246 - zip $(ZIP4FLAGS) $@ $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9247 - $(IFEXIST) $@ $(THEN) \
9248 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9249 - $(FI)
9250 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP4FLAGS) $@ $(foreach,j,$(ZIP4LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9251 + $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
9252 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9253 + $(FI)
9254 .ENDIF # "$(ZIP4DIR)" != ""
9255 .ENDIF # "$(common_build_zip)"!=""
9256 .ENDIF
9257 @@ -570,50 +562,48 @@ ZIP5HELPVAR=$(BIN)/$(ZIP5TARGET)
9258 .ENDIF # "$(common_build_zip)"!=""
9259
9260 $(ZIP5DEPFILE) :
9261 - echo # > $(MISC)/$(@:f)
9262 + @echo # > $(MISC)/$(@:f)
9263 .IF "$(common_build_zip)"!=""
9264 .IF "$(ZIP5DIR)" != ""
9265 - @echo type 1
9266 - -$(MKDIRHIER) $(ZIP5DIR)
9267 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9268 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP5DIR)
9269 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9270 .ELSE # "$(ZIP5DIR)" != ""
9271 - @echo type 2
9272 - -$(ZIPDEP) $(ZIP5FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9273 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP5FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/))) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP5TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9274 .ENDIF # "$(ZIP5DIR)" != ""
9275 .ELSE # "$(common_build_zip)"!=""
9276 .IF "$(ZIP5DIR)" != ""
9277 - @echo type 3
9278 - -$(MKDIRHIER) $(ZIP5DIR)
9279 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9280 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP5DIR)
9281 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR))) $(command_seperator) $(ZIPDEP) $(ZIP5FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP5DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9282 .ELSE # "$(ZIP5DIR)" != ""
9283 - @echo type 4
9284 - -$(ZIPDEP) $(ZIP5FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9285 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP5FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP5EXT)/)) $(foreach,j,$(ZIP5LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9286 .ENDIF # "$(ZIP5DIR)" != ""
9287 .ENDIF # "$(common_build_zip)"!=""
9288 @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
9289
9290
9291 $(ZIP5TARGETN) : delzip $(ZIP5DEPS)
9292 +.IF "$(VERBOSE)" == "TRUE"
9293 @echo ------------------------------
9294 - @echo Making: $@
9295 +.ENDIF
9296 + @echo "Making: " $(@:f)
9297 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
9298 @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
9299 @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
9300 .IF "$(common_build_zip)"!=""
9301 .IF "$(ZIP5DIR)" != ""
9302 @@-$(GNUCOPY) -p $@ $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
9303 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9304 - $(IFEXIST) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(THEN) \
9305 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) \
9306 - $(FI)
9307 - $(COPY) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $@.$(INPATH)
9308 - $(RM) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
9309 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9310 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(THEN) \
9311 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) \
9312 + $(FI)
9313 + $(COMMAND_ECHO)$(COPY) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $@.$(INPATH)
9314 + $(COMMAND_ECHO)$(RM) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
9315 .ELSE # "$(ZIP5DIR)" != ""
9316 @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9317 - zip $(ZIP5FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9318 - $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9319 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9320 - $(FI)
9321 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP5FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9322 + $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9323 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9324 + $(FI)
9325 @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
9326 @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9327 .ENDIF # "$(ZIP5DIR)" != ""
9328 @@ -623,17 +613,17 @@ $(ZIP5TARGETN) : delzip $(ZIP5DEPS)
9329 .ELSE # "$(common_build_zip)"!=""
9330 .IF "$(ZIP5DIR)" != ""
9331 @@-$(GNUCOPY) -p $@ $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
9332 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9333 - $(IFEXIST) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(THEN) \
9334 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) \
9335 - $(FI)
9336 - $(COPY) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $@
9337 - $(RM) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
9338 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP5HELPVAR)_, $(@:db))} $(ZIP5DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP5FLAGS) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(subst,LANGDIR_away/, $(ZIP5LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9339 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $(THEN) \
9340 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) \
9341 + $(FI)
9342 + $(COMMAND_ECHO)$(COPY) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT) $@
9343 + $(COMMAND_ECHO)$(RM) $(ZIP5TMP).$(ZIP5TARGET){$(subst,$(ZIP5HELPVAR),_ $(@:db))}$(ZIP5EXT)
9344 .ELSE # "$(ZIP5DIR)" != ""
9345 - zip $(ZIP5FLAGS) $@ $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9346 - $(IFEXIST) $@ $(THEN) \
9347 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9348 - $(FI)
9349 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP5FLAGS) $@ $(foreach,j,$(ZIP5LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP5TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9350 + $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
9351 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9352 + $(FI)
9353 .ENDIF # "$(ZIP5DIR)" != ""
9354 .ENDIF # "$(common_build_zip)"!=""
9355 .ENDIF
9356 @@ -698,50 +688,48 @@ ZIP6HELPVAR=$(BIN)/$(ZIP6TARGET)
9357 .ENDIF # "$(common_build_zip)"!=""
9358
9359 $(ZIP6DEPFILE) :
9360 - echo # > $(MISC)/$(@:f)
9361 + @echo # > $(MISC)/$(@:f)
9362 .IF "$(common_build_zip)"!=""
9363 .IF "$(ZIP6DIR)" != ""
9364 - @echo type 1
9365 - -$(MKDIRHIER) $(ZIP6DIR)
9366 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9367 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP6DIR)
9368 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9369 .ELSE # "$(ZIP6DIR)" != ""
9370 - @echo type 2
9371 - -$(ZIPDEP) $(ZIP6FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9372 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP6FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/))) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP6TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9373 .ENDIF # "$(ZIP6DIR)" != ""
9374 .ELSE # "$(common_build_zip)"!=""
9375 .IF "$(ZIP6DIR)" != ""
9376 - @echo type 3
9377 - -$(MKDIRHIER) $(ZIP6DIR)
9378 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9379 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP6DIR)
9380 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR))) $(command_seperator) $(ZIPDEP) $(ZIP6FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP6DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9381 .ELSE # "$(ZIP6DIR)" != ""
9382 - @echo type 4
9383 - -$(ZIPDEP) $(ZIP6FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9384 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP6FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP6EXT)/)) $(foreach,j,$(ZIP6LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9385 .ENDIF # "$(ZIP6DIR)" != ""
9386 .ENDIF # "$(common_build_zip)"!=""
9387 @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
9388
9389
9390 $(ZIP6TARGETN) : delzip $(ZIP6DEPS)
9391 +.IF "$(VERBOSE)" == "TRUE"
9392 @echo ------------------------------
9393 - @echo Making: $@
9394 +.ENDIF
9395 + @echo "Making: " $(@:f)
9396 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
9397 @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
9398 @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
9399 .IF "$(common_build_zip)"!=""
9400 .IF "$(ZIP6DIR)" != ""
9401 @@-$(GNUCOPY) -p $@ $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
9402 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9403 - $(IFEXIST) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(THEN) \
9404 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) \
9405 - $(FI)
9406 - $(COPY) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $@.$(INPATH)
9407 - $(RM) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
9408 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9409 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(THEN) \
9410 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) \
9411 + $(FI)
9412 + $(COMMAND_ECHO)$(COPY) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $@.$(INPATH)
9413 + $(COMMAND_ECHO)$(RM) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
9414 .ELSE # "$(ZIP6DIR)" != ""
9415 @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9416 - zip $(ZIP6FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9417 - $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9418 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9419 - $(FI)
9420 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP6FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9421 + $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9422 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9423 + $(FI)
9424 @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
9425 @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9426 .ENDIF # "$(ZIP6DIR)" != ""
9427 @@ -751,17 +739,17 @@ $(ZIP6TARGETN) : delzip $(ZIP6DEPS)
9428 .ELSE # "$(common_build_zip)"!=""
9429 .IF "$(ZIP6DIR)" != ""
9430 @@-$(GNUCOPY) -p $@ $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
9431 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9432 - $(IFEXIST) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(THEN) \
9433 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) \
9434 - $(FI)
9435 - $(COPY) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $@
9436 - $(RM) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
9437 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP6HELPVAR)_, $(@:db))} $(ZIP6DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP6FLAGS) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(subst,LANGDIR_away/, $(ZIP6LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9438 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $(THEN) \
9439 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) \
9440 + $(FI)
9441 + $(COMMAND_ECHO)$(COPY) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT) $@
9442 + $(COMMAND_ECHO)$(RM) $(ZIP6TMP).$(ZIP6TARGET){$(subst,$(ZIP6HELPVAR),_ $(@:db))}$(ZIP6EXT)
9443 .ELSE # "$(ZIP6DIR)" != ""
9444 - zip $(ZIP6FLAGS) $@ $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9445 - $(IFEXIST) $@ $(THEN) \
9446 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9447 - $(FI)
9448 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP6FLAGS) $@ $(foreach,j,$(ZIP6LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP6TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9449 + $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
9450 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9451 + $(FI)
9452 .ENDIF # "$(ZIP6DIR)" != ""
9453 .ENDIF # "$(common_build_zip)"!=""
9454 .ENDIF
9455 @@ -826,50 +814,48 @@ ZIP7HELPVAR=$(BIN)/$(ZIP7TARGET)
9456 .ENDIF # "$(common_build_zip)"!=""
9457
9458 $(ZIP7DEPFILE) :
9459 - echo # > $(MISC)/$(@:f)
9460 + @echo # > $(MISC)/$(@:f)
9461 .IF "$(common_build_zip)"!=""
9462 .IF "$(ZIP7DIR)" != ""
9463 - @echo type 1
9464 - -$(MKDIRHIER) $(ZIP7DIR)
9465 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9466 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP7DIR)
9467 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9468 .ELSE # "$(ZIP7DIR)" != ""
9469 - @echo type 2
9470 - -$(ZIPDEP) $(ZIP7FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9471 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP7FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/))) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP7TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9472 .ENDIF # "$(ZIP7DIR)" != ""
9473 .ELSE # "$(common_build_zip)"!=""
9474 .IF "$(ZIP7DIR)" != ""
9475 - @echo type 3
9476 - -$(MKDIRHIER) $(ZIP7DIR)
9477 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9478 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP7DIR)
9479 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR))) $(command_seperator) $(ZIPDEP) $(ZIP7FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP7DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9480 .ELSE # "$(ZIP7DIR)" != ""
9481 - @echo type 4
9482 - -$(ZIPDEP) $(ZIP7FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9483 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP7FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP7EXT)/)) $(foreach,j,$(ZIP7LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9484 .ENDIF # "$(ZIP7DIR)" != ""
9485 .ENDIF # "$(common_build_zip)"!=""
9486 @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
9487
9488
9489 $(ZIP7TARGETN) : delzip $(ZIP7DEPS)
9490 +.IF "$(VERBOSE)" == "TRUE"
9491 @echo ------------------------------
9492 - @echo Making: $@
9493 +.ENDIF
9494 + @echo "Making: " $(@:f)
9495 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
9496 @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
9497 @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
9498 .IF "$(common_build_zip)"!=""
9499 .IF "$(ZIP7DIR)" != ""
9500 @@-$(GNUCOPY) -p $@ $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
9501 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9502 - $(IFEXIST) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(THEN) \
9503 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) \
9504 - $(FI)
9505 - $(COPY) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $@.$(INPATH)
9506 - $(RM) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
9507 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9508 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(THEN) \
9509 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) \
9510 + $(FI)
9511 + $(COMMAND_ECHO)$(COPY) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $@.$(INPATH)
9512 + $(COMMAND_ECHO)$(RM) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
9513 .ELSE # "$(ZIP7DIR)" != ""
9514 @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9515 - zip $(ZIP7FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9516 - $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9517 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9518 - $(FI)
9519 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP7FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9520 + $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9521 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9522 + $(FI)
9523 @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
9524 @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9525 .ENDIF # "$(ZIP7DIR)" != ""
9526 @@ -879,17 +865,17 @@ $(ZIP7TARGETN) : delzip $(ZIP7DEPS)
9527 .ELSE # "$(common_build_zip)"!=""
9528 .IF "$(ZIP7DIR)" != ""
9529 @@-$(GNUCOPY) -p $@ $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
9530 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9531 - $(IFEXIST) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(THEN) \
9532 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) \
9533 - $(FI)
9534 - $(COPY) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $@
9535 - $(RM) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
9536 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP7HELPVAR)_, $(@:db))} $(ZIP7DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP7FLAGS) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(subst,LANGDIR_away/, $(ZIP7LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9537 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $(THEN) \
9538 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) \
9539 + $(FI)
9540 + $(COMMAND_ECHO)$(COPY) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT) $@
9541 + $(COMMAND_ECHO)$(RM) $(ZIP7TMP).$(ZIP7TARGET){$(subst,$(ZIP7HELPVAR),_ $(@:db))}$(ZIP7EXT)
9542 .ELSE # "$(ZIP7DIR)" != ""
9543 - zip $(ZIP7FLAGS) $@ $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9544 - $(IFEXIST) $@ $(THEN) \
9545 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9546 - $(FI)
9547 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP7FLAGS) $@ $(foreach,j,$(ZIP7LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP7TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9548 + $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
9549 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9550 + $(FI)
9551 .ENDIF # "$(ZIP7DIR)" != ""
9552 .ENDIF # "$(common_build_zip)"!=""
9553 .ENDIF
9554 @@ -954,50 +940,48 @@ ZIP8HELPVAR=$(BIN)/$(ZIP8TARGET)
9555 .ENDIF # "$(common_build_zip)"!=""
9556
9557 $(ZIP8DEPFILE) :
9558 - echo # > $(MISC)/$(@:f)
9559 + @echo # > $(MISC)/$(@:f)
9560 .IF "$(common_build_zip)"!=""
9561 .IF "$(ZIP8DIR)" != ""
9562 - @echo type 1
9563 - -$(MKDIRHIER) $(ZIP8DIR)
9564 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9565 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP8DIR)
9566 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9567 .ELSE # "$(ZIP8DIR)" != ""
9568 - @echo type 2
9569 - -$(ZIPDEP) $(ZIP8FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9570 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP8FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/))) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP8TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9571 .ENDIF # "$(ZIP8DIR)" != ""
9572 .ELSE # "$(common_build_zip)"!=""
9573 .IF "$(ZIP8DIR)" != ""
9574 - @echo type 3
9575 - -$(MKDIRHIER) $(ZIP8DIR)
9576 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9577 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP8DIR)
9578 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR))) $(command_seperator) $(ZIPDEP) $(ZIP8FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP8DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9579 .ELSE # "$(ZIP8DIR)" != ""
9580 - @echo type 4
9581 - -$(ZIPDEP) $(ZIP8FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9582 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP8FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP8EXT)/)) $(foreach,j,$(ZIP8LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9583 .ENDIF # "$(ZIP8DIR)" != ""
9584 .ENDIF # "$(common_build_zip)"!=""
9585 @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
9586
9587
9588 $(ZIP8TARGETN) : delzip $(ZIP8DEPS)
9589 +.IF "$(VERBOSE)" == "TRUE"
9590 @echo ------------------------------
9591 - @echo Making: $@
9592 +.ENDIF
9593 + @echo "Making: " $(@:f)
9594 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
9595 @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
9596 @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
9597 .IF "$(common_build_zip)"!=""
9598 .IF "$(ZIP8DIR)" != ""
9599 @@-$(GNUCOPY) -p $@ $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
9600 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9601 - $(IFEXIST) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(THEN) \
9602 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) \
9603 - $(FI)
9604 - $(COPY) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $@.$(INPATH)
9605 - $(RM) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
9606 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9607 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(THEN) \
9608 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) \
9609 + $(FI)
9610 + $(COMMAND_ECHO)$(COPY) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $@.$(INPATH)
9611 + $(COMMAND_ECHO)$(RM) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
9612 .ELSE # "$(ZIP8DIR)" != ""
9613 @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9614 - zip $(ZIP8FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9615 - $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9616 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9617 - $(FI)
9618 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP8FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9619 + $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9620 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9621 + $(FI)
9622 @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
9623 @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9624 .ENDIF # "$(ZIP8DIR)" != ""
9625 @@ -1007,17 +991,17 @@ $(ZIP8TARGETN) : delzip $(ZIP8DEPS)
9626 .ELSE # "$(common_build_zip)"!=""
9627 .IF "$(ZIP8DIR)" != ""
9628 @@-$(GNUCOPY) -p $@ $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
9629 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9630 - $(IFEXIST) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(THEN) \
9631 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) \
9632 - $(FI)
9633 - $(COPY) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $@
9634 - $(RM) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
9635 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP8HELPVAR)_, $(@:db))} $(ZIP8DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP8FLAGS) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(subst,LANGDIR_away/, $(ZIP8LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9636 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $(THEN) \
9637 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) \
9638 + $(FI)
9639 + $(COMMAND_ECHO)$(COPY) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT) $@
9640 + $(COMMAND_ECHO)$(RM) $(ZIP8TMP).$(ZIP8TARGET){$(subst,$(ZIP8HELPVAR),_ $(@:db))}$(ZIP8EXT)
9641 .ELSE # "$(ZIP8DIR)" != ""
9642 - zip $(ZIP8FLAGS) $@ $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9643 - $(IFEXIST) $@ $(THEN) \
9644 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9645 - $(FI)
9646 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP8FLAGS) $@ $(foreach,j,$(ZIP8LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP8TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9647 + $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
9648 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9649 + $(FI)
9650 .ENDIF # "$(ZIP8DIR)" != ""
9651 .ENDIF # "$(common_build_zip)"!=""
9652 .ENDIF
9653 @@ -1082,50 +1066,48 @@ ZIP9HELPVAR=$(BIN)/$(ZIP9TARGET)
9654 .ENDIF # "$(common_build_zip)"!=""
9655
9656 $(ZIP9DEPFILE) :
9657 - echo # > $(MISC)/$(@:f)
9658 + @echo # > $(MISC)/$(@:f)
9659 .IF "$(common_build_zip)"!=""
9660 .IF "$(ZIP9DIR)" != ""
9661 - @echo type 1
9662 - -$(MKDIRHIER) $(ZIP9DIR)
9663 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9664 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP9DIR)
9665 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9666 .ELSE # "$(ZIP9DIR)" != ""
9667 - @echo type 2
9668 - -$(ZIPDEP) $(ZIP9FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9669 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP9FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/))) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP9TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9670 .ENDIF # "$(ZIP9DIR)" != ""
9671 .ELSE # "$(common_build_zip)"!=""
9672 .IF "$(ZIP9DIR)" != ""
9673 - @echo type 3
9674 - -$(MKDIRHIER) $(ZIP9DIR)
9675 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9676 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP9DIR)
9677 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR))) $(command_seperator) $(ZIPDEP) $(ZIP9FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP9DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9678 .ELSE # "$(ZIP9DIR)" != ""
9679 - @echo type 4
9680 - -$(ZIPDEP) $(ZIP9FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9681 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP9FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP9EXT)/)) $(foreach,j,$(ZIP9LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9682 .ENDIF # "$(ZIP9DIR)" != ""
9683 .ENDIF # "$(common_build_zip)"!=""
9684 @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
9685
9686
9687 $(ZIP9TARGETN) : delzip $(ZIP9DEPS)
9688 +.IF "$(VERBOSE)" == "TRUE"
9689 @echo ------------------------------
9690 - @echo Making: $@
9691 +.ENDIF
9692 + @echo "Making: " $(@:f)
9693 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
9694 @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
9695 @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
9696 .IF "$(common_build_zip)"!=""
9697 .IF "$(ZIP9DIR)" != ""
9698 @@-$(GNUCOPY) -p $@ $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
9699 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9700 - $(IFEXIST) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(THEN) \
9701 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) \
9702 - $(FI)
9703 - $(COPY) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $@.$(INPATH)
9704 - $(RM) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
9705 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9706 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(THEN) \
9707 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) \
9708 + $(FI)
9709 + $(COMMAND_ECHO)$(COPY) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $@.$(INPATH)
9710 + $(COMMAND_ECHO)$(RM) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
9711 .ELSE # "$(ZIP9DIR)" != ""
9712 @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9713 - zip $(ZIP9FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9714 - $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9715 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9716 - $(FI)
9717 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP9FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9718 + $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9719 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9720 + $(FI)
9721 @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
9722 @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9723 .ENDIF # "$(ZIP9DIR)" != ""
9724 @@ -1135,17 +1117,17 @@ $(ZIP9TARGETN) : delzip $(ZIP9DEPS)
9725 .ELSE # "$(common_build_zip)"!=""
9726 .IF "$(ZIP9DIR)" != ""
9727 @@-$(GNUCOPY) -p $@ $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
9728 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9729 - $(IFEXIST) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(THEN) \
9730 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) \
9731 - $(FI)
9732 - $(COPY) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $@
9733 - $(RM) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
9734 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP9HELPVAR)_, $(@:db))} $(ZIP9DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP9FLAGS) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(subst,LANGDIR_away/, $(ZIP9LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9735 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $(THEN) \
9736 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) \
9737 + $(FI)
9738 + $(COMMAND_ECHO)$(COPY) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT) $@
9739 + $(COMMAND_ECHO)$(RM) $(ZIP9TMP).$(ZIP9TARGET){$(subst,$(ZIP9HELPVAR),_ $(@:db))}$(ZIP9EXT)
9740 .ELSE # "$(ZIP9DIR)" != ""
9741 - zip $(ZIP9FLAGS) $@ $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9742 - $(IFEXIST) $@ $(THEN) \
9743 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9744 - $(FI)
9745 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP9FLAGS) $@ $(foreach,j,$(ZIP9LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP9TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9746 + $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
9747 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9748 + $(FI)
9749 .ENDIF # "$(ZIP9DIR)" != ""
9750 .ENDIF # "$(common_build_zip)"!=""
9751 .ENDIF
9752 @@ -1210,50 +1192,48 @@ ZIP10HELPVAR=$(BIN)/$(ZIP10TARGET)
9753 .ENDIF # "$(common_build_zip)"!=""
9754
9755 $(ZIP10DEPFILE) :
9756 - echo # > $(MISC)/$(@:f)
9757 + @echo # > $(MISC)/$(@:f)
9758 .IF "$(common_build_zip)"!=""
9759 .IF "$(ZIP10DIR)" != ""
9760 - @echo type 1
9761 - -$(MKDIRHIER) $(ZIP10DIR)
9762 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9763 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP10DIR)
9764 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9765 .ELSE # "$(ZIP10DIR)" != ""
9766 - @echo type 2
9767 - -$(ZIPDEP) $(ZIP10FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9768 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP10FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/))) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP10TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9769 .ENDIF # "$(ZIP10DIR)" != ""
9770 .ELSE # "$(common_build_zip)"!=""
9771 .IF "$(ZIP10DIR)" != ""
9772 - @echo type 3
9773 - -$(MKDIRHIER) $(ZIP10DIR)
9774 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9775 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP10DIR)
9776 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR))) $(command_seperator) $(ZIPDEP) $(ZIP10FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP10DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
9777 .ELSE # "$(ZIP10DIR)" != ""
9778 - @echo type 4
9779 - -$(ZIPDEP) $(ZIP10FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9780 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP10FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP10EXT)/)) $(foreach,j,$(ZIP10LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
9781 .ENDIF # "$(ZIP10DIR)" != ""
9782 .ENDIF # "$(common_build_zip)"!=""
9783 @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
9784
9785
9786 $(ZIP10TARGETN) : delzip $(ZIP10DEPS)
9787 +.IF "$(VERBOSE)" == "TRUE"
9788 @echo ------------------------------
9789 - @echo Making: $@
9790 +.ENDIF
9791 + @echo "Making: " $(@:f)
9792 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
9793 @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
9794 @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
9795 .IF "$(common_build_zip)"!=""
9796 .IF "$(ZIP10DIR)" != ""
9797 @@-$(GNUCOPY) -p $@ $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
9798 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9799 - $(IFEXIST) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(THEN) \
9800 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) \
9801 - $(FI)
9802 - $(COPY) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $@.$(INPATH)
9803 - $(RM) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
9804 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9805 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(THEN) \
9806 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) \
9807 + $(FI)
9808 + $(COMMAND_ECHO)$(COPY) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $@.$(INPATH)
9809 + $(COMMAND_ECHO)$(RM) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
9810 .ELSE # "$(ZIP10DIR)" != ""
9811 @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9812 - zip $(ZIP10FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9813 - $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9814 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9815 - $(FI)
9816 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP10FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9817 + $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
9818 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
9819 + $(FI)
9820 @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
9821 @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
9822 .ENDIF # "$(ZIP10DIR)" != ""
9823 @@ -1263,17 +1243,17 @@ $(ZIP10TARGETN) : delzip $(ZIP10DEPS)
9824 .ELSE # "$(common_build_zip)"!=""
9825 .IF "$(ZIP10DIR)" != ""
9826 @@-$(GNUCOPY) -p $@ $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
9827 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9828 - $(IFEXIST) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(THEN) \
9829 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) \
9830 - $(FI)
9831 - $(COPY) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $@
9832 - $(RM) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
9833 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP10HELPVAR)_, $(@:db))} $(ZIP10DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP10FLAGS) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(subst,LANGDIR_away/, $(ZIP10LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9834 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $(THEN) \
9835 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) \
9836 + $(FI)
9837 + $(COMMAND_ECHO)$(COPY) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT) $@
9838 + $(COMMAND_ECHO)$(RM) $(ZIP10TMP).$(ZIP10TARGET){$(subst,$(ZIP10HELPVAR),_ $(@:db))}$(ZIP10EXT)
9839 .ELSE # "$(ZIP10DIR)" != ""
9840 - zip $(ZIP10FLAGS) $@ $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9841 - $(IFEXIST) $@ $(THEN) \
9842 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9843 - $(FI)
9844 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP10FLAGS) $@ $(foreach,j,$(ZIP10LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP10TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
9845 + $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
9846 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
9847 + $(FI)
9848 .ENDIF # "$(ZIP10DIR)" != ""
9849 .ENDIF # "$(common_build_zip)"!=""
9850 .ENDIF
9851 diff --git solenv/inc/ant.mk solenv/inc/ant.mk
9852 index 6c7d9b2..176a00e 100644
9853 --- solenv/inc/ant.mk
9854 +++ solenv/inc/ant.mk
9855 @@ -58,7 +58,7 @@ CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(ANT_CLASSPATH)$(PATH_SEPERATOR)$(JAVA
9856 # --- TARGETS -----------------------------------------------------
9857
9858 $(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minormkchanged.flg $(SOLARENV)/inc/ant.properties
9859 - @echo Making: $@
9860 + @echo "Making: " $@
9861 @echo solar.build=$(BUILD) > $@
9862 @echo solar.rscversion=$(USQ)$(RSCVERSION)$(USQ) >> $@
9863 @echo solar.rscrevision=$(USQ)$(RSCREVISION)$(USQ) >> $@
9864 diff --git solenv/inc/extension_post.mk solenv/inc/extension_post.mk
9865 index 25dfa76..120fc10 100644
9866 --- solenv/inc/extension_post.mk
9867 +++ solenv/inc/extension_post.mk
9868 @@ -57,20 +57,20 @@ COMPONENT_FILES_SRC*=./
9869 # here in case of "just copied" .xcu files
9870 $(COMPONENT_FILES) : $$(@:s|$(fixme2)|$(MISC)|:s|$(EXTENSIONDIR)/|$(COMPONENT_FILES_SRC)|)
9871 @@-$(MKDIRHIER) $(@:s|$(fixme2)|$(MISC)|:d)
9872 - $(COPY) $< $(@:s|$(fixme2)|$(MISC)|)
9873 + $(COMMAND_ECHO)$(COPY) $< $(@:s|$(fixme2)|$(MISC)|)
9874 .ENDIF # "$(COMPONENT_FILES)"!=""
9875
9876 .IF "$(COMPONENT_JARFILES)"!=""
9877 $(COMPONENT_JARFILES) : $(CLASSDIR)/$$(@:f)
9878 @@-$(MKDIRHIER) $(@:d)
9879 - $(COPY) $< $@
9880 + $(COMMAND_ECHO)$(COPY) $< $@
9881 .ENDIF # "$(COMPONENT_JARFILES)"!=""
9882
9883 .IF "$(COMPONENT_LIBRARIES)"!=""
9884 # TODO(Q3): strip the binary?
9885 $(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@:f)
9886 @@-$(MKDIRHIER) $(@:d)
9887 - $(COPY) $< $@
9888 + $(COMMAND_ECHO)$(COPY) $< $@
9889 .IF "$(OS)$(CPU)"=="WNTI"
9890 .IF "$(COM)"=="GCC"
9891 $(GNUCOPY) $(SOLARBINDIR)/mingwm10.dll $(EXTENSIONDIR)
9892 @@ -129,11 +129,11 @@ PHONYDESC=.PHONY
9893 .IF "$(DESCRIPTION)"!=""
9894 $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
9895 @@-$(MKDIRHIER) $(@:d)
9896 - $(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME)
9897 + $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME)
9898 @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)/$(TARGET)_lang_track.mk
9899 - $(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(MISC)/desc.tmp.$(EXTNAME)
9900 + $(COMMAND_ECHO)$(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ > $(MISC)/desc.tmp.$(EXTNAME)
9901 @@-$(RM) $@.$(EXTNAME)
9902 - $(TYPE) $(MISC)/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
9903 + $(COMMAND_ECHO)$(TYPE) $(MISC)/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
9904 @@-$(RM) $(MISC)/desc.tmp.$(EXTNAME)
9905
9906 .ENDIF # "$(DESCRIPTION)"!=""
9907 @@ -151,7 +151,7 @@ PACKLICDEPS=$(CUSTOM_LICENSE)
9908 .IF "$(PACKLICS)"!=""
9909 $(PACKLICS) : $(PACKLICDEPS)
9910 @@-$(MKDIRHIER) $(@:d)
9911 - $(GNUCOPY) $< $@
9912 + $(COMMAND_ECHO)$(GNUCOPY) $< $@
9913 .ENDIF # "$(PACKLICS)"!=""
9914
9915 .IF "$(COMPONENT_MANIFEST)"!=""
9916 @@ -159,9 +159,9 @@ $(PACKLICS) : $(PACKLICDEPS)
9917 $(COMPONENT_MANIFEST) : $(MANIFEST_SRC) $(MANIFEST_DEPS)
9918 @@-$(MKDIRHIER) $(@:d)
9919 .IF "$(COMPONENT_MANIFEST_GENERIC)" == ""
9920 - $(TYPE) $(MANIFEST_SRC) | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" | $(SED) "s/EXEC_EXTENSION/$(EXECPOST)/" > $@
9921 + $(COMMAND_ECHO)$(TYPE) $(MANIFEST_SRC) | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" | $(SED) "s/EXEC_EXTENSION/$(EXECPOST)/" > $@
9922 .ELSE # "$(COMPONENT_MANIFEST_GENERIC)" != ""
9923 - $(PERL) $(SOLARENV)/bin/makemani.pl $(PRJ)/util/manifest.xml $(EXTENSIONDIR) $(COMPONENT_MANIFEST_SEARCHDIR) $(@:d:d)
9924 + $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/makemani.pl $(PRJ)/util/manifest.xml $(EXTENSIONDIR) $(COMPONENT_MANIFEST_SEARCHDIR) $(@:d:d)
9925 .ENDIF # "$(COMPONENT_MANIFEST_GENERIC)" != ""
9926 .ENDIF # "$(COMPONENT_MANIFEST)"!=""
9927
9928 diff --git solenv/inc/pstrules.mk solenv/inc/pstrules.mk
9929 index aa9813a..b8e2f21 100644
9930 --- solenv/inc/pstrules.mk
9931 +++ solenv/inc/pstrules.mk
9932 @@ -38,40 +38,40 @@
9933
9934 $(OBJ)/$(SECOND_BUILD)_%.obj : %.cxx
9935 @echo ------------------------------
9936 - @echo Making: $@
9937 + @echo "Making: " $@
9938 .IF "$(GUI)"=="UNX"
9939 @$(RM) $@ $(@:s/.obj/.o/)
9940 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
9941 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
9942 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
9943 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
9944 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
9945 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
9946 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
9947 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
9948 .ELSE
9949 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ >& $(NULLDEV) $(FI)
9950 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx
9951 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx
9952 .ENDIF
9953
9954 $(OBJ)/$(SECOND_BUILD)_%.obj : %.c
9955 @echo ------------------------------
9956 - @echo Making: $@
9957 + @echo "Making: " $@
9958 .IF "$(GUI)"=="UNX"
9959 .IF "$(TEST)"!=""
9960 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $*.c
9961 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $*.c
9962 .ELSE
9963 @$(RM) $@ $(@:s/.obj/.o/)
9964 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $*.c
9965 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$(SECOND_BUILD)_$*.o $*.c
9966 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
9967 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
9968 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
9969 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
9970 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
9971 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
9972 .ENDIF
9973 .ELSE
9974 @$(TYPE) $(mktmp $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
9975 @echo.
9976 .IF "$(COM)"=="GCC"
9977 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c
9978 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c
9979 .ELSE
9980 - $(CC) @$(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
9981 + $(COMMAND_ECHO)$(CC) @$(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)\$(SECOND_BUILD)_$*.obj $*.c )
9982 .ENDIF
9983 $(SEMADEBUG)
9984 .ENDIF
9985 @@ -82,40 +82,40 @@ $(OBJ)/$(SECOND_BUILD)_%.obj : %.c
9986
9987 $(SLO)/$(SECOND_BUILD)_%.obj : %.cxx
9988 @echo ------------------------------
9989 - @echo Making: $@
9990 + @echo "Making: " $@
9991 .IF "$(GUI)"=="UNX"
9992 @$(RM) $@ $(@:s/.obj/.o/)
9993 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
9994 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
9995 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
9996 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
9997 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
9998 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
9999 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10000 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10001 .ELSE
10002 @-$(RM) $@
10003 .IF "$(COM)"=="GCC"
10004 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx
10005 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx
10006 .ELSE
10007 - $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx )
10008 + $(COMMAND_ECHO)$(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx )
10009 .ENDIF
10010 .ENDIF
10011
10012 $(SLO)/$(SECOND_BUILD)_%.obj : %.c
10013 @echo ------------------------------
10014 - @echo Making: $@
10015 + @echo "Making: " $@
10016 .IF "$(GUI)"=="UNX"
10017 @$(RM) $@ $(@:s/.obj/.o/)
10018 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $*.c
10019 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$(SECOND_BUILD)_$*.o $*.c
10020 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10021 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10022 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10023 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10024 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10025 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10026 .ELSE
10027 @-$(RM) $@
10028 .IF "$(COM)"=="GCC"
10029 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $*.c
10030 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $*.c
10031 .ELSE
10032 - $(TYPE) $(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $*.c )
10033 - $(CC) @$(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $*.c )
10034 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $*.c )
10035 + $(COMMAND_ECHO)$(CC) @$(mktmp $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$(SECOND_BUILD)_$*.obj $*.c )
10036 .ENDIF
10037 .ENDIF
10038
10039 @@ -179,7 +179,7 @@ REGEXP:='s/^[\#].*//'
10040 $(MISC)/%.exp : sce/%.sce
10041 @@-$(RM) $@
10042 @@-$(RM) $(@:d)$(@:b).tst
10043 - $(TYPE) $< | sed $(REGEXP) | sed "s/^/test_/" > $(@:d)$(@:b).tst
10044 - $(TYPE) $(@:d)$(@:b).tst | sed "/test_./ w $@"
10045 + $(COMMAND_ECHO)$(TYPE) $< | sed $(REGEXP) | sed "s/^/test_/" > $(@:d)$(@:b).tst
10046 + $(COMMAND_ECHO)$(TYPE) $(@:d)$(@:b).tst | sed "/test_./ w $@"
10047
10048 .ENDIF # "$(TESTDIR)"!=""
10049 diff --git solenv/inc/rules.mk solenv/inc/rules.mk
10050 index 17e84d0..3b13bb1 100644
10051 --- solenv/inc/rules.mk
10052 +++ solenv/inc/rules.mk
10053 @@ -32,69 +32,75 @@
10054 MKFILENAME:=RULES.MK
10055
10056 $(OBJ)/%.obj : %.cxx
10057 +.IF "$(VERBOSE)" == "TRUE"
10058 @echo ------------------------------
10059 +.ENDIF
10060 @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
10061 .IF "$(GUI)"=="UNX"
10062 @$(RM) $@ $(@:s/.obj/.o/)
10063 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
10064 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
10065 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10066 .IF "$(noadjust)"==""
10067 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10068 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10069 .ENDIF # "$(noadjust)"==""
10070 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10071 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10072 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10073 .ELSE
10074 @@-$(RM) $@
10075 .IF "$(COM)"=="GCC"
10076 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx
10077 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx
10078 .ELSE
10079 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx
10080 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx
10081 .ENDIF
10082 .ENDIF
10083 .IF "$(nodep)"==""
10084 - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
10085 + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
10086 @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
10087 .ENDIF # "$(nodep)"==""
10088
10089 $(OBJ)/%.obj : %.cpp
10090 +.IF "$(VERBOSE)" == "TRUE"
10091 @echo ------------------------------
10092 +.ENDIF
10093 @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
10094 .IF "$(GUI)"=="UNX"
10095 @$(RM) $@ $(@:s/.obj/.o/)
10096 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
10097 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
10098 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10099 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10100 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10101 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10102 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10103 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10104 .ELSE
10105 @@-$(RM) $@
10106 .IF "$(COM)"=="GCC"
10107 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp
10108 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp
10109 .ELSE
10110 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp
10111 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp
10112 .ENDIF
10113 .ENDIF
10114 .IF "$(nodep)"==""
10115 - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
10116 + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
10117 @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
10118 .ENDIF # "$(nodep)"==""
10119
10120 $(OBJ)/%.obj : %.cc
10121 +.IF "$(VERBOSE)" == "TRUE"
10122 @echo ------------------------------
10123 +.ENDIF
10124 @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
10125 .IF "$(GUI)"=="UNX"
10126 @$(RM) $@ $(@:s/.obj/.o/)
10127 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc
10128 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc
10129 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10130 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10131 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10132 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10133 - +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10134 + @+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10135 .ELSE
10136 @@$(RM) $@
10137 .IF "$(COM)"=="GCC"
10138 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cc
10139 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cc
10140 .ELSE
10141 - $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cc )
10142 + $(COMMAND_ECHO)$(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cc )
10143 .ENDIF
10144 .ENDIF
10145
10146 @@ -113,22 +119,22 @@ $(SLO)/precompiled.% .PHONY:
10147 .IF "$(NETWORK_BUILD)"!=""
10148 -$(MKDIRHIER) $(PCHOUTDIR)
10149 .IF "$(HAVE_BIG_TMP)"==""
10150 - -$(COPY) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
10151 + $(COMMAND_ECHO)-$(COPY) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
10152 .ENDIF # "$(HAVE_BIG_TMP)"==""
10153 .ENDIF # "$(NETWORK_BUILD)"!=""
10154 - $(CXX) @$(mktmp -Fp$(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
10155 + $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
10156 .IF "$(NETWORK_BUILD)"!=""
10157 - $(COPY) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST)
10158 + $(COMMAND_ECHO)$(COPY) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST)
10159 .IF "$(HAVE_BIG_TMP)"==""
10160 - $(RM) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
10161 - $(RMDIR) $(PCHOUTDIR)
10162 + $(COMMAND_ECHO)$(RM) $(PCHOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
10163 + $(COMMAND_ECHO)$(RMDIR) $(PCHOUTDIR)
10164 .ENDIF # "$(HAVE_BIG_TMP)"==""
10165 .ENDIF # "$(NETWORK_BUILD)"!=""
10166 .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
10167 - $(CXX) -o$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
10168 + $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
10169 @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch/precompiled_$(PRJNAME).hxx
10170 .ELSE # "$(COM)"=="MSC"
10171 - $(TOUCH) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST)
10172 + @$(TOUCH) $(SLO)/pch/precompiled_$(PRJNAME).hxx$(PCHPOST)
10173 .ENDIF # "$(COM)"=="MSC"
10174 @echo USED_PCHFLAGS=$(CFLAGS)$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGS_NO_EXCEPTIONS) -DEXCEPTIONS_OFF$(CFLAGSAPPEND)> $(INCCOM)/pch.mk
10175
10176 @@ -138,22 +144,22 @@ $(SLO)/precompiled_ex.% .PHONY:
10177 .IF "$(NETWORK_BUILD)"!=""
10178 -$(MKDIRHIER) $(PCHEXOUTDIR)
10179 .IF "$(HAVE_BIG_TMP)"==""
10180 - -$(COPY) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
10181 + $(COMMAND_ECHO)-$(COPY) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
10182 .ENDIF # "$(HAVE_BIG_TMP)"==""
10183 .ENDIF # "$(NETWORK_BUILD)"!=""
10184 - $(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
10185 + $(COMMAND_ECHO)$(CXX) @$(mktmp -Fp$(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH:s/pchname/pchname_ex/) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).cxx)
10186 .IF "$(NETWORK_BUILD)"!=""
10187 - $(COPY) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST)
10188 + $(COMMAND_ECHO)$(COPY) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST)
10189 .IF "$(HAVE_BIG_TMP)"==""
10190 - $(RM) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
10191 - $(RMDIR) $(PCHEXOUTDIR)
10192 + $(COMMAND_ECHO)$(RM) $(PCHEXOUTDIR)/precompiled_$(PRJNAME).hxx$(PCHPOST)
10193 + $(COMMAND_ECHO)$(RMDIR) $(PCHEXOUTDIR)
10194 .ENDIF # "$(HAVE_BIG_TMP)"==""
10195 .ENDIF # "$(NETWORK_BUILD)"!=""
10196 .ELIF "$(COM)"=="GCC" && "$(CCNUMVER)">="000300040000"
10197 - $(CXX) -o$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
10198 + $(COMMAND_ECHO)$(CXX) -o$(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST) $(CFLAGS_CREATE_PCH) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON $(CFLAGSAPPEND) $(INCPCH)/precompiled_$(PRJNAME).hxx
10199 @echo "#error Tried to use wrong precompiled header" > $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx
10200 .ELSE # "$(COM)"=="MSC"
10201 - $(TOUCH) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST)
10202 + @$(TOUCH) $(SLO)/pch_ex/precompiled_$(PRJNAME).hxx$(PCHPOST)
10203 .ENDIF # "$(COM)"=="MSC"
10204 @echo USED_EXCEPTIONS_PCHFLAGS=$(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON$(CFLAGSAPPEND)> $(INCCOM)/pch_ex.mk
10205
10206 @@ -162,7 +168,9 @@ $(SLO)/precompiled_ex.% .PHONY:
10207 .ENDIF # "$(ENABLE_PCH)"!=""
10208
10209 $(SLO)/%.obj : %.cxx
10210 +.IF "$(VERBOSE)" == "TRUE"
10211 @echo ------------------------------
10212 +.ENDIF
10213 @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
10214 .IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" )
10215 # just a helper var
10216 @@ -178,237 +186,256 @@ $(SLO)/%.obj : %.cxx
10217 .ENDIF # "$(ENABLE_PCH)"!=""
10218 .IF "$(GUI)"=="UNX"
10219 .IF "$(TEST)"!=""
10220 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E $(CFLAGSINCXX)$(PWD)/$*.cxx
10221 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E $(CFLAGSINCXX)$(PWD)/$*.cxx
10222 .ELSE
10223 @$(RM) $@ $(@:s/.obj/.o/)
10224 - $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
10225 + $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
10226 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"=="" && "$(CAPTURE_COMMAND)"==""
10227 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10228 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10229 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10230 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10231 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10232 .ENDIF
10233 .ELSE # "$(GUI)"=="UNX"
10234 @@-$(RM) $@
10235 .IF "$(COM)"=="GCC"
10236 - $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
10237 + $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
10238 .ELSE
10239 - $(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
10240 + $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX) $(ACT_PCH_SWITCHES) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
10241 .ENDIF # "$(COM)"=="GCC"
10242 .ENDIF # "$(GUI)"=="UNX"
10243 .IF "$(nodep)"==""
10244 # fixme: write to file
10245 - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
10246 + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
10247 @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
10248 .ENDIF # "$(nodep)"==""
10249
10250 $(SLO)/%.obj : %.cpp
10251 +.IF "$(VERBOSE)" == "TRUE"
10252 @echo ------------------------------
10253 - @echo Making: $@
10254 +.ENDIF
10255 + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
10256 .IF "$(GUI)"=="UNX"
10257 .IF "$(TEST)"!=""
10258 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(PWD)/$*.cpp
10259 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(PWD)/$*.cpp
10260 .ELSE
10261 @$(RM) $@ $(@:s/.obj/.o/)
10262 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
10263 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
10264 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10265 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10266 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10267 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10268 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10269 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10270 .ENDIF
10271 .ELSE
10272 @@-$(RM) $@
10273 .IF "$(COM)"=="GCC"
10274 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp
10275 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp
10276 .ELSE
10277 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp
10278 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp
10279 .ENDIF
10280 .ENDIF
10281 .IF "$(nodep)"==""
10282 - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
10283 + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
10284 @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
10285 .ENDIF # "$(nodep)"==""
10286
10287 $(SLO)/%.obj : $(MISC)/%.cxx
10288 +.IF "$(VERBOSE)" == "TRUE"
10289 @echo ------------------------------
10290 - @echo Making: $@
10291 +.ENDIF
10292 + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
10293 .IF "$(GUI)"=="UNX"
10294 .IF "$(TEST)"!=""
10295 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx
10296 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx
10297 .ELSE
10298 @$(RM) $@ $(@:s/.obj/.o/)
10299 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx
10300 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx
10301 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10302 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10303 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10304 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10305 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10306 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10307 .ENDIF
10308 .ELSE
10309 .IF "$(COM)"=="GCC"
10310 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
10311 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
10312 .ELSE
10313 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
10314 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
10315 .ENDIF
10316 .ENDIF
10317 .IF "$(nodep)"==""
10318 - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $@ ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
10319 + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $@ ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
10320 @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
10321 .ENDIF # "$(nodep)"==""
10322
10323 $(SLO)/%.obj : $(MISC)/%.cc
10324 +.IF "$(VERBOSE)" == "TRUE"
10325 @echo ------------------------------
10326 - @echo Making: $@
10327 +.ENDIF
10328 + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
10329 .IF "$(GUI)"=="UNX"
10330 .IF "$(TEST)"!=""
10331 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cc
10332 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cc
10333 .ELSE
10334 @$(RM) $@ $(@:s/.obj/.o/)
10335 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cc
10336 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cc
10337 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10338 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10339 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10340 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10341 - +$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10342 + @+$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10343 .ENDIF
10344 .ELSE
10345 - $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cc )
10346 + $(COMMAND_ECHO)$(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cc )
10347 .ENDIF
10348
10349 $(OBJ)/%.obj : $(MISC)/%.cxx
10350 +.IF "$(VERBOSE)" == "TRUE"
10351 @echo ------------------------------
10352 - @echo Making: $@
10353 +.ENDIF
10354 + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
10355 .IF "$(GUI)"=="UNX"
10356 .IF "$(TEST)"!=""
10357 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx
10358 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E $(CFLAGSINCXX)$(MISC)/$*.cxx
10359 .ELSE
10360 @$(RM) $@ $(@:s/.obj/.o/)
10361 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx
10362 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(MISC)/$*.cxx
10363 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10364 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10365 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10366 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10367 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10368 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10369 .ENDIF
10370 .ELSE
10371 .IF "$(COM)"=="GCC"
10372 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
10373 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
10374 .ELSE
10375 - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
10376 + $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(CFLAGSINCXX)$(MISC)/$*.cxx
10377 .ENDIF
10378 .ENDIF
10379 .IF "$(nodep)"==""
10380 - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
10381 + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
10382 @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
10383 .ENDIF # "$(nodep)"==""
10384
10385 $(OBJ)/%.obj : %.c
10386 +.IF "$(VERBOSE)" == "TRUE"
10387 @echo ------------------------------
10388 - @echo Making: $@
10389 +.ENDIF
10390 + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
10391 .IF "$(GUI)"=="UNX"
10392 .IF "$(TEST)"!=""
10393 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c
10394 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c
10395 .ELSE
10396 @$(RM) $@ $(@:s/.obj/.o/)
10397 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c
10398 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c
10399 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10400 .IF "$(noadjust)"==""
10401 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10402 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10403 .ENDIF # "$(noadjust)"==""
10404 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10405 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10406 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10407 .ENDIF
10408 .ELSE
10409 .IF "$(COM)"=="GCC"
10410 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c
10411 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c
10412 .ELSE
10413 + .IF "$(VERBOSE)" == "TRUE"
10414 -@echo Cflags: $(CFLAGS) $(INCLUDE)
10415 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c
10416 + .ENDIF
10417 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $*.c
10418 .ENDIF
10419 .ENDIF
10420 .IF "$(nodep)"==""
10421 - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
10422 + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
10423 @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
10424 .ENDIF # "$(nodep)"==""
10425
10426 $(OBJ)/%.obj : $(MISC)/%.c
10427 +.IF "$(VERBOSE)" == "TRUE"
10428 @echo ------------------------------
10429 - @echo Making: $@
10430 +.ENDIF
10431 + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
10432 .IF "$(GUI)"=="UNX"
10433 @$(RM) $@ $(@:s/.obj/.o/)
10434 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c
10435 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c
10436 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10437 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10438 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10439 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10440 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10441 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10442 .ELSE
10443 @@-$(RM) $@
10444 .IF "$(COM)"=="GCC"
10445 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(MISC)/$*.c
10446 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(MISC)/$*.c
10447 .ELSE
10448 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(MISC)/$*.c
10449 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(OBJ)/$*.obj $(MISC)/$*.c
10450 .ENDIF
10451 .ENDIF
10452 .IF "$(nodep)"==""
10453 - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
10454 + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
10455 @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
10456 .ENDIF # "$(nodep)"==""
10457
10458 $(SLO)/%.obj : $(MISC)/%.c
10459 +.IF "$(VERBOSE)" == "TRUE"
10460 @echo ------------------------------
10461 - @echo Making: $@
10462 +.ENDIF
10463 + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
10464 .IF "$(GUI)"=="UNX"
10465 @$(RM) $@ $(@:s/.obj/.o/)
10466 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c
10467 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c
10468 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10469 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10470 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10471 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10472 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10473 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10474 .ELSE
10475 @@-$(RM) $@
10476 .IF "$(COM)"=="GCC"
10477 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(MISC)/$*.c
10478 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(MISC)/$*.c
10479 .ELSE
10480 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(MISC)/$*.c
10481 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $(MISC)/$*.c
10482 .ENDIF
10483 .ENDIF
10484 .IF "$(nodep)"==""
10485 - $(TYPE) $(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< )
10486 - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
10487 + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
10488 # avoid _version objects (see tg_shl.mk) - quite hacky...
10489 @noop $(!eq,$@,$(@:s/_version.obj/.obj/) $(NULL) $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/)))
10490 .ENDIF # "$(nodep)"==""
10491
10492 $(SLO)/%.obj : %.c
10493 +.IF "$(VERBOSE)" == "TRUE"
10494 @echo ------------------------------
10495 - @echo Making: $@
10496 +.ENDIF
10497 + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
10498 .IF "$(GUI)"=="UNX"
10499 @$(RM) $@ $(@:s/.obj/.o/)
10500 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c
10501 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c
10502 .IF "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10503 - $(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10504 + $(COMMAND_ECHO)$(ADJUSTVISIBILITY) -p $(@:s/.obj/.o/)
10505 .ENDIF # "$(OS)"=="SOLARIS" && "$(product)"=="full" && "$(debug)"==""
10506 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10507 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10508 .ELSE
10509 @@-$(RM) $@
10510 .IF "$(COM)"=="GCC"
10511 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $*.c
10512 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $*.c
10513 .ELSE
10514 - $(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $*.c
10515 + $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)/$*.obj $*.c
10516 .ENDIF
10517 .ENDIF
10518 .IF "$(nodep)"==""
10519 - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
10520 + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
10521 @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
10522 .ENDIF # "$(nodep)"==""
10523
10524 # Objective-C files
10525 $(OBJ)/%.obj : %.m
10526 +.IF "$(VERBOSE)" == "TRUE"
10527 @echo ------------------------------
10528 - @echo Making: $@
10529 +.ENDIF
10530 + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
10531 .IF "$(OS)"=="MACOSX"
10532 .IF "$(TEST)"!=""
10533 - $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m
10534 + $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m
10535 .ELSE
10536 @$(RM) $@ $(@:s/.obj/.o/)
10537 - $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m
10538 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10539 + $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m
10540 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10541 .ENDIF
10542 .ELSE # "$(OS)"=="MACOSX"
10543 @echo "No recipe for compiling Objective-C files is available for this platform"
10544 @@ -416,36 +443,42 @@ $(OBJ)/%.obj : %.m
10545
10546 # Objective-C files
10547 $(OBJ)/%.obj : $(MISC)/%.m
10548 +.IF "$(VERBOSE)" == "TRUE"
10549 @echo ------------------------------
10550 - @echo Making: $@
10551 +.ENDIF
10552 + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
10553 .IF "$(OS)"=="MACOSX"
10554 @$(RM) $@ $(@:s/.obj/.o/)
10555 - $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m
10556 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10557 + $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m
10558 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10559 .ELSE # "$(OS)"=="MACOSX"
10560 @echo "No recipe for compiling Objective-C files is available for this platform"
10561 .ENDIF "$(OS)"=="MACOSX"
10562
10563 # Objective-C files
10564 $(SLO)/%.obj : $(MISC)/%.m
10565 +.IF "$(VERBOSE)" == "TRUE"
10566 @echo ------------------------------
10567 - @echo Making: $@
10568 +.ENDIF
10569 + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
10570 .IF "$(OS)"=="MACOSX"
10571 @$(RM) $@ $(@:s/.obj/.o/)
10572 - $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m
10573 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10574 + $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m
10575 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10576 .ELSE # "$(OS)"=="MACOSX"
10577 @echo "No recipe for compiling Objective-C files is available for this platform"
10578 .ENDIF "$(OS)"=="MACOSX"
10579
10580 # Objective-C files
10581 $(SLO)/%.obj : %.m
10582 +.IF "$(VERBOSE)" == "TRUE"
10583 @echo ------------------------------
10584 - @echo Making: $@
10585 +.ENDIF
10586 + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
10587 .IF "$(OS)"=="MACOSX"
10588 @$(RM) $@ $(@:s/.obj/.o/)
10589 - $(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.m
10590 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10591 + $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.m
10592 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10593 .ELSE # "$(OS)"=="MACOSX"
10594 @echo "No recipe for compiling Objective-C files is available for this platform"
10595 .ENDIF "$(OS)"=="MACOSX"
10596 @@ -457,18 +490,20 @@ not_existing/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<)
10597
10598 # Objective-C++ files
10599 $(OBJ)/%.obj : %.mm
10600 +.IF "$(VERBOSE)" == "TRUE"
10601 @echo ------------------------------
10602 - @echo Making: $@
10603 +.ENDIF
10604 + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
10605 .IF "$(OS)"=="MACOSX"
10606 .IF "$(TEST)"!=""
10607 - $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm
10608 + $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm
10609 .ELSE
10610 @$(RM) $@ $(@:s/.obj/.o/)
10611 - $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm
10612 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10613 + $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm
10614 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10615 .ENDIF
10616 .IF "$(nodep)"==""
10617 - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
10618 + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
10619 @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
10620 .ENDIF # "$(nodep)"==""
10621 .ELSE # "$(OS)"=="MACOSX"
10622 @@ -477,14 +512,16 @@ $(OBJ)/%.obj : %.mm
10623
10624 # Objective-C++ files
10625 $(OBJ)/%.obj : $(MISC)/%.mm
10626 +.IF "$(VERBOSE)" == "TRUE"
10627 @echo ------------------------------
10628 - @echo Making: $@
10629 +.ENDIF
10630 + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
10631 .IF "$(OS)"=="MACOSX"
10632 @$(RM) $@ $(@:s/.obj/.o/)
10633 - $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm
10634 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10635 + $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm
10636 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10637 .IF "$(nodep)"==""
10638 - $(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
10639 + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< ) > $(MISC)/o_$(@:f:s/.obj/.dpcc/)
10640 @noop $(assign DEPS_MADE+:=o_$(@:f:s/.obj/.dpcc/))
10641 .ENDIF # "$(nodep)"==""
10642 .ELSE # "$(OS)"=="MACOSX"
10643 @@ -493,14 +530,16 @@ $(OBJ)/%.obj : $(MISC)/%.mm
10644
10645 # Objective-C++ files
10646 $(SLO)/%.obj : $(MISC)/%.mm
10647 +.IF "$(VERBOSE)" == "TRUE"
10648 @echo ------------------------------
10649 - @echo Making: $@
10650 +.ENDIF
10651 + @echo Compiling: $(PRJNAME)/$(OUTPATH)/misc/$(<:f)
10652 .IF "$(OS)"=="MACOSX"
10653 @$(RM) $@ $(@:s/.obj/.o/)
10654 - $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm
10655 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10656 + $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm
10657 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10658 .IF "$(nodep)"==""
10659 - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
10660 + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
10661 @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
10662 .ENDIF # "$(nodep)"==""
10663 .ELSE # "$(OS)"=="MACOSX"
10664 @@ -509,14 +548,16 @@ $(SLO)/%.obj : $(MISC)/%.mm
10665
10666 # Objective-C++ files
10667 $(SLO)/%.obj : %.mm
10668 +.IF "$(VERBOSE)" == "TRUE"
10669 @echo ------------------------------
10670 - @echo Making: $@
10671 +.ENDIF
10672 + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
10673 .IF "$(OS)"=="MACOSX"
10674 @$(RM) $@ $(@:s/.obj/.o/)
10675 - $(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.mm
10676 - $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10677 + $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.mm
10678 + @$(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI)
10679 .IF "$(nodep)"==""
10680 - $(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
10681 + $(COMMAND_ECHO)$(MAKEDEPEND) @$(mktmp -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< ) > $(MISC)/s_$(@:f:s/.obj/.dpcc/)
10682 @noop $(assign DEPS_MADE+:=s_$(@:f:s/.obj/.dpcc/))
10683 .ENDIF # "$(nodep)"==""
10684 .ELSE # "$(OS)"=="MACOSX"
10685 @@ -524,7 +565,7 @@ $(SLO)/%.obj : %.mm
10686 .ENDIF # "$(OS)"=="MACOSX"
10687
10688 $(MISC)/%.dpslo :
10689 - @echo making .dpslo
10690 + @echo "Making: " $(@:f)
10691 @@$(RM) $@
10692 @@-$(CDD) $(MISC) && $(!null,$(all_local_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_slo:b:+".dpcc") s_$(i)) > $(@:f)
10693 @@-$(CDD) $(MISC) && $(!null,$(all_misc_slo) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_slo:b:+".dpcc") s_$(i)) >> $(@:f)
10694 @@ -532,7 +573,7 @@ $(MISC)/%.dpslo :
10695 @$(TYPE) $(mktmp $(TARGET)_known_dpcc+=$(all_local_slo:b:+".dpcc":^"s_") $(all_misc_slo:b:+".dpcc":^"s_")) >> $@
10696
10697 $(MISC)/%.dpobj :
10698 - @echo making .dpobj
10699 + @echo "Making: " $(@:f)
10700 @@$(RM) $@
10701 @@-$(CDD) $(MISC) && $(!null,$(all_local_obj) $(TYPE:s/+//) echo #) $(foreach,i,$(all_local_obj:b:+".dpcc") o_$(i)) > $(@:f)
10702 @@-$(CDD) $(MISC) && $(!null,$(all_misc_obj) $(TYPE:s/+//) echo #) $(foreach,i,$(all_misc_obj:b:+".dpcc") o_$(i)) >> $(@:f)
10703 @@ -562,29 +603,29 @@ not_existing/o_%.dpcc : $(MISC)/%.mm;@noop $(assign all_misc_obj+:=$<)
10704
10705 $(MISC)/s_%.dpcc : %.m
10706 @@-$(RM) $@
10707 - @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
10708 + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
10709 @echo $@ : $(SLO)/$(<:b).obj >> $@
10710
10711 $(MISC)/o_%.dpcc : %.m
10712 @@-$(RM) $@
10713 - @$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< > $@
10714 + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< > $@
10715 @echo $@ : $(OBJ)/$(<:b).obj >> $@
10716
10717 $(MISC)/s_%.dpcc : $(MISC)/%.m
10718 @@-$(RM) $@
10719 .IF "$(GUI)"=="UNX"
10720 - @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
10721 + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
10722 .ELSE # "$(GUI)"=="UNX"
10723 - @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
10724 + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
10725 .ENDIF # "$(GUI)"=="UNX"
10726 @echo $@ : $(SLO)/$(<:b).obj >> $@
10727
10728 $(MISC)/o_%.dpcc : $(MISC)/%.m
10729 @@-$(RM) $@
10730 .IF "$(GUI)"=="UNX"
10731 - @$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
10732 + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | sed s\#$(MISC)/\#\# > $@
10733 .ELSE # "$(GUI)"=="UNX"
10734 - @$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
10735 + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(OBJ) $(MKDEPFLAGS) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $< | $(SED) s/$(MISC:s/\/\\/)\\// > $@
10736 .ENDIF # "$(GUI)"=="UNX"
10737 @echo $@ : $(OBJ)/$(<:b).obj >> $@
10738
10739 @@ -592,7 +633,7 @@ $(MISC)/o_%.dpcc : $(MISC)/%.m
10740
10741 $(MISC)/s_%.dpcc : %.s
10742 @@-$(RM) $@
10743 - @$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
10744 + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(SLO) $(MKDEPFLAGS) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $< > $@
10745 @echo $@ : $(SLO)/$(<:b).obj >> $@
10746
10747 $(MISC)/s_%.dpcc : $(SLO)/%.obj
10748 @@ -606,7 +647,7 @@ $(MISC)/o_%.dpcc : $(OBJ)/%.obj
10749 $(MISC)/%.dpsc :
10750 @@-$(RM) $@
10751 @@-$(MKDIR) $(MISC)/{$(subst,$(@:d:d:d), $(@:d:d))}
10752 - @$(MAKEDEPEND) -f - -p$(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))} -o.par -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(*:b).scp > $@
10753 + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))} -o.par -D{$(subst,$(@:d:d:d:u), $(@:d:d:u))}_PRODUCT $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) $(*:b).scp > $@
10754 @echo $@ : $(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).par >> $@
10755 @echo $(PAR)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).par : $(*:b).scp >> $@
10756
10757 @@ -614,34 +655,42 @@ $(MISC)/%.dpsc :
10758
10759 $(MISC)/%.dprc :
10760 @@-$(RM) $@
10761 - @$(MAKEDEPEND) -f - -p$(RES) -o.res $(RCLANGFLAGS_{$(subst,$(@:d:d:d:u), $(@:d:d:u))}:u:s/ //) $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) -I$(SOLARENV)/inc $(*:b).rc >> $@
10762 + $(COMMAND_ECHO)$(MAKEDEPEND) -f - -p$(RES) -o.res $(RCLANGFLAGS_{$(subst,$(@:d:d:d:u), $(@:d:d:u))}:u:s/ //) $(CDEFS) -DDLLPOSTFIX=$(DLLPOSTFIX) -I. -I$(INC) -I$(INCLOCAL) -I$(INCGUI) -I$(INCCOM) -I$(SOLARENV)/inc $(*:b).rc >> $@
10763 # @echo $@ : $(RES)/{$(subst,$(@:d:d:d), $(@:d:d))}/$(*:b).res >> $@
10764 @echo $@ : $(RES)/$(*:b).res >> $@
10765
10766 $(MISC)/%.dpr :
10767 +.IF "$(VERBOSE)" == "TRUE"
10768 @echo ------------------------------
10769 +.ELSE
10770 + @echo > /dev/null
10771 +.ENDIF
10772 .IF "$(nodep)"==""
10773 - @echo Making: $@
10774 + @echo "Making: " $(@:f)
10775 @@-$(RM) $@
10776 - dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) NO_HIDS=true make_srs_deps=true $(DEPSRSFILES)
10777 - -$(TYPE) $(MISC)/$(TARGET).*.dprr >> $@
10778 + $(COMMAND_ECHO)dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) NO_HIDS=true make_srs_deps=true $(DEPSRSFILES)
10779 + $(COMMAND_ECHO)-$(TYPE) $(MISC)/$(TARGET).*.dprr >> $@
10780 .ENDIF # "$(nodep)"==""
10781
10782 $(MISC)/%.dpz :
10783 - @echo ------------------------------
10784 +.IF "$(VERBOSE)" == "TRUE"
10785 + @echo ------------------------------
10786 +.ELSE
10787 + @echo > /dev/null
10788 +.ENDIF
10789 .IF "$(nodep)"==""
10790 - @echo Making: $@
10791 + @echo "Making: " $(@:f)
10792 @@-$(RM) $@
10793 - dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_zip_deps=true $(ZIPDEPFILES)
10794 - $(TYPE) $(ZIPDEPFILES) $(mktmp $(NULL)) | grep -v "CVS" | grep -v "\.svn" >> $@
10795 - echo zipdep_langs=$(alllangiso) >> $@
10796 + $(COMMAND_ECHO)dmake $(MFLAGS) $(MAKEFILE) $(CALLMACROS) make_zip_deps=true $(ZIPDEPFILES)
10797 + $(COMMAND_ECHO)$(TYPE) $(ZIPDEPFILES) $(mktmp $(NULL)) | grep -v "CVS" | grep -v "\.svn" >> $@
10798 + @echo zipdep_langs=$(alllangiso) >> $@
10799 @@-$(RM) $(ZIPDEPFILES)
10800 .ENDIF # "$(nodep)"==""
10801
10802 # Dependencies fuer java - Files
10803
10804 $(MISC)/%.dpj :
10805 - @echo Making dpj...
10806 + @echo "Making: " $(@:f)
10807 .IF "$(nodep)"!=""
10808 .IF "$(GUI)"=="UNX"
10809 @echo > $@
10810 @@ -658,52 +707,56 @@ $(MISC)/%.dpj :
10811 .ENDIF # "$(nodep)"==""
10812
10813 $(SLO)/%.obj : %.asm
10814 +.IF "$(VERBOSE)" == "TRUE"
10815 @echo ------------------------------
10816 - @echo Making: $@
10817 +.ENDIF
10818 + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
10819 .IF "$(COM)"=="GCC"
10820 .IF "$(ASM)"=="ml"
10821 - $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
10822 + $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
10823 @@-$(RM) $*.err
10824 .ELSE # "$(ASM)"=="ml"
10825 @@-$(RM) $@
10826 - $(ASM) $(AFLAGS) $*.asm,$(SLO)/$*.obj;
10827 + $(COMMAND_ECHO)$(ASM) $(AFLAGS) $*.asm,$(SLO)/$*.obj;
10828 .ENDIF # "$(ASM)"=="ml"
10829 .ELSE
10830 .IF "$(COM)"=="WTC"
10831 - $(ASM) $(AFLAGS) -D$(COM) $*.asm -fo=$(SLO)/$*.obj
10832 - -$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
10833 + $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) $*.asm -fo=$(SLO)/$*.obj
10834 + @-$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
10835 .ELSE
10836 .IF "$(COM)"=="MSC"
10837 .IF "$(ASM)"=="ml"
10838 - $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
10839 - -$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
10840 + $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
10841 + @-$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
10842 .ELSE # "$(ASM)"=="ml"
10843 @@-$(RM) $@
10844 - $(ASM) $(AFLAGS) $*.asm,$(SLO)/$*.obj;
10845 + $(COMMAND_ECHO)$(ASM) $(AFLAGS) $*.asm,$(SLO)/$*.obj;
10846 .ENDIF # "$(ASM)"=="ml"
10847 .ENDIF "$(COM)"=="MSC"
10848 .ENDIF
10849 .ENDIF
10850
10851 $(OBJ)/%.obj : %.asm
10852 +.IF "$(VERBOSE)" == "TRUE"
10853 @echo ------------------------------
10854 - @echo Making: $@
10855 +.ENDIF
10856 + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
10857 .IF "$(COM)"=="GCC"
10858 .IF "$(ASM)"=="ml"
10859 - $(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)/$*.obj $*.asm
10860 + $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)/$*.obj $*.asm
10861 @@-$(RM) $*.err
10862 .ELSE # "$(ASM)"=="ml"
10863 @@-$(RM) $@
10864 - $(ASM) $(AFLAGS) $*.asm,$(OBJ)/$*.obj;
10865 + $(COMMAND_ECHO)$(ASM) $(AFLAGS) $*.asm,$(OBJ)/$*.obj;
10866 .ENDIF # "$(ASM)"=="ml"
10867 .ELSE
10868 .IF "$(COM)"=="MSC"
10869 .IF "$(ASM)"=="ml"
10870 - $(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
10871 - -$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
10872 + $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
10873 + @-$(IFEXIST) $*.err $(THEN) $(RM:s/+//) $*.err $(FI)
10874 .ELSE # "$(ASM)"=="ml"
10875 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ >& $(NULLDEV) $(FI)
10876 - $(ASM) $(AFLAGS) $*.asm,$(OBJ)/$*.obj;
10877 + $(COMMAND_ECHO)$(ASM) $(AFLAGS) $*.asm,$(OBJ)/$*.obj;
10878 .ENDIF # "$(ASM)"=="ml"
10879 .ENDIF "$(COM)"=="MSC"
10880 .ENDIF
10881 @@ -716,18 +769,20 @@ $(OUT)/ucrdoc/$(IDLPACKAGE)/%.urd : %.idl
10882
10883 # generate hid files
10884 $(SRS)/%.hid : %.src
10885 - @echo ------------------------------
10886 - @echo Making hid $@
10887 - $(AUGMENT_LIBRARY_PATH) $(PERL) $(SOLARENV)/bin/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE)
10888 +.IF "$(VERBOSE)" == "TRUE"
10889 + @echo ------------------------------
10890 +.ENDIF
10891 + @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(*:f).src
10892 + $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(PERL) $(SOLARENV)/bin/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE)
10893
10894 # make *.xml descriptions available in $(MISC)
10895 $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml : %.xml
10896 - $(COPY) $< $@
10897 + $(COMMAND_ECHO)$(COPY) $< $@
10898
10899 # dummy rule to make sure xml file is in place when used in settings.mk
10900 $(MISC)/%.mk : $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml
10901 - $(TOUCH) $@
10902 - echo XML2MK_FILES += $(@:b) >> $@
10903 + @$(TOUCH) $@
10904 + @echo XML2MK_FILES += $(@:b) >> $@
10905
10906 #generate descriptions from xml
10907 $(MISC)/%$($(WINVERSIONNAMES)_MAJOR)_description.cxx : $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml
10908 @@ -735,7 +790,7 @@ $(MISC)/%$($(WINVERSIONNAMES)_MAJOR)_description.cxx : $(MISC)/%$($(WINVERSIONNA
10909
10910 #generate private rdb
10911 $(BIN)/%.rdb: $(MISC)/%$($(WINVERSIONNAMES)_MAJOR).xml
10912 - $(RDBMAKER) -BUCR -O$(BIN)/$*.rdb @$(mktmp $(foreach,i,$($(@:b)_XML2CMPTYPES) -T$i ) $(COMPRDB))
10913 + $(COMMAND_ECHO)$(RDBMAKER) -BUCR -O$(BIN)/$*.rdb @$(mktmp $(foreach,i,$($(@:b)_XML2CMPTYPES) -T$i ) $(COMPRDB))
10914
10915 #strip dos lineends
10916 $(MISC)/%.sh : %.sh
10917 @@ -745,26 +800,27 @@ $(MISC)/%.sh : %.sh
10918 # merge targets
10919 .IF "$(WITH_LANG)"!=""
10920 $(COMMONMISC)/$(TARGET)/%.ulf : %.ulf
10921 - -$(MKDIR) $(@:d)
10922 - -$(RM) $@
10923 - $(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
10924 - $(RENAME) $@.$(INPATH) $@
10925 - -$(RM) $@.$(INPATH)
10926 + @echo "Making: " $(@:f)
10927 + $(COMMAND_ECHO)-$(MKDIR) $(@:d)
10928 + $(COMMAND_ECHO)-$(RM) $@
10929 + $(COMMAND_ECHO)$(ULFEX) $(ULFEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
10930 + $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
10931 + $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
10932
10933 $(COMMONMISC)/$(TARGET)/%.xrb : %.xrb
10934 - -$(MKDIR) $(@:d)
10935 - -$(RM) $@
10936 - $(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
10937 - $(RENAME) $@.$(INPATH) $@
10938 - -$(RM) $@.$(INPATH)
10939 + $(COMMAND_ECHO)-$(MKDIR) $(@:d)
10940 + $(COMMAND_ECHO)-$(RM) $@
10941 + $(COMMAND_ECHO)$(XMLEX) -t xrb -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
10942 + $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
10943 + $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
10944
10945 $(COMMONMISC)/$(MYPATH)/%.xrm : %.xrm
10946 - -$(MKDIRHIER) $(@:d)
10947 - -$(RM) $@
10948 - echo trysdf = $(TRYSDF)
10949 - $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
10950 - $(RENAME) $@.$(INPATH) $@
10951 - -$(RM) $@.$(INPATH)
10952 + $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
10953 + $(COMMAND_ECHO)-$(RM) $@
10954 + @echo trysdf = $(TRYSDF)
10955 + $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
10956 + $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
10957 + $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
10958
10959 #$(COMMONMISC)/$(TARGET)/%.xrm : %.xrm
10960 # -$(MKDIRHIER) $(@:d)
10961 @@ -787,10 +843,10 @@ $(COMMONMISC)/$(TARGET)/%.jlf : $$(@:db).ulf
10962 $(COMMONMISC)/$(TARGET)/%.jlf : $$(@:b).ulf
10963 .ENDIF # "$(WITH_LANG)"!=""
10964 @-$(MKDIRHIER) $(@:d)
10965 - -$(RM) $@
10966 - $(ULFCONV) -o $@.$(INPATH) $<
10967 - $(RENAME) $@.$(INPATH) $@
10968 - -$(RM) $@.$(INPATH)
10969 + $(COMMAND_ECHO)-$(RM) $@
10970 + $(COMMAND_ECHO)$(ULFCONV) -o $@.$(INPATH) $<
10971 + $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
10972 + $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
10973
10974 .IF "$(WITH_LANG)"!=""
10975 $(COMMONMISC)/$(TARGET)/%.mlf : $$(@:db).ulf
10976 @@ -798,7 +854,7 @@ $(COMMONMISC)/$(TARGET)/%.mlf : $$(@:db).ulf
10977 $(COMMONMISC)/$(TARGET)/%.mlf : $$(@:b).ulf
10978 .ENDIF # "$(WITH_LANG)"!=""
10979 @-$(MKDIRHIER) $(@:d)
10980 - -$(RM) $@
10981 + @-$(RM) $@
10982 @$(ULFCONV) -o $@.$(INPATH) -t $(SOLARBINDIR)/msi-encodinglist.txt $<
10983 @$(RENAME) $@.$(INPATH) $@
10984 @-$(RM) $@.$(INPATH)
10985 @@ -809,18 +865,18 @@ $(COMMONMISC)/$(TARGET)/%.uulf : $$(@:db).ulf
10986 $(COMMONMISC)/$(TARGET)/%.uulf : $$(@:b).ulf
10987 .ENDIF # "$(WITH_LANG)"!=""
10988 @-$(MKDIRHIER) $(@:d)
10989 - -$(RM) $@
10990 + $(COMMAND_ECHO)-$(RM) $@
10991 @$(COPY) $< $@.$(INPATH)
10992 @$(RENAME) $@.$(INPATH) $@
10993 @-$(RM) $@.$(INPATH)
10994
10995 # This is still needed?????
10996 $(COMMONMISC)/$(TARGET)/%.xrm : %.xrm
10997 - -$(MKDIR) $(@:d)
10998 - -$(RM) $@
10999 - $(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
11000 - $(RENAME) $@.$(INPATH) $@
11001 - -$(RM) $@.$(INPATH)
11002 + $(COMMAND_ECHO)-$(MKDIR) $(@:d)
11003 + $(COMMAND_ECHO)-$(RM) $@
11004 + $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
11005 + $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
11006 + $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
11007
11008 # dirty hack
11009 # if local *.sdf file is missing
11010 diff --git solenv/inc/settings.mk solenv/inc/settings.mk
11011 index 628d721..0dfcabb 100644
11012 --- solenv/inc/settings.mk
11013 +++ solenv/inc/settings.mk
11014 @@ -380,7 +380,9 @@ verbose*=$(VERBOSE)
11015 .ENDIF
11016
11017 .IF "$(verbose)"!=""
11018 -VERBOSE*=$(verbose)
11019 +# normalize: "false" (any upper/lower case) and "0" mean FALSE, everything else means TRUE
11020 +VERBOSE_IS_FALSE:=$(or $(eq,"$(verbose:u)","FALSE" "false" ) $(eq,"$(verbose)","0" "false" ))
11021 +VERBOSE!:=$(eq,"$(VERBOSE_IS_FALSE)","t" FALSE TRUE)
11022 .ENDIF
11023
11024 .IF "$(SOLARLANG)" != ""
11025 @@ -980,6 +982,19 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rscdep
11026 RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc
11027 .ENDIF # "$(make_srs_deps)"!=""
11028
11029 +.IF "$(VERBOSE)" == "TRUE"
11030 + VERBOSITY=-verbose
11031 +.ELSE
11032 + COMMAND_ECHO=@
11033 + .IF "$(VERBOSE)" == "FALSE"
11034 + VERBOSITY=-quiet
11035 + ZIP_VERBOSITY=-q
11036 + TRANSEX_VERBOSITY=-QQ
11037 + CFGEX_VERBOSITY=-QQ
11038 + ULFEX_VERBOSITY=-QQ
11039 + .ENDIF
11040 +.ENDIF # "$(VERBOSE)" == "TRUE"
11041 +
11042 #new
11043 RSCUPDVER=$(RSCREVISION)
11044 RSCUPDVERDEF=-DUPDVER="$(RSCUPDVER)"
11045 diff --git solenv/inc/target.mk solenv/inc/target.mk
11046 index adf5079..761d29a 100644
11047 --- solenv/inc/target.mk
11048 +++ solenv/inc/target.mk
11049 @@ -1292,13 +1292,13 @@ $(UNOUCRTARGET) : $(UNOUCRHEADER)
11050 # keep that one to rebuild single misses
11051 $(UNOUCRHEADER):
11052 @noop
11053 -
11054 +
11055 $(UNOUCRTARGET) : $(UNOUCRDEP)
11056 .IF "$(XML2MK_FILES)"!=""
11057 @@-$(RM) $(foreach,i,$(XML2MK_FILES) $(MISC)/$(i).mk)
11058 .ENDIF # "$(XML2MK_FILES)"!=""
11059 @@-$(MKDIRHIER) $(UNOUCROUT)
11060 - $(CPPUMAKER) @$(mktmp $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOTYPES:^"-T") $(UNOUCRRDB)) && $(TOUCH) $@
11061 + $(COMMAND_ECHO)$(CPPUMAKER) @$(mktmp $(CPPUMAKERFLAGS) -B$(UNOUCRBASE) -O$(UNOUCROUT) $(UNOTYPES:^"-T") $(UNOUCRRDB)) && $(TOUCH) $@
11062 .ENDIF # "$(UNOTYPES)" != ""
11063
11064 .IF "$(COMP1RDBTARGETN)"!=""
11065 @@ -1377,12 +1377,12 @@ $(JAVATARGET) : $(GENJAVAFILES)
11066
11067 .IF "$(HXXCOPYFILES)" != ""
11068 $(HXXCOPYTARGET): $(HXXCOPYFILES)
11069 - $(COPY) $(COPYUPDATE) $(HXXCOPYFILES) $(INCCOM) $(CHECKCOPYURESULT)
11070 + $(COMMAND_ECHO)$(COPY) $(COPYUPDATE) $(HXXCOPYFILES) $(INCCOM) $(CHECKCOPYURESULT)
11071 .ENDIF
11072
11073 .IF "$(UNIXTEXT)"!=""
11074 $(UNIXTEXT) : $(UNIXTEXT:f)
11075 - @echo Making $@
11076 + @echo "Making: " $@
11077 @@-$(RM) -f $@
11078 @tr -d "\015" < $(@:f) > $@
11079
11080 @@ -1415,38 +1415,50 @@ $(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE)
11081
11082 makedoc:
11083 @@-mkdir $(OUT)/ucrdoc
11084 - $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)/ucrdoc/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))
11085 +.IF "$(VERBOSE)" == "TRUE"
11086 + $(COMMAND_ECHO)$(IDLC) $(VERBOSITY) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)/ucrdoc/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))
11087 +.ELSE
11088 + $(COMMAND_ECHO)$(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)/ucrdoc/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))
11089 +.ENDIF
11090 # -$(UNOIDL) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -Bdoc -P../$(PRJNAME)/$(IDLPACKAGE) -OH$(PRJ)/../unodoc $(DOCIDLFILES) $(IDLFILES)
11091
11092 .IF "$(LOCALDBTARGET)"!=""
11093 $(LOCALDBTARGET) : $(URDFILES) $(DEPIDLFILES)
11094 - $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)/ucr/$(IDLPACKAGE) $(all_outdated_idl))
11095 - -$(RM) $@
11096 - $(REGMERGE) $@ UCR @$(mktmp $(URDFILES))
11097 +.IF "$(VERBOSE)" == "TRUE"
11098 + $(COMMAND_ECHO)$(IDLC) $(VERBOSITY) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)/ucr/$(IDLPACKAGE) $(all_outdated_idl))
11099 +.ELSE
11100 + $(COMMAND_ECHO)$(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)/ucr/$(IDLPACKAGE) $(all_outdated_idl))
11101 +.ENDIF
11102 + $(COMMAND_ECHO)-$(RM) $@
11103 + $(COMMAND_ECHO)$(REGMERGE) $@ UCR @$(mktmp $(URDFILES))
11104 .ENDIF
11105
11106 .IF "$(LOCALDOCDBTARGET)"!=""
11107 $(LOCALDOCDBTARGET) : $(URDDOCFILES) $(DEPIDLFILES)
11108 - $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)/ucrdoc/$(IDLPACKAGE) $(all_outdated_idl))
11109 - -$(RM) $@
11110 - $(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES))
11111 +.IF "$(VERBOSE)" == "TRUE"
11112 + $(COMMAND_ECHO)$(IDLC) $(VERBOSITY) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)/ucrdoc/$(IDLPACKAGE) $(all_outdated_idl))
11113 +.ELSE
11114 + $(COMMAND_ECHO)$(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)/ucrdoc/$(IDLPACKAGE) $(all_outdated_idl))
11115 +.ENDIF
11116 + $(COMMAND_ECHO)-$(RM) $@
11117 + $(COMMAND_ECHO)$(REGMERGE) $@ UCR @$(mktmp $(URDDOCFILES))
11118 .ENDIF
11119
11120 .IF "$(UNOIDLDBTARGET)"!=""
11121 $(UNOIDLDBTARGET) : $(UNOIDLDBFILES) $(UNOIDLDBREGS)
11122 - -$(RM) $@
11123 - $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
11124 + $(COMMAND_ECHO)-$(RM) $@
11125 + $(COMMAND_ECHO)$(REGMERGE) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
11126 .IF "$(LOCALREGDB)"!=""
11127 - $(REGMERGE) $(LOCALREGDB) / $@
11128 + $(COMMAND_ECHO)$(REGMERGE) $(LOCALREGDB) / $@
11129 .ENDIF
11130 .ENDIF # "$(UNOIDLDBTARGET)"!=""
11131
11132 .IF "$(UNOIDLDBDOCTARGET)"!=""
11133 $(UNOIDLDBDOCTARGET) : $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS)
11134 - -$(RM) $@
11135 - $(REGMERGE) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
11136 + $(COMMAND_ECHO)-$(RM) $@
11137 + $(COMMAND_ECHO)$(REGMERGE) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
11138 .IF "$(LOCALREGDB)"!=""
11139 - $(REGMERGE) $(LOCALREGDB) / $@
11140 + $(COMMAND_ECHO)$(REGMERGE) $(LOCALREGDB) / $@
11141 .ENDIF
11142 .ENDIF # "$(UNOIDLDBDOCTARGET)"!=""
11143
11144 @@ -1512,10 +1524,10 @@ $(TARGETDEPS) : $(LOCALIZE_ME_DEST)
11145
11146 .IF "$(WITH_LANG)"==""
11147 $(LOCALIZE_ME_DEST) : $(LOCALIZE_ME)
11148 - -$(RM) $(INCCOM)/$(TARGET)_lastrun.mk
11149 - -$(MKDIR) $(@:d)
11150 - -$(RM) $@
11151 - $(COPY) $(@:b:+"_tmpl")$(@:e) $@
11152 + $(COMMAND_ECHO)-$(RM) $(INCCOM)/$(TARGET)_lastrun.mk
11153 + $(COMMAND_ECHO)-$(MKDIR) $(@:d)
11154 + $(COMMAND_ECHO)-$(RM) $@
11155 + $(COMMAND_ECHO)$(COPY) $(@:b:+"_tmpl")$(@:e) $@
11156
11157 .ELSE # "$(WITH_LANG)"==""
11158 # LASTRUN_MERGED
11159 @@ -1526,10 +1538,10 @@ $(LOCALIZE_ME_DEST) : $(LOCALIZE_ME) $(LOCALIZESDF)
11160 $(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ME) $(LOCALIZESDF)
11161 echo LASTRUN_MERGED:=TRUE > $(INCCOM)/$(TARGET)_lastrun.mk
11162 .ENDIF # "$(LASTRUN_MERGED)"=="TRUE"
11163 - -$(MKDIR) $(@:d)
11164 - -$(RM) $@
11165 - $(TRANSEX) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all
11166 - $(RENAME) $(@:d)$(@:b:+"_tmpl")$(@:e).$(INPATH) $@
11167 + $(COMMAND_ECHO)-$(MKDIR) $(@:d)
11168 + $(COMMAND_ECHO)-$(RM) $@
11169 + $(COMMAND_ECHO)$(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all
11170 + $(COMMAND_ECHO)$(RENAME) $(@:d)$(@:b:+"_tmpl")$(@:e).$(INPATH) $@
11171
11172 .ENDIF # "$(WITH_LANG)"==""
11173 .ENDIF # "$(LOCALIZE_ME_DEST)"!=""
11174 @@ -1558,10 +1570,12 @@ $(MISC)/$(TARGET)_%.done : %.xrb
11175
11176 .IF "$(COMMONPRJHIDOTHERTARGET)"!=""
11177 $(COMMONPRJHIDOTHERTARGET) : $(PRJHIDOTHERTARGET)
11178 +.IF "$(VERBOSE)" == "TRUE"
11179 @echo ------------------------------
11180 - @echo Making: $@
11181 +.ENDIF
11182 + @echo "Making: " $@
11183 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
11184 - $(TYPE) $(PRJHIDOTHERTARGET) > $@.$(ROUT).tmp
11185 + $(COMMAND_ECHO)$(TYPE) $(PRJHIDOTHERTARGET) > $@.$(ROUT).tmp
11186 @$(RENAME) $@.$(ROUT).tmp $@
11187 .ENDIF
11188
11189 @@ -1707,7 +1721,10 @@ ZIPDEPPHONY=.PHONY
11190 .ENDIF
11191
11192 last_target:
11193 - @echo -------------
11194 +.IF "$(VERBOSE)" == "TRUE"
11195 + @echo -------------
11196 +.ENDIF
11197 + $(NULL)
11198
11199 $(MISC)/$(TARGET)genjava.mk: $(IDLFILES)
11200
11201 @@ -1730,16 +1747,24 @@ $(TARGETDPJ) : $(JAVAFILES) $(JAVATARGET)
11202 .IF "$(NOOPT_FLAG)" == ""
11203
11204 $(NOOPTTARGET):
11205 +.IF "$(VERBOSE)" == "TRUE"
11206 @echo --- NOOPTFILES ---
11207 +.ENDIF
11208 @dmake $(MFLAGS) $(MAKEFILE) nopt=true $(NOOPTFILES) NOOPT_FLAG=TRUE $(CALLMACROS)
11209 +.IF "$(VERBOSE)" == "TRUE"
11210 @echo --- NOOPTFILES OVER ---
11211 +.ENDIF
11212
11213 $(NOOPTFILES):
11214 +.IF "$(VERBOSE)" == "TRUE"
11215 @echo --- NOOPT ---
11216 +.ENDIF
11217 @dmake $(MFLAGS) $(MAKEFILE) nopt=true NOOPT_FLAG=TRUE $(CALLMACROS) $@
11218 +.IF "$(VERBOSE)" == "TRUE"
11219 @echo --- NOOPT OVER ---
11220 .ENDIF
11221 .ENDIF
11222 +.ENDIF
11223
11224
11225 # ----------------------------------
11226 @@ -1750,14 +1775,22 @@ $(NOOPTFILES):
11227 .IF "$(EXCEPTIONSNOOPT_FLAG)" == ""
11228
11229 $(EXCEPTIONSNOOPTTARGET):
11230 +.IF "$(VERBOSE)" == "TRUE"
11231 @echo --- EXCEPTIONSNOOPTFILES ---
11232 +.ENDIF
11233 @dmake $(MFLAGS) $(MAKEFILE) ENABLE_EXCEPTIONS=true $(EXCEPTIONSNOOPTFILES) EXCEPTIONSNOOPT_FLAG=TRUE nopt=true $(CALLMACROS)
11234 +.IF "$(VERBOSE)" == "TRUE"
11235 @echo --- EXCEPTIONSNOOPTFILES OVER ---
11236 +.ENDIF
11237
11238 $(EXCEPTIONSNOOPTFILES):
11239 +.IF "$(VERBOSE)" == "TRUE"
11240 @echo --- EXCEPTIONSNOOPT ---
11241 +.ENDIF
11242 @dmake $(MFLAGS) $(MAKEFILE) ENABLE_EXCEPTIONS=true EXCEPTIONSNOOPT_FLAG=TRUE nopt=true $(CALLMACROS) $@
11243 +.IF "$(VERBOSE)" == "TRUE"
11244 @echo --- EXCEPTIONSNOOPT OVER ---
11245 +.ENDIF
11246
11247
11248 .ENDIF
11249 @@ -1895,7 +1928,7 @@ killsrs:
11250
11251 killres:
11252 .IF "$(RESLIB1TARGETN)$(RESLIB2TARGETN)$(RESLIB3TARGETN)$(RESLIB4TARGETN)$(RESLIB5TARGETN)$(RESLIB6TARGETN)$(RESLIB7TARGETN)$(RESLIB8TARGETN)$(RESLIB9TARGETN)"!=""
11253 - $(RM) $(RESLIB1TARGETN) $(RESLIB2TARGETN) $(RESLIB3TARGETN) $(RESLIB4TARGETN) $(RESLIB5TARGETN) $(RESLIB6TARGETN) $(RESLIB7TARGETN) $(RESLIB8TARGETN) $(RESLIB9TARGETN)
11254 + @(COMMAND_ECHO)$(RM) $(RESLIB1TARGETN) $(RESLIB2TARGETN) $(RESLIB3TARGETN) $(RESLIB4TARGETN) $(RESLIB5TARGETN) $(RESLIB6TARGETN) $(RESLIB7TARGETN) $(RESLIB8TARGETN) $(RESLIB9TARGETN)
11255 @echo resource files removed!
11256 .ELSE # "$(RESLIB1TARGETN)$(RESLIB2TARGETN)$(RESLIB3TARGETN)$(RESLIB4TARGETN)$(RESLIB5TARGETN)$(RESLIB6TARGETN)$(RESLIB7TARGETN)$(RESLIB8TARGETN)$(RESLIB9TARGETN)"!=""
11257 @echo no resource files defined!
11258 @@ -1903,20 +1936,20 @@ killres:
11259
11260 killdef:
11261 .IF "$(DEFTARGETN)" != ""
11262 - $(RM) $(DEFTARGETN)
11263 + @(COMMAND_ECHO)$(RM) $(DEFTARGETN)
11264 .ENDIF
11265 @echo deffiles weg!
11266
11267 killlib:
11268 .IF "$(LIB1TARGETN)$(LIB2TARGETN)$(LIB3TARGETN)$(LIB4TARGETN)$(LIB5TARGETN)$(LIB6TARGETN)$(LIB7TARGETN)$(LIB8TARGETN)$(LIB9TARGETN)"!=""
11269 - $(RM) $(LIB1TARGETN) $(LIB2TARGETN) $(LIB3TARGETN) $(LIB4TARGETN) $(LIB5TARGETN) $(LIB6TARGETN) $(LIB7TARGETN) $(LIB8TARGETN) $(LIB9TARGETN)
11270 + @(COMMAND_ECHO)$(RM) $(LIB1TARGETN) $(LIB2TARGETN) $(LIB3TARGETN) $(LIB4TARGETN) $(LIB5TARGETN) $(LIB6TARGETN) $(LIB7TARGETN) $(LIB8TARGETN) $(LIB9TARGETN)
11271 .IF "$(LIB1ARCHIV)$(LIB2ARCHIV)$(LIB3ARCHIV)$(LIB4ARCHIV)$(LIB5ARCHIV)$(LIB6ARCHIV)$(LIB7ARCHIV)$(LIB8ARCHIV)$(LIB9ARCHIV)"!=""
11272 - $(RM) $(LIB1ARCHIV) $(LIB2ARCHIV) $(LIB3ARCHIV) $(LIB4ARCHIV) $(LIB5ARCHIV) $(LIB6ARCHIV) $(LIB7ARCHIV) $(LIB8ARCHIV) $(LIB9ARCHIV)
11273 + @(COMMAND_ECHO)$(RM) $(LIB1ARCHIV) $(LIB2ARCHIV) $(LIB3ARCHIV) $(LIB4ARCHIV) $(LIB5ARCHIV) $(LIB6ARCHIV) $(LIB7ARCHIV) $(LIB8ARCHIV) $(LIB9ARCHIV)
11274 .ENDIF # "$(LIB1ARCHIV)$(LIB2ARCHIV)$(LIB3ARCHIV)$(LIB4ARCHIV)$(LIB5ARCHIV)$(LIB6ARCHIV)$(LIB7ARCHIV)$(LIB8ARCHIV)$(LIB9ARCHIV)"!=""
11275 @echo lib/archive files removed!
11276 .ENDIF # "$(LIB1TARGETN)$(LIB2TARGETN)$(LIB3TARGETN)$(LIB4TARGETN)$(LIB5TARGETN)$(LIB6TARGETN)$(LIB7TARGETN)$(LIB8TARGETN)$(LIB9TARGETN)"!=""
11277 .IF "$(SLOTARGET)$(OBJTARGET)"!=""
11278 - $(RM) $(SLOTARGET) $(OBJTARGET)
11279 + @(COMMAND_ECHO)$(RM) $(SLOTARGET) $(OBJTARGET)
11280 @echo default lib files removed!
11281 .ENDIF # "$(SLOTARGET)$(OBJTARGET)"!=""
11282 @echo done!
11283 @@ -1963,10 +1996,14 @@ ZIPALLTARGET: \
11284 $(ZIP9TARGETN)
11285 .ELSE
11286 ZIPALLTARGET:
11287 +.IF "$(VERBOSE)" == "TRUE"
11288 @echo ---
11289 +.ENDIF
11290 @echo nothing to zip for activated languages!
11291 +.IF "$(VERBOSE)" == "TRUE"
11292 @echo ---
11293 .ENDIF
11294 +.ENDIF
11295
11296
11297 #temporary workaround for non-existing delzip in extras
11298 @@ -2015,14 +2052,16 @@ UNOUCRDEPxxx : $(UNOUCRDEP);
11299
11300 #new hid.lst trigger with GEN_HID2=TRUE
11301 $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY :
11302 - @echo Making $@ :
11303 + @echo "Making: " $@
11304 +.IF "$(VERBOSE)" == "TRUE"
11305 @echo ---------------
11306 +.ENDIF
11307 @echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010 > $@.$(ROUT).tmp
11308 - $(TYPE) $(SOLARCOMMONBINDIR)/hid/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp
11309 + $(COMMAND_ECHO)$(TYPE) $(SOLARCOMMONBINDIR)/hid/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp
11310 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
11311 @-$(RENAME) $@.$(ROUT).tmp $@
11312 @-mkdir $(@:d)hid
11313 - $(PERL) $(SOLARENV)/bin/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp
11314 + $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/gen_userfeedback_VCL_names.pl $@ $(SOLARCOMMONBINDIR)/win $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp
11315 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv $(FI)
11316 @-$(RENAME) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv.$(ROUT).tmp $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid/userfeedback_VCL_names.csv
11317
11318 diff --git solenv/inc/tg_app.mk solenv/inc/tg_app.mk
11319 index fc0b3d3..51a657d 100644
11320 --- solenv/inc/tg_app.mk
11321 +++ solenv/inc/tg_app.mk
11322 @@ -119,7 +119,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
11323 $(APP$(TNR)IMP_ORD) \
11324 $(APP$(TNR)ICON) $(APP$(TNR)DEPN) $(USE_APP$(TNR)DEF)
11325 @echo ------------------------------
11326 - @echo Making: $@
11327 + @echo "Making: " $(@:f)
11328 .IF "$(GUI)"=="UNX"
11329 .IF "$(OS)"=="MACOSX"
11330 @echo unx
11331 @@ -133,7 +133,9 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
11332 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
11333 `cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd` \
11334 >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
11335 + .IF "$(VERBOSE)" == "TRUE"
11336 @cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
11337 + .ENDIF
11338 @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
11339 # Need to strip __objcInit symbol to avoid duplicate symbols when loading
11340 # libraries at runtime
11341 @@ -143,7 +145,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
11342 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
11343 app $(APP$(TNR)RPATH) $@
11344 .IF "$(TARGETTYPE)"=="GUI"
11345 - @echo "Making: $@.app"
11346 + @echo "Making: " $(@:f).app
11347 @macosx-create-bundle $@
11348 .ENDIF # "$(TARGETTYPE)"=="GUI"
11349 .ELSE # "$(OS)"=="MACOSX"
11350 @@ -153,9 +155,13 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
11351 $(APP$(TNR)OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
11352 @cat $(mktmp /dev/null $(APP$(TNR)LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
11353 @echo $(APP$(TNR)LINKTYPEFLAG) $(APP$(TNR)LIBSALCPPRT) $(APP$(TNR)STDLIBS) $(APP$(TNR)STDLIB) $(STDLIB$(TNR)) -o $@ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
11354 - cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
11355 + .IF "$(VERBOSE)" == "TRUE"
11356 + @cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
11357 + .ENDIF
11358 @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
11359 + .IF "$(VERBOSE)" == "TRUE"
11360 @ls -l $@
11361 + .ENDIF
11362 .ENDIF # "$(OS)"=="MACOSX"
11363 .ENDIF
11364 .IF "$(GUI)" == "WNT"
11365 @@ -169,7 +175,7 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
11366 @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
11367 @-echo $(EMQ)#include $(EMQ)"$(APP$(TNR)VERINFO)$(EMQ)" >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
11368 .ENDIF # "$(APP$(TNR)VERINFO)" != ""
11369 - $(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP$(TNR)LINKRES:b).rc
11370 + $(COMMAND_ECHO)$(RC) -DWIN32 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP$(TNR)LINKRES:b).rc
11371 .ENDIF # "$(APP$(TNR)LINKRES)" != ""
11372 .IF "$(COM)" == "GCC"
11373 @echo mingw
11374 @@ -177,19 +183,22 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
11375 @cat $(APP$(TNR)LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP$(TNR)RES)) > $(MISC)/$(@:b)_all.res
11376 windres $(MISC)/$(@:b)_all.res $(APP$(TNR)RESO)
11377 .ENDIF
11378 - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
11379 + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
11380 $(APP$(TNR)BASEX) $(APP$(TNR)STACKN) -o $@ $(APP$(TNR)OBJS) \
11381 -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP$(TNR)RESO) \
11382 `$(TYPE) /dev/null $(APP$(TNR)LIBS) | sed s#$(ROUT)#$(OUT)#g` \
11383 - $(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) \
11384 - -Wl,--start-group $(APP$(TNR)STDLIBS) -Wl,--end-group $(APP$(TNR)STDLIB) \
11385 - $(STDLIB$(TNR)) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
11386 + $(APP_LINKTYPE) $(APP$(TNR)LIBSALCPPRT) \
11387 + -Wl,--start-group $(APP$(TNR)STDLIBS) -Wl,--end-group $(APP$(TNR)STDLIB) \
11388 + $(STDLIB$(TNR)) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
11389 + # need this empty line, else dmake somehow gets confused by the .IFs and .ENDIFs
11390 + .IF "$(VERBOSE)" == "TRUE"
11391 @$(TYPE) $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
11392 + .ENDIF
11393 @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
11394 @ls -l $@
11395 .ELSE # "$(COM)" == "GCC"
11396 .IF "$(linkinc)" == ""
11397 - $(APP$(TNR)LINKER) @$(mktmp \
11398 + $(COMMAND_ECHO)$(APP$(TNR)LINKER) @$(mktmp \
11399 $(APP$(TNR)LINKFLAGS) \
11400 $(LINKFLAGSAPP) $(APP$(TNR)BASEX) \
11401 $(APP$(TNR)STACKN) \
11402 @@ -205,17 +214,17 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
11403 )
11404 @-echo linking $@.manifest ...
11405 .IF "$(VISTA_MANIFEST)"!=""
11406 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
11407 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
11408 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
11409 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
11410 .ELSE
11411 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
11412 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
11413 .ENDIF # "$(VISTA_MANIFEST)"!=""
11414 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
11415 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
11416 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
11417 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
11418 .ELSE
11419 - -$(RM) $(MISC)\$(APP$(TNR)TARGET).lnk
11420 - -$(RM) $(MISC)\$(APP$(TNR)TARGET).lst
11421 - -$(RM) $(MISC)\linkobj.lst
11422 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP$(TNR)TARGET).lnk
11423 + $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP$(TNR)TARGET).lst
11424 + $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
11425 for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
11426 type $(mktmp,$(MISC)\$(APP$(TNR)TARGET).lst
11427 $(APP$(TNR)LINKFLAGS) \
11428 @@ -229,16 +238,16 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
11429 $(APP$(TNR)LIBS) \
11430 $(APP$(TNR)STDLIBS) \
11431 $(APP$(TNR)STDLIB) $(STDLIB$(TNR)))
11432 - $(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP$(TNR)TARGETN:b)_linkobj.lst >> $(MISC)\$(APP$(TNR)TARGET).lst
11433 - $(IFEXIST) $(MISC)/$(APP$(TNR)TARGET).lst $(THEN) type $(MISC)/$(APP$(TNR)TARGET).lst >> $(MISC)/$(APP$(TNR)TARGET).lnk $(FI)
11434 - $(APP$(TNR)LINKER) @$(MISC)\$(APP$(TNR)TARGET).lnk
11435 + $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP$(TNR)TARGETN:b)_linkobj.lst >> $(MISC)\$(APP$(TNR)TARGET).lst
11436 + $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP$(TNR)TARGET).lst $(THEN) type $(MISC)/$(APP$(TNR)TARGET).lst >> $(MISC)/$(APP$(TNR)TARGET).lnk $(FI)
11437 + $(COMMAND_ECHO)$(SED)$(APP$(TNR)LINKER) @$(MISC)\$(APP$(TNR)TARGET).lnk
11438 .ENDIF # "$(linkinc)" == ""
11439 .ENDIF # "$(COM)" == "GCC"
11440 .IF "$(APP$(TNR)TARGET)" == "loader"
11441 - $(PERL) loader.pl $@
11442 - $(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
11443 - $(RM) $@
11444 - $(RENAME) $(@:d)_new.exe $(@:d)loader.exe
11445 + $(COMMAND_ECHO)$(PERL) loader.pl $@
11446 + $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
11447 + $(COMMAND_ECHO)$(RM) $@
11448 + $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
11449 .ENDIF # "$(TARGET)" == "setup"
11450
11451 .ENDIF # "$(GUI)" == "WNT"
11452 @@ -254,13 +263,14 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
11453 @-+echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
11454 @-+echo $(EMQ)#include $(EMQ)"$(APP$(TNR)VERINFO)$(EMQ)" >> $(MISC)/$(APP$(TNR)LINKRES:b).rc
11455 .ENDIF # "$(APP$(TNR)VERINFO)" != ""
11456 - $(RC) -r -DOS2 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP$(TNR)LINKRES:b).rc
11457 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(APP$(TNR)PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP$(TNR)LINKRES:b).rc
11458 .ENDIF # "$(APP$(TNR)LINKRES)" != ""
11459
11460 .IF "$(TARGETTYPE)" == "GUI"
11461 @echo NAME $(APP$(TNR)TARGET) WINDOWAPI > $(MISC)/$(APP$(TNR)TARGET).def
11462 .ENDIF
11463
11464 + .IF "$(VERBOSE)" == "TRUE"
11465 @+echo $(APP$(TNR)LINKFLAGS) \
11466 $(LINKFLAGSAPP) $(APP$(TNR)BASEX) \
11467 $(APP$(TNR)STACKN) \
11468 @@ -275,7 +285,8 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
11469 $(APP$(TNR)LIBS) \
11470 $(APP$(TNR)STDLIBS:^"-l") \
11471 $(APP$(TNR)STDLIB:^"-l") $(STDLIB$(TNR):^"-l")
11472 - $(APP$(TNR)LINKER) -v \
11473 + .ENDIF
11474 + $(COMMAND_ECHO)$(APP$(TNR)LINKER) -v \
11475 $(APP$(TNR)LINKFLAGS) \
11476 $(LINKFLAGSAPP) $(APP$(TNR)BASEX) \
11477 $(APP$(TNR)STACKN) \
11478 @@ -293,10 +304,10 @@ $(APP$(TNR)TARGETN): $(APP$(TNR)OBJS) $(APP$(TNR)LIBS) \
11479
11480
11481 .IF "$(APP$(TNR)TARGET)" == "loader"
11482 - +$(PERL) loader.pl $@
11483 - +$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
11484 - +$(RM) $@
11485 - +$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
11486 + $(COMMAND_ECHO)+$(PERL) loader.pl $@
11487 + $(COMMAND_ECHO)+$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
11488 + $(COMMAND_ECHO)+$(RM) $@
11489 + $(COMMAND_ECHO)+$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
11490 .ENDIF # "$(TARGET)" == "setup"
11491
11492 .ENDIF # "$(GUI)" == "OS2"
11493 diff --git solenv/inc/tg_config.mk solenv/inc/tg_config.mk
11494 index 099ec9e..8a96283 100644
11495 --- solenv/inc/tg_config.mk
11496 +++ solenv/inc/tg_config.mk
11497 @@ -64,22 +64,25 @@ $(XCS_TRIM) : $(DTDDIR)/registry/component-schema.dtd \
11498 .ENDIF
11499
11500 $(PROCESSOUT)/registry/schema/$(PACKAGEDIR)/%.xcs : %.xcs
11501 + @echo "Making: " $(@:f)
11502 +.IF "$(VERBOSE)"!="FALSE"
11503 @echo -------------+ validating and stripping schema files
11504 - -$(MKDIRHIER) $(@:d)
11505 - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.val) \
11506 +.ENDIF
11507 + @-$(MKDIRHIER) $(@:d)
11508 + $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.val) \
11509 --stringparam componentName $(PACKAGE).$* \
11510 $(SYSXSLDIR)schema_val.xsl $<
11511 - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.san) \
11512 + $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.san) \
11513 $(SYSXSLDIR)sanity.xsl $<
11514 - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
11515 + $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
11516 $(SYSXSLDIR)schema_trim.xsl $<
11517 - +-$(RM) $(@:d)$*.val > $(NULLDEV)
11518 - +-$(RM) $(@:d)$*.san > $(NULLDEV)
11519 + @+-$(RM) $(@:d)$*.val > $(NULLDEV)
11520 + @+-$(RM) $(@:d)$*.san > $(NULLDEV)
11521
11522 $(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcs : %.xcs
11523 # just a copy for now - insert "cfgex" commandline when required
11524 - -$(MKDIRHIER) $(@:d)
11525 - $(COPY) $< $@
11526 + $(COMMAND_ECHO)-$(MKDIRHIER) $(@:d)
11527 + $(COMMAND_ECHO)$(COPY) $< $@
11528
11529 # Create properties files for localized <info> contents (Currently not built)
11530 .IF "$(XCS_RESOURCES)" != ""
11531 @@ -87,9 +90,12 @@ $(XCS_RESOURCES) : $(XSLDIR)/resource.xsl
11532 .ENDIF
11533
11534 $(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.properties :| $(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcs
11535 + @echo "Making: " $(@:f)
11536 +.IF "$(VERBOSE)"!="FALSE"
11537 @echo -------------+ creating locale dependent resource bundles
11538 - -$(MKDIRHIER) $(@:d)
11539 - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
11540 +.ENDIF
11541 + @-$(MKDIRHIER) $(@:d)
11542 + $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
11543 --stringparam locale {$(subst,/$(PACKAGEDIR)/$(@:f), $(subst,$(PROCESSOUT)/registry/res/, $@))} \
11544 $(SYSXSLDIR)resource.xsl $<
11545
11546 @@ -110,17 +116,20 @@ $(XCU_DEFAULT) : $(DTDDIR)/registry/component-update.dtd \
11547 .ENDIF
11548
11549 $(PROCESSOUT)/registry/data/$(PACKAGEDIR)/%.xcu : %.xcu
11550 + @echo "Making: " $(@:f)
11551 +.IF "$(VERBOSE)"!="FALSE"
11552 @echo -------------+ validating and creating a locale independent file
11553 - -$(MKDIRHIER) $(@:d)
11554 - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.val) \
11555 +.ENDIF
11556 + @-$(MKDIRHIER) $(@:d)
11557 + $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $(@:d))$*.val) \
11558 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
11559 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
11560 $(SYSXSLDIR)data_val.xsl $<
11561 - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
11562 + $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
11563 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
11564 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
11565 $(SYSXSLDIR)alllang.xsl $<
11566 - +-$(RM) $(@:d)$*.val > $(NULLDEV)
11567 + @+-$(RM) $(@:d)$*.val > $(NULLDEV)
11568
11569 # --- localizations ---
11570 .IF "$(WITH_LANG)"!=""
11571 @@ -129,8 +138,8 @@ $(XCU_LANG) : $(LOCALIZESDF)
11572 .ENDIF # "$(XCU_LANG)"!=""
11573
11574 $(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcu : %.xcu
11575 - -$(MKDIRHIER) $(@:d)
11576 - $(CFGEX) -p $(PRJNAME) -i $(@:f) -o $@ -m $(LOCALIZESDF) -l all
11577 + @-$(MKDIRHIER) $(@:d)
11578 + $(COMMAND_ECHO)$(CFGEX) $(CFGEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $@ -m $(LOCALIZESDF) -l all
11579
11580 .IF "$(XCU_LANG)" != ""
11581 $(XCU_LANG) : $(XSLDIR)/alllang.xsl
11582 @@ -140,9 +149,12 @@ $(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.xcu :| $(PROCESSOUT)/
11583 .ELSE # "$(WITH_LANG)"!=""
11584 $(PROCESSOUT)/registry/res/{$(alllangiso)}/$(PACKAGEDIR)/%.xcu :| %.xcu
11585 .ENDIF # "$(WITH_LANG)"!=""
11586 + @echo "Making: " $(@:f)
11587 +.IF "$(VERBOSE)"!="FALSE"
11588 @echo ------------- creating locale dependent entries
11589 - -$(MKDIRHIER) $(@:d)
11590 - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
11591 +.ENDIF
11592 + @-$(MKDIRHIER) $(@:d)
11593 + $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
11594 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
11595 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
11596 --stringparam locale {$(subst,/$(PACKAGEDIR)/$(@:f), $(subst,$(PROCESSOUT)/registry/res/, $@))} \
11597 @@ -157,7 +169,7 @@ $(LANGUAGEPACKS) : $(XSLDIR)/delcomment.sed
11598 $(PROCESSOUT)/registry/spool/Langpack-%.xcu : Langpack.xcu.tmpl
11599 @echo -------------+ creating a Langpack module for locale $*
11600 -$(MKDIRHIER) $(@:d)
11601 - $(SED) -e "s/__LANGUAGE__/$*/" -f $(XSLDIR)/delcomment.sed $< > $@
11602 + $(COMMAND_ECHO)$(SED) -e "s/__LANGUAGE__/$*/" -f $(XSLDIR)/delcomment.sed $< > $@
11603
11604
11605 # --- modules ---
11606 @@ -167,9 +179,12 @@ $(XCU_MODULES) : $(XSLDIR)/alllang.xsl
11607
11608
11609 $(PROCESSOUT)/registry/spool/$(PACKAGEDIR)/%.xcu :| $$(@:b:s/-/./:b).xcu
11610 + @echo "Making: " $(@:f)
11611 +.IF "$(VERBOSE)"!="FALSE"
11612 @echo -------------+ creating a module file
11613 - -$(MKDIRHIER) $(@:d)
11614 - $(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
11615 +.ENDIF
11616 + @-$(MKDIRHIER) $(@:d)
11617 + $(COMMAND_ECHO)$(XSLTPROC) --nonet -o $(normpath $(subst,$(PATH_IN_MODULE), $(PWD))/$(subst,$(PRJ), $@)) \
11618 --stringparam xcs $(XCSROOTURL)/registry/schema/$(XSLTPACKAGEDIR)/$(<:b).xcs \
11619 --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
11620 --stringparam module $(subst,$(<:b)-, $(*)) \
11621 diff --git solenv/inc/tg_def.mk solenv/inc/tg_def.mk
11622 index 88feb36..ec539d0 100644
11623 --- solenv/inc/tg_def.mk
11624 +++ solenv/inc/tg_def.mk
11625 @@ -53,18 +53,18 @@ $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS)
11626 .ENDIF # .IF "$(COM)"=="GCC"
11627
11628 $(DEF$(TNR)EXPORTFILE) : $(SHL$(TNR)VERSIONMAP)
11629 - $(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
11630 + $(COMMAND_ECHO)$(TYPE) $< | $(AWK) -f $(SOLARENV)/bin/getcsym.awk > $@
11631 .IF "$(COM)"=="GCC"
11632 - -$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
11633 - -$(GREP) "\*\|?" $@ > $@.symbols-regexp
11634 + $(COMMAND_ECHO)-$(GREP) -v "\*\|?" $@ | $(SED) -e 's@#.*@@' > $@.exported-symbols
11635 + $(COMMAND_ECHO)-$(GREP) "\*\|?" $@ > $@.symbols-regexp
11636 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
11637 # Extract RTTI symbols from all the objects that will be used to build a shared library
11638 - nm -gP $(SHL$(TNR)OBJS) \
11639 - `$(TYPE) /dev/null $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
11640 - | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
11641 + $(COMMAND_ECHO)nm -gP $(SHL$(TNR)OBJS) \
11642 + `$(TYPE) /dev/null $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` \
11643 + | $(SOLARENV)/bin/addsym-mingw.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
11644 # overwrite the map file generate into the local output tree with the generated
11645 # exported symbols list
11646 - $(RENAME) $@.exported-symbols $@
11647 + $(COMMAND_ECHO)$(RENAME) $@.exported-symbols $@
11648 .ENDIF # .IF "$(COM)"=="GCC"
11649
11650 .ENDIF # "$(GUI)"=="WNT"
11651 @@ -96,8 +96,10 @@ $(DEF$(TNR)TARGETN) : \
11652 $(DEF$(TNR)TARGETN) .PHONY :
11653 .ENDIF # "$(link_always)"==""
11654 @-$(RM) $@.tmpfile
11655 +.IF "$(VERBOSE)" == "TRUE"
11656 @echo ------------------------------
11657 - @echo Making Module-Definitionfile : $@
11658 +.ENDIF
11659 + @echo "Making: module definition file" $(@:f)
11660 @echo LIBRARY $(EMQ)"$(SHL$(TNR)TARGETN:f)$(EMQ)" >$@.tmpfile
11661 .IF "$(COM)"!="GCC"
11662 @echo HEAPSIZE 0 >>$@.tmpfile
11663 @@ -110,16 +112,16 @@ $(DEF$(TNR)TARGETN) .PHONY :
11664 .IF "$(DEFLIB$(TNR)NAME)"!=""
11665 .IF "$(COM)"=="GCC"
11666 @-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
11667 - dlltool --output-def $(MISC)/$(SHL$(TNR)TARGET).exp --export-all-symbols \
11668 + $(COMMAND_ECHO)dlltool --output-def $(MISC)/$(SHL$(TNR)TARGET).exp --export-all-symbols \
11669 `$(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s#$(ROUT)#$(PRJ)/$(ROUT)#g`
11670 - tail --lines +3 $(MISC)/$(SHL$(TNR)TARGET).exp | sed '/^;/d' >>$@.tmpfile
11671 + $(COMMAND_ECHO)tail --lines +3 $(MISC)/$(SHL$(TNR)TARGET).exp | sed '/^;/d' >>$@.tmpfile
11672 @-$(RM) $(MISC)/$(SHL$(TNR)TARGET).exp
11673 .ELSE
11674 .IF "$(SHL$(TNR)USE_EXPORTS)"==""
11675 @-$(RMHACK$(TNR)) $(MISC)/$(SHL$(TNR)TARGET).exp
11676 @$(LIBMGR) -EXTRACT:/ /OUT:$(MISC)/$(SHL$(TNR)TARGET).exp $(SLB)/$(DEFLIB$(TNR)NAME).lib
11677 @$(LDUMP2) -N $(EXPORT_ALL_SWITCH) -F $(MISC)/$(SHL$(TNR)TARGET).flt $(MISC)/$(SHL$(TNR)TARGET).exp >>$@.tmpfile
11678 - $(RMHACK$(TNR)) $(MISC)/$(SHL$(TNR)TARGET).exp
11679 + $(COMMAND_ECHO)$(RMHACK$(TNR)) $(MISC)/$(SHL$(TNR)TARGET).exp
11680 .ELSE # "$(SHL$(TNR)USE_EXPORTS)"==""
11681 @$(DUMPBIN) -DIRECTIVES $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | $(GREP) EXPORT: > $(MISC)/$(SHL$(TNR)TARGET).direct
11682 @$(LDUMP2) -N -D $(EXPORT_ALL_SWITCH) -F $(DEF$(TNR)FILTER) $(MISC)/$(SHL$(TNR)TARGET).direct >>$@.tmpfile
11683 @@ -188,9 +190,9 @@ $(DEF$(TNR)TARGETN) .PHONY :
11684 .ENDIF
11685 .IF "$(DEF$(TNR)EXPORTFILE)"!=""
11686 .IF "$(COM)"=="GCC"
11687 - $(TYPE) $(DEF$(TNR)EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
11688 + $(COMMAND_ECHO)$(TYPE) $(DEF$(TNR)EXPORTFILE) | sed -e s:PRIVATE:: >> $@.tmpfile
11689 .ELSE
11690 - $(TYPE) $(DEF$(TNR)EXPORTFILE) >> $@.tmpfile
11691 + $(COMMAND_ECHO)$(TYPE) $(DEF$(TNR)EXPORTFILE) >> $@.tmpfile
11692 .ENDIF
11693 .ENDIF
11694 @-$(RM) $@
11695 @@ -214,8 +216,10 @@ $(DEF$(TNR)TARGETN) : \
11696 $(DEF$(TNR)TARGETN) .PHONY :
11697 .ENDIF # "$(link_always)"==""
11698 @+-$(RM) $@.tmpfile
11699 +.IF "$(VERBOSE)" == "TRUE"
11700 @echo ------------------------------
11701 - @echo Making Module-Definitionfile : $@
11702 +.ENDIF
11703 + @echo "Making: module definition file" $(@:f)
11704 @echo LIBRARY $(SHL$(TNR)TARGET8) INITINSTANCE TERMINSTANCE >$@.tmpfile
11705 @echo DATA MULTIPLE >>$@.tmpfile
11706 @echo DESCRIPTION 'StarView 3.00 $(DEF$(TNR)DES) $(UPD) $(UPDMINOR)' >>$@.tmpfile
11707 @@ -296,11 +300,11 @@ $(DEF$(TNR)TARGETN) .PHONY :
11708 @sort < $@.tmp_ord | uniq > $@.exptmpfile
11709 @fix_def_ord < $@.exptmpfile >> $@.tmpfile
11710 @+-$(RM) $@
11711 - +$(RENAME) $@.tmpfile $@
11712 + $(COMMAND_ECHO)+$(RENAME) $@.tmpfile $@
11713 @+-$(RM) $@.tmp_ord
11714 @+-$(RM) $@.exptmpfile
11715 - +$(IMPLIB) $(IMPLIBFLAGS) $(SHL$(TNR)IMPLIBN:s/.lib/.a/) $@
11716 - +emxomf -o $(SHL$(TNR)IMPLIBN) $(SHL$(TNR)IMPLIBN:s/.lib/.a/)
11717 + $(COMMAND_ECHO)+$(IMPLIB) $(IMPLIBFLAGS) $(SHL$(TNR)IMPLIBN:s/.lib/.a/) $@
11718 + $(COMMAND_ECHO)+emxomf -o $(SHL$(TNR)IMPLIBN) $(SHL$(TNR)IMPLIBN:s/.lib/.a/)
11719
11720 .ENDIF # "$(GUI)"=="OS2"
11721
11722 diff --git solenv/inc/tg_dep.mk solenv/inc/tg_dep.mk
11723 index 46a5ffb..e585120 100644
11724 --- solenv/inc/tg_dep.mk
11725 +++ solenv/inc/tg_dep.mk
11726 @@ -53,9 +53,11 @@ ALLDEP .PHONY:
11727 echo xxx$(DEPFILES)xxx
11728 @@-$(RM) $(DEPFILES)
11729 .ENDIF # "$(DEPFILES)" != ""
11730 +.IF "$(VERBOSE)" == "TRUE"
11731 @echo ---
11732 @echo $(PWD) - Old dependency files removed or updated
11733 @echo ---
11734 +.ENDIF
11735
11736
11737 ALLDPC: \
11738 @@ -95,13 +97,17 @@ ALLDPC: \
11739
11740
11741 ALLDPC:
11742 +.IF "$(VERBOSE)" == "TRUE"
11743 @echo ------------------------------
11744 @echo No Dependencies
11745 +.ENDIF
11746 @echo $(EMQ)# > $(MISC)/$(TARGET).dpc
11747
11748 ALLDEP:
11749 +.IF "$(VERBOSE)" == "TRUE"
11750 @echo ------------------------------
11751 @echo No Dependencies
11752 +.ENDIF
11753
11754 .ENDIF
11755
11756 diff --git solenv/inc/tg_ext.mk solenv/inc/tg_ext.mk
11757 index b0096d7..f00b0a3 100644
11758 --- solenv/inc/tg_ext.mk
11759 +++ solenv/inc/tg_ext.mk
11760 @@ -109,8 +109,8 @@ ALLTAR : \
11761 $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
11762
11763 clean:
11764 - cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) clean
11765 - $(RM) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
11766 + $(COMMAND_ECHO)cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) clean
11767 + $(COMMAND_ECHO)$(RM) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
11768
11769 $(MISC)/%.unpack : $(PRJ)/download/%.tar.bz2
11770 @-$(RM) $@
11771 @@ -169,9 +169,9 @@ $(MISC)/%.unpack : $(PRJ)/download/%.jar
11772 #do unpack
11773 $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) : $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack $(PATCH_FILE_DEP)
11774 $(IFEXIST) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(THEN) $(RENAME:s/+//) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme $(FI)
11775 - -rm -rf $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme
11776 + $(COMMAND_ECHO)-rm -rf $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)_removeme
11777 @-$(MKDIRHIER) $(PACKAGE_DIR)$(fake_root_dir)
11778 - cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
11779 + $(COMMAND_ECHO)cd $(PACKAGE_DIR)$(fake_root_dir) && ( $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack)) && $(TOUCH) $(UNTAR_FLAG_FILE)
11780 @echo make writeable...
11781 @cd $(PACKAGE_DIR) && chmod -R +rw $(TARFILE_ROOTDIR) && $(TOUCH) $(UNTAR_FLAG_FILE)
11782 @cd $(PACKAGE_DIR) && find $(TARFILE_ROOTDIR) -type d -exec chmod a+x {{}} \;
11783 @@ -188,21 +188,21 @@ $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE) : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE) $(T_AD
11784 $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
11785 .IF "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"==""
11786 @echo no patch needed...
11787 - $(TOUCH) $@
11788 + $(COMMAND_ECHO)$(TOUCH) $@
11789 .ELSE # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"==""
11790 .IF "$(GUI)"=="WNT"
11791 # hack to make 4nt version 4,01 work and still get propper
11792 # errorcodes for versions < 3,00
11793 #.IF "$(my4ver:s/.//:s/,//)" >= "300"
11794 -# cd $(PACKAGE_DIR) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 ) && $(TOUCH) $(PATCH_FLAG_FILE)
11795 +# $(COMMAND_ECHO)cd $(PACKAGE_DIR) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 ) && $(TOUCH) $(PATCH_FLAG_FILE)
11796 #.ELSE # "$(my4ver:s/.//:s/,//)" >= "300"
11797 - cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
11798 + $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
11799 #.ENDIF # "$(my4ver:s/.//:s/,//)" >= "300"
11800 .ELSE # "$(GUI)"=="WNT"
11801 .IF "$(BSCLIENT)"=="TRUE"
11802 - cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
11803 + $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
11804 .ELSE # "$(BSCLIENT)"!=""
11805 - cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
11806 + $(COMMAND_ECHO)cd $(PACKAGE_DIR) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2 && $(TOUCH) $(PATCH_FLAG_FILE)
11807 .ENDIF # "$(BSCLIENT)"!=""
11808 .ENDIF # "$(GUI)"=="WNT"
11809 .ENDIF # "$(PATCH_FILES)"=="none" || "$(PATCH_FILES)"==""
11810 @@ -211,17 +211,17 @@ $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(PACKAGE_DIR)/$(ADD_FILES_FLAG_FILE)
11811 # Native W32 tools generate only filedates with even seconds, cygwin also with odd seconds
11812 $(DELAY) 2
11813 .ENDIF # "$(GUI)"=="WNT"
11814 - $(TOUCH) $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
11815 + $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
11816 .ENDIF # "$(T_ADDITIONAL_FILES)"!=""
11817
11818 .IF "$(CONVERTFILES)"!=""
11819 $(MISC)/$(TARGET)_convert_unx_flag : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE)
11820 - $(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) && $(TOUCH) $(MISC)/$(TARGET)_convert_unx_flag
11821 + $(COMMAND_ECHO)$(CONVERT) unix $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) && $(TOUCH) $(MISC)/$(TARGET)_convert_unx_flag
11822
11823 $(PACKAGE_DIR)/$(PATCH_FLAG_FILE) : $(MISC)/$(TARGET)_convert_unx_flag
11824
11825 $(MISC)/$(TARGET)_convert_dos_flag : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
11826 - $(CONVERT) dos $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) && $(TOUCH) $(MISC)/$(TARGET)_convert_dos_flag
11827 + $(COMMAND_ECHO)$(CONVERT) dos $(foreach,i,$(CONVERTFILES) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) && $(TOUCH) $(MISC)/$(TARGET)_convert_dos_flag
11828
11829 $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(MISC)/$(TARGET)_convert_dos_flag
11830
11831 @@ -232,43 +232,43 @@ patch : $(MISC)/$(TARGET)_convert_dos_flag
11832 $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
11833 @@-$(RM) $@
11834 .IF "$(CONFIGURE_ACTION)" == "none" || "$(CONFIGURE_ACTION)"==""
11835 - $(TOUCH) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
11836 + $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
11837 .ELSE # "$(CONFIGURE_ACTION)"=="none" || "$(CONFIGURE_ACTION)"==""
11838 - -$(MKDIR) $(P_CONFIGURE_DIR)
11839 + $(COMMAND_ECHO)-$(MKDIR) $(P_CONFIGURE_DIR)
11840 .IF "$(OS)"=="OS2"
11841 - cd $(P_CONFIGURE_DIR) && sh -c "$(CONFIGURE_ACTION:s!\!/!) $(CONFIGURE_FLAGS:s!\!/!)" && $(TOUCH) $(CONFIGURE_FLAG_FILE)
11842 + $(COMMAND_ECHO)cd $(P_CONFIGURE_DIR) && sh -c "$(CONFIGURE_ACTION:s!\!/!) $(CONFIGURE_FLAGS:s!\!/!)" && $(TOUCH) $(CONFIGURE_FLAG_FILE)
11843 .ELSE
11844 - cd $(P_CONFIGURE_DIR) && $(CONFIGURE_ACTION) $(CONFIGURE_FLAGS) && $(TOUCH) $(CONFIGURE_FLAG_FILE)
11845 + $(COMMAND_ECHO)cd $(P_CONFIGURE_DIR) && $(CONFIGURE_ACTION) $(CONFIGURE_FLAGS) && $(TOUCH) $(CONFIGURE_FLAG_FILE)
11846 .ENDIF
11847 - mv $(P_CONFIGURE_DIR)/$(CONFIGURE_FLAG_FILE) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
11848 + $(COMMAND_ECHO)mv $(P_CONFIGURE_DIR)/$(CONFIGURE_FLAG_FILE) $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
11849 .ENDIF # "$(CONFIGURE_ACTION)"=="none" || "$(CONFIGURE_ACTION)"==""
11850
11851
11852 $(PACKAGE_DIR)/$(BUILD_FLAG_FILE) : $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE)
11853 @@-$(RM) $@
11854 .IF "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true"
11855 - $(TOUCH) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
11856 + $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
11857 .ELSE # "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true"
11858 - -$(MKDIR) $(P_BUILD_DIR)
11859 - cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) && $(TOUCH) $(ABS_PACKAGE_DIR)/$(BUILD_FLAG_FILE)
11860 + $(COMMAND_ECHO)-$(MKDIR) $(P_BUILD_DIR)
11861 + $(COMMAND_ECHO)cd $(P_BUILD_DIR) && $(BUILD_ACTION) $(BUILD_FLAGS) && $(TOUCH) $(ABS_PACKAGE_DIR)/$(BUILD_FLAG_FILE)
11862 .ENDIF # "$(eq,x$(BUILD_ACTION:s/none//)x,xx true false)"=="true"
11863
11864 $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE) : $(PACKAGE_DIR)/$(BUILD_FLAG_FILE)
11865 @@-$(RM) $@
11866 .IF "$(INSTALL_ACTION)"=="none" || "$(INSTALL_ACTION)"==""
11867 - $(TOUCH) $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
11868 + $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
11869 .ELSE # "$(INSTALL_ACTION)"=="none" || "$(INSTALL_ACTION)"==""
11870 - -$(MKDIR) $(P_INSTALL_DIR)
11871 - -$(MKDIR) $(P_INSTALL_TARGET_DIR)
11872 - cd $(P_INSTALL_DIR) && $(INSTALL_ACTION) $(INSTALL_FLAGS) && $(TOUCH) $(INSTALL_FLAG_FILE)
11873 - mv $(P_INSTALL_DIR)/$(INSTALL_FLAG_FILE) $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
11874 + $(COMMAND_ECHO)-$(MKDIR) $(P_INSTALL_DIR)
11875 + $(COMMAND_ECHO)-$(MKDIR) $(P_INSTALL_TARGET_DIR)
11876 + $(COMMAND_ECHO)cd $(P_INSTALL_DIR) && $(INSTALL_ACTION) $(INSTALL_FLAGS) && $(TOUCH) $(INSTALL_FLAG_FILE)
11877 + $(COMMAND_ECHO)mv $(P_INSTALL_DIR)/$(INSTALL_FLAG_FILE) $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
11878 .ENDIF # "$(INSTALL_ACTION)"=="none" || "$(INSTALL_ACTION)"==""
11879
11880 $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
11881 .IF "$(OUT2LIB)"!=""
11882 - $(COPY) $(foreach,i,$(OUT2LIB) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(LB)
11883 + $(COMMAND_ECHO)$(COPY) $(foreach,i,$(OUT2LIB) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(LB)
11884 .IF "$(OS)"=="MACOSX"
11885 - $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl extshl \
11886 + $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl extshl \
11887 $(EXTRPATH) \
11888 $(shell ls $(foreach,j,$(OUT2LIB) $(LB)/$(j:f)) | \
11889 (grep -v '\.a$$' || test $$? = 1))
11890 @@ -295,15 +295,15 @@ $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)/$(INSTALL_FLAG_FILE)
11891 .ENDIF # "$(GUI)$(COM)$(COMEX)"=="WNTMSC12"
11892 .ENDIF # "$(OUT2BIN)"!=""
11893 .IF "$(OUT2CLASS)"!=""
11894 - $(COPY) $(foreach,i,$(OUT2CLASS) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(CLASSDIR)
11895 + $(COMMAND_ECHO)$(COPY) $(foreach,i,$(OUT2CLASS) $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/$i) $(CLASSDIR)
11896 .ENDIF # "$(OUT2BIN)"!=""
11897 - $(TOUCH) $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
11898 + $(COMMAND_ECHO)$(TOUCH) $(PACKAGE_DIR)/$(PREDELIVER_FLAG_FILE)
11899
11900 $(MISC)/$(TARFILE_ROOTDIR).done : $(MISC)/$(TARFILE_NAME).unpack $(PATCH_FILES)
11901 @-mv $(MISC)/$(TARFILE_ROOTDIR) $(MISC)/$(TARFILE_ROOTDIR).old
11902 @-rm -rf $(MISC)/$(TARFILE_ROOTDIR).old
11903 @-$(MKDIRHIER) $(MISC)$(fake_root_dir)
11904 - cd $(MISC)$(fake_root_dir) && $(subst,$(BACK_PATH),$(MBACK_PATH) $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack))
11905 + $(COMMAND_ECHO)cd $(MISC)$(fake_root_dir) && $(subst,$(BACK_PATH),$(MBACK_PATH) $(shell @$(TYPE) $(PRJ)/$(ROUT)/misc/$(TARFILE_NAME).unpack))
11906 .IF "$(P_ADDITIONAL_FILES)"!=""
11907 noop $(foreach,i,$(P_ADDITIONAL_FILES) $(shell echo dummy > $i))
11908 .ENDIF "$(P_ADDITIONAL_FILES)"!=""
11909 @@ -315,32 +315,32 @@ $(MISC)/$(TARFILE_ROOTDIR).done : $(MISC)/$(TARFILE_NAME).unpack $(PATCH_FILES)
11910 # hack to make 4nt version 4,01 work and still get propper
11911 # errorcodes for versions < 3,00
11912 #.IF "$(my4ver:s/.//:s/,//)" >= "300"
11913 -# cd $(MISC) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 )
11914 +# $(COMMAND_ECHO)cd $(MISC) && ( $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2 )
11915 #.ELSE # "$(my4ver:s/.//:s/,//)" >= "300"
11916 - cd $(MISC) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2
11917 + $(COMMAND_ECHO)cd $(MISC) && $(TYPE:s/+//) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | tr -d "\015" | patch $(PATCHFLAGS) -p2
11918 #.ENDIF # "$(my4ver:s/.//:s/,//)" >= "300"
11919 .ELSE # "$(GUI)"=="WNT"
11920 .IF "$(BSCLIENT)"=="TRUE"
11921 - cd $(MISC) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2
11922 + $(COMMAND_ECHO)cd $(MISC) && $(TYPE) $(BACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) -f $(PATCHFLAGS) -p2
11923 .ELSE # "$(BSCLIENT)"!=""
11924 - cd $(MISC) && $(TYPE) $(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2
11925 + $(COMMAND_ECHO)cd $(MISC) && $(TYPE) $(MBACK_PATH)$(PATH_IN_MODULE)/{$(PATCH_FILES)} | $(GNUPATCH) $(PATCHFLAGS) -p2
11926 .ENDIF # "$(BSCLIENT)"!=""
11927 .ENDIF # "$(GUI)"=="WNT"
11928 .IF "$(CONVERTFILES)"!=""
11929 - $(CONVERT) dos $(foreach,i,$(CONVERTFILES) $(MISC)/$(TARFILE_ROOTDIR)/$i)
11930 + $(COMMAND_ECHO)$(CONVERT) dos $(foreach,i,$(CONVERTFILES) $(MISC)/$(TARFILE_ROOTDIR)/$i)
11931 .ENDIF # "$(CONVERTFILES)"!=""
11932 .ENDIF # "$(PATCH_FILES)"!="none" && "$(PATCH_FILES)"!="
11933 .IF "$(GUI)"=="UNX"
11934 - $(TOUCH) $@
11935 + $(COMMAND_ECHO)$(TOUCH) $@
11936 .ENDIF # "$(GUI)"=="UNX"
11937
11938 .IF "$(T_ADDITIONAL_FILES)"!=""
11939 $(T_ADDITIONAL_FILES:+".dummy") : $(PACKAGE_DIR)/$(UNTAR_FLAG_FILE)
11940 @-$(MKDIRHIER) $(@:d)
11941 - -echo dummy > $@
11942 - -$(TOUCH) $@
11943 - -echo dummy > $(@:d)$(@:b)
11944 - -$(TOUCH) $(@:d)$(@:b)
11945 + $(COMMAND_ECHO)-echo dummy > $@
11946 + $(COMMAND_ECHO)-$(TOUCH) $@
11947 + $(COMMAND_ECHO)-echo dummy > $(@:d)$(@:b)
11948 + $(COMMAND_ECHO)-$(TOUCH) $(@:d)$(@:b)
11949 .ENDIF "$(T_ADDITIONAL_FILES)"!=""
11950
11951 create_patch : $(MISC)/$(TARFILE_ROOTDIR).done $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
11952 @@ -349,12 +349,12 @@ create_patch : $(MISC)/$(TARFILE_ROOTDIR).done $(PACKAGE_DIR)/$(PATCH_FLAG_FILE)
11953 @@-$(RM) $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
11954 #ignore returncode of 1 (indicates differences...)
11955 # hard coded again to get the same directory level as before. quite ugly...
11956 - -cd $(PRJ)/$(ROUT) && diff -ru misc/$(TARFILE_ROOTDIR) misc/build/$(TARFILE_ROOTDIR) | $(PERL) $(SOLARENV)/bin/cleandiff.pl | tr -d "\015" > misc/$(NEW_PATCH_FILE_NAME:f).tmp
11957 - -mv $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME) $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
11958 - -$(TOUCH) $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
11959 - $(PERL) $(SOLARENV)/bin/patch_sanitizer.pl $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak $(MISC)/$(NEW_PATCH_FILE_NAME:f).tmp $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME)
11960 + $(COMMAND_ECHO)-cd $(PRJ)/$(ROUT) && diff -ru misc/$(TARFILE_ROOTDIR) misc/build/$(TARFILE_ROOTDIR) | $(PERL) $(SOLARENV)/bin/cleandiff.pl | tr -d "\015" > misc/$(NEW_PATCH_FILE_NAME:f).tmp
11961 + $(COMMAND_ECHO)-mv $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME) $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
11962 + $(COMMAND_ECHO)-$(TOUCH) $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
11963 + $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/patch_sanitizer.pl $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak $(MISC)/$(NEW_PATCH_FILE_NAME:f).tmp $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME)
11964 @@-$(RM) $(MISC)/$(NEW_PATCH_FILE_NAME:f).tmp $(PRJ)/$(PATH_IN_MODULE)/$(NEW_PATCH_FILE_NAME).bak
11965 - $(MAKECMD) $(MAKEMACROS) patch
11966 + $(COMMAND_ECHO)$(MAKECMD) $(MAKEMACROS) patch
11967 @echo still some problems with win32 generated patches...
11968 @echo $(USQ)find your new changes in $(NEW_PATCH_FILE_NAME). don't forget to move/rename that patch and insert it in your makefiles PATCH_FILES to activate.$(USQ)
11969
11970 diff --git solenv/inc/tg_jar.mk solenv/inc/tg_jar.mk
11971 index 3974f07..24398a3 100644
11972 --- solenv/inc/tg_jar.mk
11973 +++ solenv/inc/tg_jar.mk
11974 @@ -30,6 +30,10 @@
11975 #*************************************************************************
11976
11977
11978 +.IF "$(VERBOSE)"=="FALSE"
11979 +ZIP_VERBOSITY=-q
11980 +.ENDIF
11981 +
11982 .IF "$(JARTARGETN)"!=""
11983
11984 .IF "$(JARCOMPRESS)"==""
11985 diff --git solenv/inc/tg_java.mk solenv/inc/tg_java.mk
11986 index eb94f83..305855e 100644
11987 --- solenv/inc/tg_java.mk
11988 +++ solenv/inc/tg_java.mk
11989 @@ -34,8 +34,10 @@
11990 $(CLASSDIR)/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.class .PHONY: $(MISC)/java/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.java
11991
11992 $(MISC)/java/com/sun/star/upd/$(VERSIONINFOFILE)_updversion.java .PHONY:
11993 +.IF "$(VERBOSE)" == "TRUE"
11994 @echo ------------------------------
11995 - @echo Making: $@
11996 +.ENDIF
11997 + @echo "Making: " $(@:f)
11998 @-$(MKDIRHIER) $(MISC)/java/com/sun/star/upd
11999 .IF "$(GUI)"=="UNX"
12000 @echo package com.sun.star.upd\; > $@
12001 diff --git solenv/inc/tg_lib.mk solenv/inc/tg_lib.mk
12002 index bfe9d18..2fc302a 100644
12003 --- solenv/inc/tg_lib.mk
12004 +++ solenv/inc/tg_lib.mk
12005 @@ -37,7 +37,7 @@
12006 .IF "$(LIB$(TNR)ARCHIV)" != ""
12007
12008 $(LIB$(TNR)ARCHIV) : $(LIB$(TNR)TARGET)
12009 - @echo Making: $@
12010 + @echo "Making: " $(@:f)
12011 @@-$(RM) $@
12012 .IF "$(GUI)"=="UNX"
12013 @-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
12014 @@ -54,14 +54,18 @@ $(LIB$(TNR)ARCHIV) : $(LIB$(TNR)TARGET)
12015 .IF "$(OS)" == "MACOSX"
12016 @echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
12017 .ENDIF
12018 +.IF "$(VERBOSE)" == "TRUE"
12019 @cat $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
12020 +.ENDIF
12021 @+source $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
12022 .ELSE # "$(GUI)"=="UNX"
12023 .IF "$(GUI)$(COM)"=="WNTGCC"
12024 @+-$(RM) $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
12025 @+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
12026 @+echo ranlib $(LIB$(TNR)ARCHIV) >> $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
12027 +.IF "$(VERBOSE)" == "TRUE"
12028 @cat $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
12029 +.ENDIF
12030 @+source $(MISC)/$(LIB$(TNR)ARCHIV:b).cmd
12031 .ELSE
12032 @echo just a dummy > $@
12033 @@ -73,10 +77,12 @@ $(LIB$(TNR)ARCHIV) : $(LIB$(TNR)TARGET)
12034 $(LIB$(TNR)TARGET) : $(LIB$(TNR)FILES) \
12035 $(LIB$(TNR)OBJFILES) \
12036 $(LIB$(TNR)DEPN)
12037 +.IF "$(VERBOSE)" == "TRUE"
12038 @echo using: $(LIB$(TNR)FILES)
12039 @echo using: $(LIB$(TNR)TARGET)
12040 @echo ------------------------------
12041 - @echo Making: $@
12042 +.ENDIF
12043 + @echo "Making: " $(@:f)
12044 @@-$(RM) $@
12045 .IF "$(GUI)"=="UNX"
12046 @echo $(LIB$(TNR)OBJFILES:s/.obj/.o/) | sed "s#$(PRJ:s/./\./)/$(ROUT)#$(ROUT)#g" | xargs -n 1 > $@
12047 @@ -89,7 +95,7 @@ $(LIB$(TNR)TARGET) : $(LIB$(TNR)FILES) \
12048 .ENDIF
12049
12050 .ELIF "$(GUI)"=="OS2"
12051 - $(LIBMGR) $(LIBFLAGS) $@ $(LIB$(TNR)FILES) $(LIB$(TNR)OBJFILES)
12052 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(LIB$(TNR)FILES) $(LIB$(TNR)OBJFILES)
12053 @+-$(RM) $(@:s/.lib/.lin/)
12054 .IF "$(LIB$(TNR)OBJFILES)"!=""
12055 @+$(TYPE) $(mktmp $(LIB$(TNR)OBJFILES)) > $(null,$(LIB$(TNR)OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
12056 @@ -105,7 +111,7 @@ $(LIB$(TNR)TARGET) : $(LIB$(TNR)FILES) \
12057 +$(ECHONL) $(LIB$(TNR)OBJFILES) | sed "s#$(PRJ:s/././)/$(ROUT)#$(ROUT)#g" | xargs -n1 > $@
12058 @+cat /dev/null $(LIB$(TNR)FILES) | xargs -n1 >> $@
12059 .ELSE
12060 - $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB$(TNR)FILES) $(LIB$(TNR)OBJFILES))
12061 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(LIB$(TNR)FILES) $(LIB$(TNR)OBJFILES))
12062 @-$(RM) $(@:s/.lib/.lin/)
12063 .IF "$(LIB$(TNR)OBJFILES)"!=""
12064 @$(TYPE) $(mktmp $(LIB$(TNR)OBJFILES)) > $(null,$(LIB$(TNR)OBJFILES) $(NULLDEV) $(@:s/.lib/.lin/))
12065 @@ -117,8 +123,10 @@ $(LIB$(TNR)TARGET) : $(LIB$(TNR)FILES) \
12066 .ENDIF # "$(LIB$(TNR)FILES)"!=""
12067 .ELSE # "$(GUI)"=="WNT"
12068 @-$(RM) $@
12069 - echo $(LIBMGR) r $@ $(LIB$(TNR)OBJFILES)
12070 - $(LIBMGR) r $@ $(LIB$(TNR)OBJFILES) $(LIB$(TNR)FILES) bla.lib
12071 + .IF "$(VERBOSE)" == "TRUE"
12072 + @echo $(LIBMGR) r $@ $(LIB$(TNR)OBJFILES)
12073 + .ENDIF
12074 + $(COMMAND_ECHO)$(LIBMGR) r $@ $(LIB$(TNR)OBJFILES) $(LIB$(TNR)FILES) bla.lib
12075 .ENDIF # "$(GUI)"=="WNT"
12076 .ENDIF # "$(GUI)"=="UNX"
12077 .ENDIF # "$(LIB$(TNR)TARGET)" != ""
12078 diff --git solenv/inc/tg_moz.mk solenv/inc/tg_moz.mk
12079 index cce44f8..6d61c58 100644
12080 --- solenv/inc/tg_moz.mk
12081 +++ solenv/inc/tg_moz.mk
12082 @@ -47,11 +47,11 @@ EXTRA_MOZ_TARGET+= $(XPIDL_TYPELIB_MODULE)
12083 ALLMOZ:=$(EXTRA_MOZ_TARGET) $(DO_XPIDL) $(GEN_PRCPUCFG) $(EXPORT_HEADER)
12084
12085 $(INCCOM)/%.h : %.idl
12086 - $(COPY) $< $(INCCOM)
12087 - $(XPIDL) -m header -w -I $(SOLARIDLDIR)/mozilla -I$(INCCOM) -I . -o $(INCCOM)/$* $<
12088 + $(COMMAND_ECHO)$(COPY) $< $(INCCOM)
12089 + $(COMMAND_ECHO)$(XPIDL) -m header -w -I $(SOLARIDLDIR)/mozilla -I$(INCCOM) -I . -o $(INCCOM)/$* $<
12090
12091 $(MISC)/%.xpt : %.idl
12092 - $(XPIDL) -m typelib -w -I $(SOLARIDLDIR)/mozilla -I$(INCCOM) -I . -o $(MISC)/$* $<
12093 + $(COMMAND_ECHO)$(XPIDL) -m typelib -w -I $(SOLARIDLDIR)/mozilla -I$(INCCOM) -I . -o $(MISC)/$* $<
12094
12095 .INCLUDE : target.mk
12096
12097 @@ -87,7 +87,7 @@ $(EXPORT_HEADER):
12098
12099 .IF "$(XPIDLSRCS)"!=""
12100 $(XPIDL_TYPELIB_MODULE): $(foreach,i,$(XPIDLXPT) $(MISC)/$i)
12101 - $(XPIDL_LINK) $(MISC)/$(XPIDL_MODULE).xpt $^
12102 + $(COMMAND_ECHO)$(XPIDL_LINK) $(MISC)/$(XPIDL_MODULE).xpt $^
12103 @-mkdir $(BIN)/components
12104 @$(COPY) $@ $(BIN)/components
12105 .ENDIF
12106 diff --git solenv/inc/tg_obj.mk solenv/inc/tg_obj.mk
12107 index 659af6f..64da8ab 100644
12108 --- solenv/inc/tg_obj.mk
12109 +++ solenv/inc/tg_obj.mk
12110 @@ -33,13 +33,15 @@ MKFILENAME:=TG_OBJ.MK
12111
12112 .IF "$(OBJTARGET)"!=""
12113 $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
12114 +.IF "$(VERBOSE)" == "TRUE"
12115 @echo ------------------------------
12116 - @echo Making: $@
12117 +.ENDIF
12118 + @echo "Making: " $(@:f)
12119 .IF "$(GUI)"=="OS2"
12120 .IF "$(LIBTARGET)"!="NO"
12121 @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
12122 .ENDIF # "$(LIBTARGET)"!="NO"
12123 - $(LIBMGR) $(LIBFLAGS) $@ $(&)
12124 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(&)
12125 .ENDIF # "$(GUI)"=="OS2"
12126
12127 .IF "$(GUI)"=="WNT"
12128 @@ -49,11 +51,11 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
12129 .IF "$(LIBTARGET)"!="NO"
12130 @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
12131 .ENDIF # "$(LIBTARGET)"!="NO"
12132 - $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
12133 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
12134 .ENDIF # "$(COM)"=="GCC"
12135 .ENDIF # "$(GUI)"=="WNT"
12136 .IF "$(GUI)"=="UNX"
12137 - echo $(foreach,i,$(OBJFILES:f) $(ROBJ)/$(i:s/.obj/.o/)) | xargs -n1 > $@
12138 + @echo $(foreach,i,$(OBJFILES:f) $(ROBJ)/$(i:s/.obj/.o/)) | xargs -n1 > $@
12139 .IF "$(OS)"=="MACOSX"
12140 @-nm `cat $(OBJTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
12141 .ELSE
12142 @@ -66,13 +68,15 @@ $(OBJTARGET): $(OBJFILES) $(IDLOBJFILES)
12143 .IF "$(SECOND_BUILD)"!=""
12144 .IF "$($(SECOND_BUILD)OBJTARGET)"!=""
12145 $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES)
12146 +.IF "$(VERBOSE)" == "TRUE"
12147 @echo ------------------------------
12148 - @echo Making: $@
12149 +.ENDIF
12150 + @echo "Making: " $(@:f)
12151 .IF "$(GUI)"=="OS2"
12152 .IF "$(LIBTARGET)"!="NO"
12153 @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
12154 .ENDIF # "$(LIBTARGET)"!="NO"
12155 - $(LIBMGR) $(LIBFLAGS) $@ $(&)
12156 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(&)
12157 .ENDIF # "$(GUI)"=="OS2"
12158
12159 .IF "$(GUI)"=="WNT"
12160 @@ -83,11 +87,11 @@ $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES)
12161 .IF "$(LIBTARGET)"!="NO"
12162 @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
12163 .ENDIF # "$(LIBTARGET)"!="NO"
12164 - $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
12165 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
12166 .ENDIF
12167 .ENDIF # "$(GUI)"=="WNT"
12168 .IF "$(GUI)"=="UNX"
12169 - echo $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)/$(i:s/.obj/.o/)) | xargs -n1 >> $@
12170 + @echo $(foreach,i,$(REAL_$(SECOND_BUILD)_OBJFILES:f) $(ROBJ)/$(i:s/.obj/.o/)) | xargs -n1 >> $@
12171 .ENDIF # "$(GUI)"=="UNX"
12172 .ENDIF # "$($(SECOND_BUILD)OBJTARGET)"!=""
12173 .ENDIF # "$(SECOND_BUILD)"!=""
12174 @@ -96,5 +100,5 @@ $($(SECOND_BUILD)OBJTARGET): $(REAL_$(SECOND_BUILD)_OBJFILES)
12175 .IF "$(LIBTARGET)"!="NO"
12176 @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
12177 .ENDIF # "$(LIBTARGET)"!="NO"
12178 - $(LIBMGR) $(LIBFLAGS) $@ $(&)
12179 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(&)
12180 .ENDIF # "$(GUI)"=="OS2"
12181 diff --git solenv/inc/tg_res.mk solenv/inc/tg_res.mk
12182 index c646aeb..81e5d78 100644
12183 --- solenv/inc/tg_res.mk
12184 +++ solenv/inc/tg_res.mk
12185 @@ -33,16 +33,18 @@
12186 .IF "$(RCTARGET)"!=""
12187 $(RCTARGET): $(RCFILES) \
12188 $(RCDEPN)
12189 +.IF "$(VERBOSE)" == "TRUE"
12190 @echo ------------------------------
12191 - @echo Making: $@
12192 +.ENDIF
12193 + @echo "Making: " $(@:f)
12194 .IF "$(CCNUMVER)" > "001300000000"
12195 .IF "$(MFC_INCLUDE)"!=""
12196 - $(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) -I$(MFC_INCLUDE) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS)
12197 + $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) -I$(MFC_INCLUDE) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS)
12198 .ELSE
12199 - $(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS)
12200 + $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(foreach,i,$(ATL_INCLUDE) -I$(i)) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS)
12201 .ENDIF
12202 .ELSE
12203 - $(RC) $(INCLUDE) -I$(SOLARRESDIR) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS)
12204 + $(COMMAND_ECHO)$(RC) $(INCLUDE) -I$(SOLARRESDIR) $(RCLANGFLAGS_$(@:d:d:b)) $(RCFLAGS)
12205 .ENDIF
12206 .ENDIF
12207
12208 diff --git solenv/inc/tg_rslb.mk solenv/inc/tg_rslb.mk
12209 index f5e630b..e5a12af 100644
12210 --- solenv/inc/tg_rslb.mk
12211 +++ solenv/inc/tg_rslb.mk
12212 @@ -40,11 +40,13 @@ HIDRES$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))/$(RESLIB$(TNR)
12213 #HACK cut off the dirty srs files which are included from solver
12214 RESLIB$(TNR)HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB$(TNR)SRSFILES)))
12215 $(HIDRES$(TNR)PARTICLE): $(RESLIB$(TNR)HIDFILES)
12216 +.IF "$(VERBOSE)" == "TRUE"
12217 @echo ------------------------------
12218 - @echo Making: $@
12219 +.ENDIF
12220 + @echo "Making: " $(@:f)
12221 @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
12222 # need to strip since solaris cannot handle tab-only whitespace here
12223 - $(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
12224 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(strip, $(subst,/,/ $(RESLIB$(TNR)HIDFILES))) )| xargs -s 1000 cat > $@.$(ROUT).tmp
12225 @$(RENAME) $@.$(ROUT).tmp $@
12226
12227 ALLTAR : $(HIDRES$(TNR)PARTICLE)
12228 @@ -55,9 +57,9 @@ $(RSC_MULTI$(TNR)) : \
12229 $(RESLIB$(TNR)SRSFILES) \
12230 $(RESLIB$(TNR)TARGETN) \
12231 $(RESLIB$(TNR)BMPS)
12232 - @echo using rsc multi-res feature
12233 + @echo Compiling: $(@:f)
12234 .IF "$(common_build_reslib)"!=""
12235 - $(RSC) -presponse @$(mktmp \
12236 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
12237 -r -p \
12238 $(foreach,i,$(alllangiso) -lg$i \
12239 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
12240 @@ -72,7 +74,7 @@ $(RSC_MULTI$(TNR)) : \
12241 $(RSC$(TNR)HEADER) $(RESLIB$(TNR)SRSFILES) \
12242 ) > $(NULLDEV)
12243 .ELSE # "$(common_build_reslib)"!=""
12244 - $(RSC) -presponse @$(mktmp \
12245 + $(COMMAND_ECHO)$(RSC) -presponse $(VERBOSITY) @$(mktmp \
12246 -r -p \
12247 $(foreach,i,$(alllangiso) -lg$i \
12248 $(null,$(rescharset_{$i}) $(default$(LANG_GUI)) $(rescharset_{$i})) \
12249 @@ -91,7 +93,7 @@ $(RSC_MULTI$(TNR)) : \
12250 $(RESLIB$(TNR)TARGETN): \
12251 $(RESLIB$(TNR)SRSFILES) \
12252 $(RESLIB$(TNR)BMPS)
12253 - @echo Making: $@
12254 + @echo "Making: " $(@:f)
12255 .IF "$(GUI)"=="UNX"
12256 .IF "$(common_build_reslib)"!=""
12257 @@-$(RM) $(RSC_MULTI$(TNR))
12258 diff --git solenv/inc/tg_scp.mk solenv/inc/tg_scp.mk
12259 index 5c9066c..eade103 100644
12260 --- solenv/inc/tg_scp.mk
12261 +++ solenv/inc/tg_scp.mk
12262 @@ -38,15 +38,17 @@
12263 # try to get missing parfiles
12264 $(PAR)/%.par : $(SOLARPARDIR)/%.par
12265 @@-$(MKDIRHIER) $(@:d:d)
12266 - $(COPY) $< $@
12267 + $(COMMAND_ECHO)$(COPY) $< $@
12268
12269 LOCALSCP$(TNR)FILES=$(foreach,i,$(SCP$(TNR)FILES) $(foreach,j,$(SCP$(TNR)LINK_PRODUCT_TYPE) $(PAR)/$j/$i ))
12270
12271 $(SCP$(TNR)TARGETN): $(LOCALSCP$(TNR)FILES)
12272 +.IF "$(VERBOSE)" == "TRUE"
12273 @echo ------------------------------
12274 - @echo Making: $@
12275 +.ENDIF
12276 + @echo "Making: " $(@:f)
12277 @@-$(MKDIRHIER) $(BIN)/$(SCP$(TNR)LINK_PRODUCT_TYPE)
12278 - $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP$(TNR)FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
12279 + $(COMMAND_ECHO)$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP$(TNR)FILES) $(subst,$(@:d:d:d), $(@:d:d))/$(i:+","))) -o $@
12280 .ENDIF
12281
12282 # Anweisungen fuer das Linken
12283 diff --git solenv/inc/tg_sdi.mk solenv/inc/tg_sdi.mk
12284 index 107ba27..90b327d 100644
12285 --- solenv/inc/tg_sdi.mk
12286 +++ solenv/inc/tg_sdi.mk
12287 @@ -35,8 +35,10 @@
12288
12289 .IF "$(HIDSID$(TNR)PARTICLE)"!=""
12290 $(HIDSID$(TNR)PARTICLE): $(SDI$(TNR)TARGET)
12291 +.IF "$(VERBOSE)" == "TRUE"
12292 @echo ------------------------------
12293 - @echo Making: $@
12294 +.ENDIF
12295 + @echo "Making: " $(@:f)
12296 @-$(RM) $@.$(ROUT).tmp $@
12297 @$(TYPE) $(MISC)/$(SDI$(TNR)NAME).sid | $(AWK) '$$1=="#define" { print $$2, $$3 }' > $@.$(ROUT).tmp
12298 @-$(RM) $@
12299 @@ -45,10 +47,13 @@ $(HIDSID$(TNR)PARTICLE): $(SDI$(TNR)TARGET)
12300
12301 .IF "$(SDI$(TNR)TARGET)"!=""
12302 $(SDI$(TNR)TARGET): $(SVSDI$(TNR)DEPEND) $(SDI$(TNR)NAME).sdi
12303 +.IF "$(VERBOSE)" == "TRUE"
12304 @echo ------------------------------
12305 - @echo Making: $@
12306 +.ENDIF
12307 + @echo "Making: " $(@:f)
12308 @-$(RM) $@
12309 - $(SVIDL) @$(mktmp \
12310 + $(COMMAND_ECHO)$(SVIDL) @$(mktmp \
12311 + $(VERBOSITY) \
12312 -fs$(INCCOMX)/$(SDI$(TNR)NAME).hxx \
12313 -fd$(INCCOMX)/$(SDI$(TNR)NAME).ilb \
12314 -fm$(MISC)/$(SDI$(TNR)NAME).don \
12315 diff --git solenv/inc/tg_shl.mk solenv/inc/tg_shl.mk
12316 index 75fea56..2069c3b 100644
12317 --- solenv/inc/tg_shl.mk
12318 +++ solenv/inc/tg_shl.mk
12319 @@ -88,7 +88,7 @@ SHL$(TNR)VERSIONOBJDEP:=$(VERSIONOBJ:d){$(subst,$(DLLPOSTFIX),_dflt $(SHL$(TNR)T
12320 .ENDIF # "$(GUI)" == "UNX"
12321 $(MISC)/$(SHL$(TNR)VERSIONOBJ:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL$(TNR)VERSIONOBJ:b).h
12322 # $(COPY) $(SOLARENV)/src/version.c $@
12323 - $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL$(TNR)VERSIONOBJ:b).h/ > $@
12324 + $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL$(TNR)VERSIONOBJ:b).h/ > $@
12325
12326 .INIT : $(SHL$(TNR)VERSIONOBJDEP)
12327 .ENDIF # "$(VERSIONOBJ)"!=""
12328 @@ -151,16 +151,20 @@ $(USE_SHL$(TNR)VERSIONMAP): \
12329 .ENDIF
12330 .ENDIF # "$(SHL$(TNR)OBJS)!"=""
12331 @$(TYPE) /dev/null $(SHL$(TNR)LIBS:s/.lib/.dump/) >> $@.dump
12332 - $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL$(TNR)INTERFACE) -f $(SHL$(TNR)FILTERFILE) -m $@
12333 + $(COMMAND_ECHO) $(PERL) $(SOLARENV)/bin/mapgen.pl -d $@.dump -s $(SHL$(TNR)INTERFACE) -f $(SHL$(TNR)FILTERFILE) -m $@
12334
12335 .ELSE # "$(SHL$(TNR)FILTERFILE)"!=""
12336 USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)TARGET).vmap
12337 $(USE_SHL$(TNR)VERSIONMAP) :
12338 +.IF "$(VERBOSE)" == "TRUE"
12339 @echo -----------------------------
12340 @echo SHL$(TNR)FILTERFILE not set!
12341 @echo -----------------------------
12342 @$(TOUCH) $@
12343 @echo dummy file to keep the dependencies for later use.
12344 +.ELSE
12345 + @$(TOUCH) $@
12346 +.ENDIF
12347 # force_dmake_to_error
12348 .ENDIF # "$(SHL$(TNR)FILTERFILE)"!=""
12349 .ELSE # "$(USE_SHL$(TNR)VERSIONMAP)"!=""
12350 @@ -187,25 +191,25 @@ $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP)
12351 # Its questionable if the following condition '.IF "$(COMID)"=="gcc3"' makes sense and what
12352 # happens if somebody will change it in the future
12353 .IF "$(COMID)"=="gcc3"
12354 - tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
12355 + $(COMMAND_ECHO) tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(AWK) -f $(SOLARENV)/bin/addsym.awk > $@
12356 .ELIF "$(COMNAME)"=="sunpro5"
12357 - tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
12358 + $(COMMAND_ECHO) tr -d "\015" < $(SHL$(TNR)VERSIONMAP) | $(GREP) -v $(IGNORE_SYMBOLS) > $@
12359 .ELSE # "$(COMID)"=="gcc3"
12360 - tr -d "\015" < $(SHL$(TNR)VERSIONMAP) > $@
12361 + $(COMMAND_ECHO) tr -d "\015" < $(SHL$(TNR)VERSIONMAP) > $@
12362 .ENDIF # "$(COMID)"=="gcc3"
12363 @chmod a+w $@
12364 # Mac OS X post-processing generate an exported symbols list from the generated map file
12365 # for details on exported symbols list see man ld on Mac OS X
12366 .IF "$(OS)"=="MACOSX"
12367 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
12368 - -cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
12369 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep -v "\*\|?" > $@.exported-symbols
12370 + @-cat $@ | $(AWK) -f $(SOLARENV)/bin/unxmap-to-macosx-explist.awk | grep "\*\|?" > $@.symbols-regexp
12371 # Shared libraries will be build out of the *.obj files specified in SHL?OBJS and SHL?LIBS
12372 # Extract RTTI symbols from all the objects that will be used to build a shared library
12373 .IF "$(SHL$(TNR)OBJS)"!=""
12374 -echo $(foreach,i,$(SHL$(TNR)OBJS:s/.obj/.o/) $i) | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
12375 .ENDIF
12376 .IF "$(SHL$(TNR)LIBS)"!=""
12377 - -$(TYPE) $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
12378 + $(COMMAND_ECHO)-$(TYPE) $(foreach,j,$(SHL$(TNR)LIBS) $j) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g | xargs -n1 nm -gx | $(SOLARENV)/bin/addsym-macosx.sh $@.symbols-regexp $@.symbols-regexp.tmp >> $@.exported-symbols
12379 .ENDIF
12380 # overwrite the map file generate into the local output tree with the generated
12381 # exported symbols list
12382 @@ -247,7 +251,7 @@ SHL$(TNR)LINKRESO*=$(MISC)/$(SHL$(TNR)TARGET)_res.o
12383 .IF "$(SHL$(TNR)LIBS)"!=""
12384 $(MISC)/$(SHL$(TNR)TARGET)_linkinc.ls .PHONY:
12385 @@-$(RM) $@
12386 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@
12387 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@
12388 .ENDIF # "$(SHL$(TNR)LIBS)"!=""
12389 .ENDIF
12390
12391 @@ -263,14 +267,14 @@ SHL$(TNR)LINKLIST=$(MISC)/$(SHL$(TNR)TARGET)_link.lst
12392 SHL$(TNR)LINKLISTPARAM=@$(SHL$(TNR)LINKLIST)
12393 $(SHL$(TNR)LINKLIST) : $(SHL$(TNR)LIBS)
12394 @@-$(RM) $@
12395 - $(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@
12396 + $(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL$(TNR)LIBS) $(i:s/.lib/.lin/)) >> $@
12397 .ENDIF # "$(SHL$(TNR)LIBS)"!=""
12398 .ENDIF # "$(COM)"!="GCC"
12399 .ENDIF
12400 .ENDIF # "$(SHL$(TNR)USE_EXPORTS)"=="name"
12401
12402 $(MISC)/%linkinc.ls:
12403 - echo . > $@
12404 + @echo . > $@
12405 .ENDIF # "$(linkinc)"!=""
12406
12407 .IF "$(GUI)" == "OS2"
12408 @@ -297,8 +301,10 @@ $(SHL$(TNR)TARGETN) : \
12409 $(SHL$(TNR)DEPN) \
12410 $(SHL$(TNR)IMP_ORD) \
12411 $(SHL$(TNR)LINKLIST)
12412 +.IF "$(VERBOSE)" == "TRUE"
12413 @echo ------------------------------
12414 - @echo Making: $(SHL$(TNR)TARGETN)
12415 +.ENDIF
12416 + @echo "Making: " $(@:f)
12417 .IF "$(GUI)" == "WNT"
12418 .IF "$(SHL$(TNR)DEFAULTRES)"!=""
12419 @@-$(RM) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
12420 @@ -318,10 +324,10 @@ $(SHL$(TNR)TARGETN) : \
12421 @echo $(EMQ)#define INTERNAL_NAME $(SHL$(TNR)TARGET:b) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
12422 @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
12423 .ENDIF # "$(use_shl_versions)" != ""
12424 - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
12425 + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
12426 .ENDIF # "$(SHL$(TNR)DEFAULTRES)"!=""
12427 .IF "$(SHL$(TNR)ALLRES)"!=""
12428 - $(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES)
12429 + $(COMMAND_ECHO)$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES)
12430 .IF "$(COM)"=="GCC"
12431 windres $(SHL$(TNR)LINKRES) $(SHL$(TNR)LINKRESO)
12432 .ENDIF # "$(COM)"=="GCC"
12433 @@ -368,15 +374,15 @@ $(SHL$(TNR)TARGETN) : \
12434 @@$(LS) $@
12435 @echo linking $@.manifest ...
12436 .IF "$(VISTA_MANIFEST)"!=""
12437 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12438 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12439 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12440 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12441 .ELSE
12442 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12443 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12444 .ENDIF # "$(VISTA_MANIFEST)"!=""
12445 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12446 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12447 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12448 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12449 .ELSE # "$(USE_DEFFILE)"!=""
12450 - $(SHL$(TNR)LINKER) @$(mktmp $(SHL$(TNR)LINKFLAGS) \
12451 + $(COMMAND_ECHO)$(SHL$(TNR)LINKER) @$(mktmp $(SHL$(TNR)LINKFLAGS) \
12452 $(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \
12453 $(SHL$(TNR)STACK) -out:$(SHL$(TNR)TARGETN) \
12454 -map:$(MISC)/$(@:B).map \
12455 @@ -392,16 +398,16 @@ $(SHL$(TNR)TARGETN) : \
12456 @@$(LS) $@
12457 @echo linking $@.manifest ...
12458 .IF "$(VISTA_MANIFEST)"!=""
12459 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12460 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12461 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12462 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12463 .ELSE
12464 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12465 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12466 .ENDIF # "$(VISTA_MANIFEST)"!=""
12467 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12468 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12469 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12470 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12471 .ENDIF # "$(USE_DEFFILE)"!=""
12472 .ELSE # "$(SHL$(TNR)USE_EXPORTS)"!="name"
12473 - $(SHL$(TNR)LINKER) @$(mktmp $(SHL$(TNR)LINKFLAGS) \
12474 + $(COMMAND_ECHO)$(SHL$(TNR)LINKER) @$(mktmp $(SHL$(TNR)LINKFLAGS) \
12475 $(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \
12476 $(SHL$(TNR)STACK) -out:$(SHL$(TNR)TARGETN) \
12477 -map:$(MISC)/$(@:B).map \
12478 @@ -415,18 +421,18 @@ $(SHL$(TNR)TARGETN) : \
12479 )
12480 @echo linking $@.manifest ...
12481 .IF "$(VISTA_MANIFEST)"!=""
12482 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12483 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12484 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12485 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12486 .ELSE
12487 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12488 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12489 .ENDIF # "$(VISTA_MANIFEST)"!=""
12490 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12491 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12492 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12493 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12494 .ENDIF # "$(SHL$(TNR)USE_EXPORTS)"!="name"
12495 .ELSE # "$(linkinc)"==""
12496 - -$(RM) del $(MISC)/$(SHL$(TNR)TARGET).lnk
12497 - -$(RM) $(MISC)/$(SHL$(TNR)TARGET).lst
12498 - $(TYPE) $(mktmp \
12499 + $(COMMAND_ECHO)-$(RM) del $(MISC)/$(SHL$(TNR)TARGET).lnk
12500 + $(COMMAND_ECHO)-$(RM) $(MISC)/$(SHL$(TNR)TARGET).lst
12501 + $(COMMAND_ECHO)$(TYPE) $(mktmp \
12502 $(SHL$(TNR)LINKFLAGS) \
12503 $(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \
12504 $(SHL$(TNR)STACK) $(MAPFILE) \
12505 @@ -438,17 +444,17 @@ $(SHL$(TNR)TARGETN) : \
12506 $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) \
12507 $(SHL$(TNR)LINKRES) \
12508 ) >> $(MISC)/$(SHL$(TNR)TARGET).lnk
12509 - $(TYPE) $(MISC)/$(SHL$(TNR)TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL$(TNR)TARGET).lnk
12510 - $(SHL$(TNR)LINKER) @$(MISC)/$(SHL$(TNR)TARGET).lnk
12511 + $(COMMAND_ECHO)$(TYPE) $(MISC)/$(SHL$(TNR)TARGETN:b)_linkinc.ls >> $(MISC)/$(SHL$(TNR)TARGET).lnk
12512 + $(COMMAND_ECHO)$(SHL$(TNR)LINKER) @$(MISC)/$(SHL$(TNR)TARGET).lnk
12513 @echo linking $@.manifest ...
12514 .IF "$(VISTA_MANIFEST)"!=""
12515 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12516 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12517 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12518 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12519 .ELSE
12520 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12521 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12522 .ENDIF # "$(VISTA_MANIFEST)"!=""
12523 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12524 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12525 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12526 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12527 .ENDIF # "$(linkinc)"==""
12528 .ENDIF # "$(COM)"=="GCC"
12529 .ENDIF # "$(GUI)" == "WNT"
12530 @@ -464,11 +470,13 @@ $(SHL$(TNR)TARGETN) : \
12531 @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
12532 `cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd` \
12533 >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
12534 + .IF "$(VERBOSE)" == "TRUE"
12535 @cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
12536 + .ENDIF
12537 @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
12538 @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
12539 shl $(SHL$(TNR)RPATH) $@
12540 - @echo "Making: $@.jnilib"
12541 + @echo "Making: " $(@:f).jnilib
12542 @macosx-create-bundle $@
12543 .IF "$(UPDATER)"=="YES"
12544 .IF "$(SHL$(TNR)NOCHECK)"==""
12545 @@ -481,21 +489,29 @@ $(SHL$(TNR)TARGETN) : \
12546 $(SHL$(TNR)VERSIONOBJ) -o $@ \
12547 `cat /dev/null $(SHL$(TNR)LIBS) | tr -s " " "\n" | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
12548 $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) $(LINKOUTPUT_FILTER) > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
12549 + .IF "$(VERBOSE)" == "TRUE"
12550 @cat $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
12551 + .ENDIF
12552 @+source $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
12553 .IF "$(UPDATER)"=="YES"
12554 .IF "$(SHL$(TNR)NOCHECK)"==""
12555 - -$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
12556 - $(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
12557 - $(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
12558 + $(COMMAND_ECHO)-$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
12559 + $(COMMAND_ECHO)$(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
12560 +.IF "$(VERBOSE)"=="TRUE"
12561 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
12562 +.ELSE
12563 + $(COMMAND_ECHO)$(SOLARENV)/bin/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) -- -s $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
12564 +.ENDIF
12565 .ENDIF # "$(SHL$(TNR)NOCHECK)"!=""
12566 .ENDIF # "$(UPDATER)"=="YES"
12567 .ENDIF # "$(OS)"=="MACOSX"
12568 .IF "$(UNIXVERSIONNAMES)"!=""
12569 - $(RM) $(LB)/$(SHL$(TNR)TARGETN:b)
12570 - cd $(LB) && ln -s $(SHL$(TNR)TARGETN:f) $(SHL$(TNR)TARGETN:b)
12571 + $(COMMAND_ECHO)$(RM) $(LB)/$(SHL$(TNR)TARGETN:b)
12572 + $(COMMAND_ECHO)cd $(LB) && ln -s $(SHL$(TNR)TARGETN:f) $(SHL$(TNR)TARGETN:b)
12573 .ENDIF # "$(UNIXVERSIONNAMES)"!=""
12574 +.IF "$(VERBOSE)" == "TRUE"
12575 @ls -l $@
12576 +.ENDIF
12577 .ENDIF # "$(GUI)" == "UNX"
12578
12579 .IF "$(GUI)" == "OS2"
12580 @@ -513,16 +529,16 @@ $(SHL$(TNR)TARGETN) : \
12581 # @-+echo $(EMQ)RCDATA 1 { "Build string here" }$(EMQ) >> $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
12582 .ENDIF # "$(use_shl_versions)" != ""
12583 # YD 04/07/06 seems null, confuses rc cli: -i $(SOLARTESDIR)
12584 - $(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
12585 + $(COMMAND_ECHO)$(RC) -r -DOS2 $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(SHL$(TNR)DEFAULTRES:b).rc
12586 .ENDIF # "$(SHL$(TNR)DEFAULTRES)"!=""
12587
12588 .IF "$(SHL$(TNR)ALLRES)"!=""
12589 - +$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES)
12590 + $(COMMAND_ECHO)+$(TYPE) $(SHL$(TNR)ALLRES) > $(SHL$(TNR)LINKRES)
12591 .ENDIF # "$(SHL$(TNR)ALLRES)"!=""
12592
12593 .IF "$(USE_DEFFILE)"!=""
12594
12595 - $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
12596 + $(COMMAND_ECHO)$(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(LINKFLAGSSHL) -o $@ \
12597 $(SHL$(TNR)DEF) \
12598 $(STDOBJ) \
12599 -L$(LB) \
12600 @@ -535,7 +551,7 @@ $(SHL$(TNR)TARGETN) : \
12601
12602 .ELSE # "$(USE_DEFFILE)"!=""
12603
12604 - $(SHL$(TNR)LINKER) -v $(SHL$(TNR)LINKFLAGS) \
12605 + $(COMMAND_ECHO)$(SHL$(TNR)LINKER) -v $(SHL$(TNR)LINKFLAGS) \
12606 $(LINKFLAGSSHL) $(SHL$(TNR)BASEX) \
12607 $(SHL$(TNR)STACK) -o $(SHL$(TNR)TARGETN) \
12608 $(SHL$(TNR)DEF) \
12609 @@ -553,7 +569,7 @@ $(SHL$(TNR)TARGETN) : \
12610 .ENDIF # "$(USE_DEFFILE)"!=""
12611
12612 .IF "$(SHL$(TNR)TARGET8)" != "$(SHL$(TNR)TARGET)"
12613 - +$(COPY) $@ $(@:d)$(SHL$(TNR)TARGET8).dll
12614 + $(COMMAND_ECHO)+$(COPY) $@ $(@:d)$(SHL$(TNR)TARGET8).dll
12615 .ENDIF
12616
12617 .ENDIF # "$(GUI)" == "OS2"
12618 @@ -600,8 +616,10 @@ $(SHL$(TNR)IMPLIBN): \
12619 $(SHL$(TNR)IMPLIBN): \
12620 $(SHL$(TNR)LIBS)
12621 .ENDIF
12622 - @echo ------------------------------1
12623 - @echo Making: $(SHL$(TNR)IMPLIBN)
12624 +.IF "$(VERBOSE)" == "TRUE"
12625 + @echo -------------------------------
12626 +.ENDIF
12627 + @echo "Making: " $(@:f)
12628 .IF "$(GUI)" == "WNT"
12629 .IF "$(COM)"=="GCC"
12630 @echo no ImportLibs on mingw
12631 @@ -622,7 +640,7 @@ $(SHL$(TNR)IMPLIBN): \
12632
12633 # touch creates an empty file, but this is not good for emxomfar, so
12634 # create a dummy lib here
12635 - -$(LIBMGR) $(LIBFLAGS) $@ $(SHL$(TNR)VERSIONOBJ)
12636 + $(COMMAND_ECHO)-$(LIBMGR) $(LIBFLAGS) $@ $(SHL$(TNR)VERSIONOBJ)
12637 +@echo build of $(SHL$(TNR)TARGETN) creates $@
12638
12639 .ELSE
12640 diff --git solenv/inc/tg_slo.mk solenv/inc/tg_slo.mk
12641 index cf7acfa..dfe63ee 100644
12642 --- solenv/inc/tg_slo.mk
12643 +++ solenv/inc/tg_slo.mk
12644 @@ -38,8 +38,10 @@ $(SLOTARGET): $(SLOFILES) $(IDLSLOFILES)
12645 @echo $(SLOTARGET)
12646 @echo $(&:+"\n")
12647 .ENDIF
12648 +.IF "$(VERBOSE)" == "TRUE"
12649 @echo ------------------------------
12650 - @echo Making: $@
12651 +.ENDIF
12652 + @echo "Making: " $(@:f)
12653 # @$(RM) $@
12654 .IF "$(GUI)"=="WNT"
12655 .IF "$(COM)"=="GCC"
12656 @@ -48,7 +50,7 @@ $(SLOTARGET): $(SLOFILES) $(IDLSLOFILES)
12657 .IF "$(LIBTARGET)"!="NO"
12658 @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
12659 .ENDIF # "$(LIBTARGET)"!="NO"
12660 - $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
12661 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
12662 .ENDIF # "$(COM)"=="GCC"
12663 .ENDIF # "$(GUI)"=="WNT"
12664
12665 @@ -56,11 +58,11 @@ $(SLOTARGET): $(SLOFILES) $(IDLSLOFILES)
12666 .IF "$(LIBTARGET)"!="NO"
12667 @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
12668 .ENDIF # "$(LIBTARGET)"!="NO"
12669 - $(LIBMGR) $(LIBFLAGS) $@ $(&)
12670 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(&)
12671 .ENDIF # "$(GUI)"=="OS2"
12672
12673 .IF "$(GUI)"=="UNX"
12674 - echo $(foreach,i,$(SLOFILES:f) $(RSLO)/$(i:s/.obj/.o/)) | xargs -n1 > $@
12675 + @echo $(foreach,i,$(SLOFILES:f) $(RSLO)/$(i:s/.obj/.o/)) | xargs -n1 > $@
12676 .IF "$(OS)"=="MACOSX"
12677 @-nm `cat $(SLOTARGET) | sed s\#'^'$(ROUT)\#$(PRJ)/$(ROUT)\#g` > $(@:d)$(@:b).dump
12678 .ELSE
12679 @@ -76,8 +78,10 @@ $($(SECOND_BUILD)SLOTARGET): $(REAL_$(SECOND_BUILD)_SLOFILES)
12680 @echo $(REAL_$(SECOND_BUILD)SLOTARGET)
12681 @echo $(&:+"\n")
12682 .ENDIF
12683 +.IF "$(VERBOSE)" == "TRUE"
12684 @echo ------------------------------
12685 - @echo Making: $@
12686 +.ENDIF
12687 + @echo "Making: " $(@:f)
12688 .IF "$(GUI)"=="WNT"
12689 .IF "$(COM)"=="GCC"
12690 +$(ECHONL) $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)/$(i)) | xargs -n1 > $@
12691 @@ -85,20 +89,20 @@ $($(SECOND_BUILD)SLOTARGET): $(REAL_$(SECOND_BUILD)_SLOFILES)
12692 .IF "$(LIBTARGET)"!="NO"
12693 @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
12694 .ENDIF # "$(LIBTARGET)"!="NO"
12695 - $(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
12696 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) /OUT:$@ @$(mktmp $(&:+"\n"))
12697
12698 .IF "$(GUI)"=="OS2"
12699 .IF "$(LIBTARGET)"!="NO"
12700 @-$(TYPE) $(mktmp $(&:+"\n")) > $(@:s/.lib/.lin/)
12701 .ENDIF # "$(LIBTARGET)"!="NO"
12702 - $(LIBMGR) $(LIBFLAGS) $@ $(&)
12703 + $(COMMAND_ECHO)$(LIBMGR) $(LIBFLAGS) $@ $(&)
12704 .ENDIF # "$(GUI)"=="OS2"
12705
12706 .ENDIF # "$(COM)"=="GCC"
12707 .ENDIF # "$(GUI)"=="WNT"
12708
12709 .IF "$(GUI)"=="UNX"
12710 - echo $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)/$(i:s/.obj/.o/)) | xargs -n1 > $@
12711 + @echo $(foreach,i,$(REAL_$(SECOND_BUILD)_SLOFILES:f) $(RSLO)/$(i:s/.obj/.o/)) | xargs -n1 > $@
12712 .ENDIF # "$(GUI)"=="UNX"
12713 .ENDIF # "$($(SECOND_BUILD)SLOTARGET)"!=""
12714 .ENDIF # "$(SECOND_BUILD)"!=""
12715 diff --git solenv/inc/tg_srs.mk solenv/inc/tg_srs.mk
12716 index fd3b3aa..c832939 100644
12717 --- solenv/inc/tg_srs.mk
12718 +++ solenv/inc/tg_srs.mk
12719 @@ -37,10 +37,12 @@
12720 HID$(TNR)FILES=$(foreach,i,$(SRC$(TNR)FILES:f) $(SRS)/$(i:s/.src/.hid/))
12721 HIDSRS$(TNR)PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))/$(SRS$(TNR)NAME)_srs.hid
12722 $(HIDSRS$(TNR)PARTICLE) : $(HID$(TNR)FILES)
12723 +.IF "$(VERBOSE)" == "TRUE"
12724 @echo ------------------------------
12725 - @echo Making: $@
12726 +.ENDIF
12727 + @echo "Making: " $(@:f)
12728 @-$(RM) $@
12729 - $(TYPE) $(mktmp $(subst,/,/ $(HID$(TNR)FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
12730 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(subst,/,/ $(HID$(TNR)FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
12731 @$(RENAME) $@.$(ROUT).tmp $@
12732
12733 ALLTAR : $(HIDSRS$(TNR)PARTICLE)
12734 diff --git solenv/inc/tg_wntx64.mk solenv/inc/tg_wntx64.mk
12735 index 6e1d789..cce14e7 100644
12736 --- solenv/inc/tg_wntx64.mk
12737 +++ solenv/inc/tg_wntx64.mk
12738 @@ -163,7 +163,7 @@ $(DEF1TARGETN_X64) : \
12739 @echo $(DEF1EXPORT1_X64) >>$@.tmpfile
12740 .ENDIF
12741 .IF "$(DEF1EXPORTFILE_X64)"!=""
12742 - $(TYPE) $(DEF1EXPORTFILE_X64) >> $@.tmpfile
12743 + $(COMMAND_ECHO)$(TYPE) $(DEF1EXPORTFILE_X64) >> $@.tmpfile
12744 .ENDIF
12745 @-$(RM) $@
12746 @$(RENAME) $@.tmpfile $@
12747 @@ -201,7 +201,7 @@ $(DEF2TARGETN_X64) : \
12748 @echo $(DEF2EXPORT2_X64) >>$@.tmpfile
12749 .ENDIF
12750 .IF "$(DEF2EXPORTFILE_X64)"!=""
12751 - $(TYPE) $(DEF2EXPORTFILE_X64) >> $@.tmpfile
12752 + $(COMMAND_ECHO)$(TYPE) $(DEF2EXPORTFILE_X64) >> $@.tmpfile
12753 .ENDIF
12754 @-$(RM) $@
12755 @$(RENAME) $@.tmpfile $@
12756 @@ -216,7 +216,7 @@ SHL1VERSIONOBJ_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1
12757 USE_VERSIONH_X64:=$(INCCOM)/$(SHL1VERSIONOBJ_X64:b).h
12758 SHL1VERSIONOBJDEP_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL1TARGET_X64))}$(VERSIONOBJ_X64:f)
12759 $(MISC_X64)/$(SHL1VERSIONOBJ_X64:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL1VERSIONOBJ_X64:b).h
12760 - $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ_X64:b).h/ > $@
12761 + $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL1VERSIONOBJ_X64:b).h/ > $@
12762 .INIT : $(SHL1VERSIONOBJDEP_X64)
12763 .ENDIF
12764
12765 @@ -266,10 +266,10 @@ $(SHL1TARGETN_X64) : \
12766 @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET_X64:b) >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
12767 @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
12768 .ENDIF # "$(use_shl_versions)" != ""
12769 - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS_X64) $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
12770 + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS_X64) $(MISC_X64)/$(SHL1DEFAULTRES_X64:b).rc
12771 .ENDIF # "$(SHL1DEFAULTRES_X64)"!=""
12772 .IF "$(SHL1ALLRES_X64)"!=""
12773 - $(TYPE) $(SHL1ALLRES_X64) > $(SHL1LINKRES_X64)
12774 + $(COMMAND_ECHO)$(TYPE) $(SHL1ALLRES_X64) > $(SHL1LINKRES_X64)
12775 .ENDIF # "$(SHL1ALLRES)"!=""
12776 .IF "$(USE_DEFFILE_X64)"!=""
12777 $(LINK_X64) @$(mktmp \
12778 @@ -291,13 +291,13 @@ $(SHL1TARGETN_X64) : \
12779 @@$(LS) $@
12780 @echo linking $@.manifest ...
12781 .IF "$(VISTA_MANIFEST)"!=""
12782 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12783 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12784 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12785 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12786 .ELSE
12787 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12788 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12789 .ENDIF # "$(VISTA_MANIFEST)"!=""
12790 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12791 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12792 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12793 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12794 .ELSE # "$(USE_DEFFILE)"!=""
12795 $(LINK_X64) @$(mktmp $(SHL1LINKFLAGS_X64) \
12796 $(LINKFLAGSSHL_X64) $(SHL1BASEX_X64) \
12797 @@ -315,13 +315,13 @@ $(SHL1TARGETN_X64) : \
12798 @@$(LS) $@
12799 @echo linking $@.manifest ...
12800 .IF "$(VISTA_MANIFEST)"!=""
12801 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12802 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12803 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12804 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12805 .ELSE
12806 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12807 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12808 .ENDIF # "$(VISTA_MANIFEST)"!=""
12809 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12810 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12811 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12812 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12813 .ENDIF # "$(USE_DEFFILE)"!=""
12814 # ------------------------------------------------------------------------------
12815 $(SHL1IMPLIBN_X64): \
12816 @@ -362,7 +362,7 @@ SHL2VERSIONOBJ_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2
12817 USE_VERSIONH_X64:=$(INCCOM)/$(SHL2VERSIONOBJ_X64:b).h
12818 SHL2VERSIONOBJDEP_X64:=$(VERSIONOBJ_X64:d){$(subst,$(UPD)$(DLLPOSTFIX),_dflt $(SHL2TARGET_X64))}$(VERSIONOBJ_X64:f)
12819 $(MISC_X64)/$(SHL2VERSIONOBJ_X64:b).c : $(SOLARENV)/src/version.c $(INCCOM)/$(SHL2VERSIONOBJ_X64:b).h
12820 - $(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ_X64:b).h/ > $@
12821 + $(COMMAND_ECHO)$(TYPE) $(SOLARENV)/src/version.c | $(SED) s/_version.h/$(SHL2VERSIONOBJ_X64:b).h/ > $@
12822 .INIT : $(SHL2VERSIONOBJDEP_X64)
12823 .ENDIF
12824
12825 @@ -412,10 +412,10 @@ $(SHL2TARGETN_X64) : \
12826 @echo $(EMQ)#define INTERNAL_NAME $(SHL1TARGET_X64:b) >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
12827 @echo $(EMQ)#include $(EMQ)"shlinfo.rc$(EMQ)" >> $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
12828 .ENDIF # "$(use_shl_versions)" != ""
12829 - $(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS_X64) $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
12830 + $(COMMAND_ECHO)$(RC) -DWIN32 $(INCLUDE) $(RCLINKFLAGS_X64) $(MISC_X64)/$(SHL2DEFAULTRES_X64:b).rc
12831 .ENDIF # "$(SHL2DEFAULTRES_X64)"!=""
12832 .IF "$(SHL2ALLRES_X64)"!=""
12833 - $(TYPE) $(SHL2ALLRES_X64) > $(SHL2LINKRES_X64)
12834 + $(COMMAND_ECHO)$(TYPE) $(SHL2ALLRES_X64) > $(SHL2LINKRES_X64)
12835 .ENDIF # "$(SHL2ALLRES)"!=""
12836 .IF "$(USE_DEFFILE_X64)"!=""
12837 $(LINK_X64) @$(mktmp \
12838 @@ -437,13 +437,13 @@ $(SHL2TARGETN_X64) : \
12839 @@$(LS) $@
12840 @echo linking $@.manifest ...
12841 .IF "$(VISTA_MANIFEST)"!=""
12842 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12843 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12844 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12845 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12846 .ELSE
12847 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12848 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12849 .ENDIF # "$(VISTA_MANIFEST)"!=""
12850 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12851 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12852 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12853 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12854 .ELSE # "$(USE_DEFFILE)"!=""
12855 $(LINK_X64) @$(mktmp $(SHL2LINKFLAGS_X64) \
12856 $(LINKFLAGSSHL_X64) $(SHL2BASEX_X64) \
12857 @@ -461,13 +461,13 @@ $(SHL2TARGETN_X64) : \
12858 @@$(LS) $@
12859 @echo linking $@.manifest ...
12860 .IF "$(VISTA_MANIFEST)"!=""
12861 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12862 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12863 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
12864 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);2 $(FI)
12865 .ELSE
12866 - $(IFEXIST) $@.manifest $(THEN) mt.exe -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12867 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);2 $(FI)
12868 .ENDIF # "$(VISTA_MANIFEST)"!=""
12869 - $(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12870 - $(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12871 + $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
12872 + $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
12873 .ENDIF # "$(USE_DEFFILE)"!=""
12874
12875 $(SHL2IMPLIBN_X64): \
12876 @@ -494,24 +494,24 @@ $(SLO_X64)/%.obj : %.cxx
12877 @echo ------------------------------
12878 @echo Making: $@
12879 @@-$(RM) $@ >& $(NULLDEV)
12880 - -$(MKDIR) $(@:d)
12881 - $(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
12882 + $(COMMAND_ECHO)-$(MKDIR) $(@:d)
12883 + $(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
12884
12885 $(SLO_X64)/%.obj : $(MISC)/%.c
12886 @echo ------------------------------
12887 @echo Making: $@
12888 - -$(MKDIR) $(@:d)
12889 + $(COMMAND_ECHO)-$(MKDIR) $(@:d)
12890 @@-$(RM) $@
12891 @$(TYPE) $(mktmp $(CC_X64) $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC)/$*.c )
12892 @$(ECHONL)
12893 - $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC)/$*.c )
12894 + $(COMMAND_ECHO)$(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC)/$*.c )
12895
12896 $(SLO_X64)/%.obj : %.c
12897 @echo ------------------------------
12898 @echo Making: $@
12899 - -$(MKDIR) $(@:d)
12900 + $(COMMAND_ECHO)-$(MKDIR) $(@:d)
12901 @@-$(RM) $@
12902 - $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $*.c )
12903 + $(COMMAND_ECHO)$(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $*.c )
12904
12905 .ENDIF # "$(BUILD_X64)"!=""
12906
12907 diff --git solenv/inc/tg_yxx.mk solenv/inc/tg_yxx.mk
12908 index a214ef8..b2d72e8 100644
12909 --- solenv/inc/tg_yxx.mk
12910 +++ solenv/inc/tg_yxx.mk
12911 @@ -31,24 +31,28 @@
12912
12913
12914 $(MISC)/%.cxx : %.y
12915 +.IF "$(VERBOSE)" == "TRUE"
12916 @echo ------------------------------
12917 - @echo Making: $@
12918 - tr -d "\015" < $< > $(MISC)/stripped_$<
12919 +.ENDIF
12920 + @echo "Making: " $(@:f)
12921 + $(COMMAND_ECHO)tr -d "\015" < $< > $(MISC)/stripped_$<
12922 $(BISON) $(YACCFLAGS) -o $(YACCTARGET) $(MISC)/stripped_$<
12923 # removing -f switch - avoid getting nothing when copying a file to itself
12924 @@-$(COPY:s/-f//) $@.h $(INCCOM)/$(@:b).hxx
12925 @@-$(COPY:s/-f//) $(@:d)/$(@:b).hxx $(INCCOM)/$(@:b).hxx
12926 # fail on not existing .hxx
12927 - $(TYPE) $(INCCOM)/$(@:b).hxx >& $(NULLDEV)
12928 + $(COMMAND_ECHO)$(TYPE) $(INCCOM)/$(@:b).hxx >& $(NULLDEV)
12929
12930 $(INCCOM)/yy%.cxx : %.y
12931 +.IF "$(VERBOSE)" == "TRUE"
12932 @echo ------------------------------
12933 - @echo Making: $@
12934 - tr -d "\015" < $< > $(MISC)/stripped_$<
12935 - $(BISON) $(YACCFLAGS) -o $(YACCTARGET) $(MISC)/stripped_$<
12936 +.ENDIF
12937 + @echo "Making: " $(@:f)
12938 + $(COMMAND_ECHO)tr -d "\015" < $< > $(MISC)/stripped_$<
12939 + $(COMMAND_ECHO)$(BISON) $(YACCFLAGS) -o $(YACCTARGET) $(MISC)/stripped_$<
12940 # removing -f switch - avoid getting nothing when copying a file to itself
12941 @@-$(COPY:s/-f//) $@.h $(INCCOM)/$(@:b).hxx
12942 @@-$(COPY:s/-f//) $(@:d)/$(@:b).hxx $(INCCOM)/$(@:b).hxx
12943 # fail on not existing .hxx
12944 - $(TYPE) $(INCCOM)/$(@:b).hxx >& $(NULLDEV)
12945 + $(COMMAND_ECHO)$(TYPE) $(INCCOM)/$(@:b).hxx >& $(NULLDEV)
12946
12947 diff --git solenv/inc/tg_zip.mk solenv/inc/tg_zip.mk
12948 index 8ac7bb1..03bc248 100644
12949 --- solenv/inc/tg_zip.mk
12950 +++ solenv/inc/tg_zip.mk
12951 @@ -90,50 +90,48 @@ ZIP$(TNR)HELPVAR=$(BIN)/$(ZIP$(TNR)TARGET)
12952 .ENDIF # "$(common_build_zip)"!=""
12953
12954 $(ZIP$(TNR)DEPFILE) :
12955 - echo # > $(MISC)/$(@:f)
12956 + @echo # > $(MISC)/$(@:f)
12957 .IF "$(common_build_zip)"!=""
12958 .IF "$(ZIP$(TNR)DIR)" != ""
12959 - @echo type 1
12960 - -$(MKDIRHIER) $(ZIP$(TNR)DIR)
12961 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
12962 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP$(TNR)DIR)
12963 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR)))/ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
12964 .ELSE # "$(ZIP$(TNR)DIR)" != ""
12965 - @echo type 2
12966 - -$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
12967 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/))) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(ZIP$(TNR)TARGET)_, $(@:f:b))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
12968 .ENDIF # "$(ZIP$(TNR)DIR)" != ""
12969 .ELSE # "$(common_build_zip)"!=""
12970 .IF "$(ZIP$(TNR)DIR)" != ""
12971 - @echo type 3
12972 - -$(MKDIRHIER) $(ZIP$(TNR)DIR)
12973 - $(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
12974 + $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP$(TNR)DIR)
12975 + $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR))) $(command_seperator) $(ZIPDEP) $(ZIP$(TNR)FLAGS) -prefix $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP$(TNR)DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
12976 .ELSE # "$(ZIP$(TNR)DIR)" != ""
12977 - @echo type 4
12978 - -$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
12979 + $(COMMAND_ECHO)-$(ZIPDEP) $(ZIP$(TNR)FLAGS) $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP$(TNR)EXT)/)) $(foreach,j,$(ZIP$(TNR)LIST) "{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(subst,/misc/,/bin/ $(@:db)))} $j )}") $(avoid_cvs_dir) >> $(MISC)/$(@:f)
12980 .ENDIF # "$(ZIP$(TNR)DIR)" != ""
12981 .ENDIF # "$(common_build_zip)"!=""
12982 @echo $(@:n:s#\#/#) : makefile.mk >> $(MISC)/$(@:f)
12983
12984
12985 $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS)
12986 +.IF "$(VERBOSE)" == "TRUE"
12987 @echo ------------------------------
12988 - @echo Making: $@
12989 +.ENDIF
12990 + @echo "Making: " $(@:f)
12991 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
12992 @$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
12993 @echo ------------------------------ $(eq,$?,$(?:s/delzip/zzz/) >&$(NULLDEV) )
12994 .IF "$(common_build_zip)"!=""
12995 .IF "$(ZIP$(TNR)DIR)" != ""
12996 @@-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
12997 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
12998 - $(IFEXIST) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(THEN) \
12999 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \
13000 - $(FI)
13001 - $(COPY) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $@.$(INPATH)
13002 - $(RM) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
13003 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
13004 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(THEN) \
13005 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \
13006 + $(FI)
13007 + $(COMMAND_ECHO)$(COPY) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $@.$(INPATH)
13008 + $(COMMAND_ECHO)$(RM) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
13009 .ELSE # "$(ZIP$(TNR)DIR)" != ""
13010 @@-$(GNUCOPY) -p $@ $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
13011 - zip $(ZIP$(TNR)FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
13012 - $(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
13013 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
13014 - $(FI)
13015 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP$(TNR)FLAGS) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
13016 + $(COMMAND_ECHO)$(IFEXIST) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $(THEN) \
13017 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) \
13018 + $(FI)
13019 @@-$(GNUCOPY) -p $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@) $@.$(INPATH)
13020 @-$(RM) $(subst,$(COMMON_OUTDIR),$(OUTPATH) $@)
13021 .ENDIF # "$(ZIP$(TNR)DIR)" != ""
13022 @@ -143,17 +141,17 @@ $(ZIP$(TNR)TARGETN) : delzip $(ZIP$(TNR)DEPS)
13023 .ELSE # "$(common_build_zip)"!=""
13024 .IF "$(ZIP$(TNR)DIR)" != ""
13025 @@-$(GNUCOPY) -p $@ $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
13026 - -$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
13027 - $(IFEXIST) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(THEN) \
13028 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \
13029 - $(FI)
13030 - $(COPY) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $@
13031 - $(RM) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
13032 + $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP$(TNR)HELPVAR)_, $(@:db))} $(ZIP$(TNR)DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP$(TNR)FLAGS) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(subst,LANGDIR_away/, $(ZIP$(TNR)LIST:s/LANGDIR/LANGDIR_away/)) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
13033 + $(COMMAND_ECHO)$(IFEXIST) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $(THEN) \
13034 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) \
13035 + $(FI)
13036 + $(COMMAND_ECHO)$(COPY) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT) $@
13037 + $(COMMAND_ECHO)$(RM) $(ZIP$(TNR)TMP).$(ZIP$(TNR)TARGET){$(subst,$(ZIP$(TNR)HELPVAR),_ $(@:db))}$(ZIP$(TNR)EXT)
13038 .ELSE # "$(ZIP$(TNR)DIR)" != ""
13039 - zip $(ZIP$(TNR)FLAGS) $@ $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
13040 - $(IFEXIST) $@ $(THEN) \
13041 - $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
13042 - $(FI)
13043 + $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP$(TNR)FLAGS) $@ $(foreach,j,$(ZIP$(TNR)LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP$(TNR)TARGET)_, $(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
13044 + $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
13045 + $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
13046 + $(FI)
13047 .ENDIF # "$(ZIP$(TNR)DIR)" != ""
13048 .ENDIF # "$(common_build_zip)"!=""
13049 .ENDIF
13050 diff --git solenv/inc/wntmsci11.mk solenv/inc/wntmsci11.mk
13051 index 35fd293..3d2750f 100644
13052 --- solenv/inc/wntmsci11.mk
13053 +++ solenv/inc/wntmsci11.mk
13054 @@ -71,6 +71,10 @@ CXX+= /NMttInlines
13055 CXX+= /NMttNoLines
13056 .ENDIF
13057
13058 +.IF "$(VERBOSE)" != "TRUE"
13059 +NOLOGO*=-nologo
13060 +.ENDIF
13061 +
13062 # Flags for COMEX == 11
13063
13064 # disable "warning C4675: resolved overload was found by argument-dependent
13065 @@ -223,7 +227,9 @@ CDEFS+=-DWINVER=0x0500 -D_WIN32_IE=0x0500
13066 _VC_MANIFEST_BASENAME=__VC90
13067 .ENDIF
13068
13069 -LINK=link $(NOLOGO) /MACHINE:IX86
13070 +LINK=link /MACHINE:IX86
13071 + # do *not* add $(NOLOGO) to LINK or LINKFLAGS. Strangely, the wntmsci12 linker links fine then, but exits with
13072 + # a return value 1, which makes dmake think it failed
13073 LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:"
13074 .IF "$(PRODUCT)"!="full"
13075 .ELSE
13076 @@ -331,6 +337,9 @@ RCLINK=rc
13077 RCLINKFLAGS=
13078 RCSETVERSION=
13079
13080 +MT=mt.exe
13081 +MTFLAGS=$(NOLOGO)
13082 +
13083
13084 DLLPOSTFIX=mi
13085 PCHPOST=.pch
13086 diff --git soltools/HIDCompiler/hidclex.l soltools/HIDCompiler/hidclex.l
13087 index df36c70..700a044 100755
13088 --- soltools/HIDCompiler/hidclex.l
13089 +++ soltools/HIDCompiler/hidclex.l
13090 @@ -80,6 +80,7 @@ static int nInputFileDepth = 0;
13091 #include <ctype.h>
13092
13093 int alloc_cnt = 0;
13094 +static bool bVerbose = false;
13095 void freestring( char const * ); //forward
13096
13097 char* dot2underline( char* str )
13098 @@ -156,19 +157,19 @@ void adjust_levelbuffer()
13099
13100 void freestring( char const * ptr )
13101 {
13102 - alloc_cnt--;
13103 - adjust_levelbuffer();
13104 - //fprintf(stderr,"%sinfo: freestring line %d\n",levelbuffer, __LINE__);
13105 - free(const_cast< char * >(ptr)), ptr = NULL;
13106 + alloc_cnt--;
13107 + adjust_levelbuffer();
13108 + if ( bVerbose )
13109 + fprintf(stdout,"%sinfo: freestring line %d\n",levelbuffer, __LINE__);
13110 + free(const_cast< char * >(ptr)), ptr = NULL;
13111 }
13112
13113 void makestring(char** newstr, char* oldstr)
13114 {
13115 alloc_cnt++;
13116 adjust_levelbuffer();
13117 - /*
13118 - fprintf(stderr,"%sinfo: makestring on line %d\n",levelbuffer,__LINE__);
13119 - */
13120 + if ( bVerbose )
13121 + fprintf(stdout,"%sinfo: makestring on line %d\n",levelbuffer,__LINE__);
13122 strcpy( (*newstr=(char*)malloc(strlen(oldstr)+1)), oldstr);
13123 if( *newstr==NULL ) {
13124 fprintf( stderr,
13125 @@ -284,10 +285,11 @@ public:
13126 if( ring[ringpos] != NULL )
13127 freestring( ring[ringpos] ); /*otherwise: memory lost*/
13128 ring[ ringpos ] = id;
13129 - //fprintf(stderr,
13130 - // "info: ring[%d] == %s broken==%d \n"
13131 - // ,ringpos,ring[ringpos],broken
13132 - // );
13133 + if ( bVerbose )
13134 + fprintf(stdout,
13135 + "info: ring[%d] == %s broken==%d \n"
13136 + ,ringpos,ring[ringpos],broken
13137 + );
13138
13139 if( !(ringpos==0 && last==-1) )
13140 last = (++last) % MAXRING;
13141 @@ -492,7 +494,7 @@ num4tag (([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
13142 FILE* pFile = NULL;
13143 pFile = fopen( NewFile, "r" );
13144 if( pFile == NULL ) {
13145 - fprintf( stderr, "warning: could not open inputfile %s \n", NewFile );
13146 + fprintf( stdout, "warning: could not open inputfile %s \n", NewFile );
13147 // try the new *_tmpl.src version instead
13148 // this hack was introduced to allow localisation of included src files
13149 const char* sStrTmpl = "_tmpl";
13150 @@ -513,7 +515,8 @@ num4tag (([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
13151 InputFiles[ nInputFileDepth ] = yy_create_buffer( pFile, YY_BUF_SIZE );
13152 yy_switch_to_buffer( InputFiles[ nInputFileDepth ] );
13153
13154 - printf( "%s //ATTENTION!! %s gets included here\n", yytext, NewFile );
13155 + if ( bVerbose )
13156 + fprintf( stdout, "%s //ATTENTION!! %s gets included here\n", yytext, NewFile );
13157 fprintf( outfile, "// %s //ATTENTION!! %s gets included here\n\n", yytext, NewFile );
13158 }
13159
13160 @@ -573,7 +576,8 @@ num4tag (([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
13161
13162 <EXCLUDE_STATE>"{" {
13163 exclude_bracelevel += 1;
13164 - //fprintf( stderr,"info: lev %d : found {\n", exclude_bracelevel );
13165 + if ( bVerbose )
13166 + fprintf( stdout,"info: lev %d : found {\n", exclude_bracelevel );
13167 }
13168
13169
13170 @@ -616,8 +620,8 @@ num4tag (([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
13171 globalKLASSE= ares->klasse;
13172 }
13173
13174 - //fprintf(stderr,"info: { level: %d\n", level);
13175 - //
13176 + if ( bVerbose )
13177 + fprintf(stdout,"info: { level: %d\n", level);
13178
13179 lasttoken = TOK_OPENBRACE;
13180 ring->set_zero();
13181 @@ -626,7 +630,8 @@ num4tag (([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
13182 <EXCLUDE_STATE>"}" {
13183 //-----------------------------
13184 exclude_bracelevel -= 1;
13185 - //fprintf( stderr,"info: lev %d : found }\n", exclude_bracelevel );
13186 + if ( bVerbose )
13187 + fprintf( stdout,"info: lev %d : found }\n", exclude_bracelevel );
13188 if( exclude_bracelevel==1 ) {
13189 BEGIN INITIAL;
13190 exclude_bracelevel=0;
13191 @@ -636,7 +641,8 @@ num4tag (([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
13192
13193 \n |
13194 "}" {
13195 - //fprintf(stderr,"info: } level: %d\n",level);
13196 + if ( bVerbose )
13197 + fprintf(stdout,"info: } level: %d\n",level);
13198
13199 if( !strcmp(yytext,"}") )
13200 ;
13201 @@ -781,7 +787,8 @@ num4tag (([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
13202 {resstringlist} {
13203 BEGIN EXCLUDE_STATE;
13204 exclude_bracelevel = 1;
13205 - //fprintf( stderr,"info: lev %d : found exclusion\n", exclude_bracelevel );
13206 + if ( bVerbose )
13207 + fprintf( stdout,"info: lev %d : found exclusion\n", exclude_bracelevel );
13208 }
13209
13210 ^[ \t]*#define |
13211 @@ -803,12 +810,13 @@ num4tag (([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
13212 <INITIAL,EXCLUDE_STATE>{string} {
13213 ring->set_broken();
13214 lasttoken = TOK_STRING;
13215 - //printf("%6s %11s %8d %s \n",project,filename,yylineno, yytext);
13216 + if ( bVerbose )
13217 + fprintf(stdout, "%6s %11s %8d %s \n",project,filename,yylineno, yytext);
13218 }
13219
13220
13221 -<INITIAL,EXCLUDE_STATE>. { //fprintf( stderr,"warning: unused input on line %d of %s \n%s\n",
13222 - //yylineno, filename, yytext);
13223 +<INITIAL,EXCLUDE_STATE>. { if ( bVerbose ) fprintf( stdout,"warning: unused input on line %d of %s \n%s\n",
13224 + yylineno, filename, yytext);
13225 }
13226
13227 <EXCLUDE_STATE>\n {
13228 @@ -838,16 +846,27 @@ int main( int argc, char* argv[] )
13229 static char HIDCompiler[100];
13230 static char Version[100];
13231
13232 + // check for switches given on the command line
13233 + if ( ( argc > 0 ) && ( 0 == strcmp( argv[0], "-verbose" ) ) )
13234 + {
13235 + bVerbose = true;
13236 + for ( size_t i=0; i<argc-1; ++i )
13237 + {
13238 + argv[i] = argv[i+1];
13239 + --argc;
13240 + }
13241 + }
13242
13243 makeversion( Version );
13244 strcpy( HIDCompiler, Compiler );
13245 strcat( HIDCompiler, Version );
13246 strcat( HIDCompiler, Author );
13247 - fprintf( stderr, "\n %s \n\n", HIDCompiler);
13248 + if ( bVerbose )
13249 + fprintf( stdout, "\n %s \n\n", HIDCompiler);
13250 if(argc < 4) {
13251 fprintf(
13252 stderr,
13253 - "usage: hidc file.src file.c project \n"
13254 + "usage: hidc [-verbose] file.src file.c project\n"
13255 "\n"
13256 "You must give exactly 3 arguments.\n"
13257 "1 - an existing SRC file.\n"
13258 diff --git soltools/checkdll/checkdll.c soltools/checkdll/checkdll.c
13259 index ad94af7..cb5228f 100644
13260 --- soltools/checkdll/checkdll.c
13261 +++ soltools/checkdll/checkdll.c
13262 @@ -47,33 +47,39 @@ static const char *psymbol = "GetVersionInfo";
13263
13264 void usage()
13265 {
13266 - fprintf(stderr, "usage: %s <dllname>\n", pprog_name);
13267 + fprintf(stderr, "usage: %s [-s] <dllname>\n", pprog_name);
13268 return;
13269 }
13270
13271 int main(int argc, char *argv[])
13272 {
13273 int rc;
13274 + int silent=0;
13275 void *phandle;
13276 char *(*pfun)(void);
13277
13278 - if ( argc < 2 || argc > 3) {
13279 + if ( argc < 2 || argc > 4) {
13280 usage();
13281 return 1;
13282 }
13283
13284 + if ( !strcmp(argv[1],"-s") ) {
13285 + silent = 1;
13286 + ++argv, --argc;
13287 + }
13288 +
13289 if ( (rc = access( argv[1], R_OK )) == -1 ) {
13290 fprintf(stderr, "%s: ERROR: %s: %s\n",
13291 pprog_name, argv[1], strerror(errno));
13292 return 2;
13293 }
13294
13295 - printf("Checking DLL %s ...", argv[1]);
13296 + if (!silent) printf("Checking DLL %s ...", argv[1]);
13297 fflush(stdout);
13298
13299 if ( (phandle = dlopen(argv[1], RTLD_NOW)) != NULL ) {
13300 if ( (pfun = (char *(*)(void))dlsym(phandle, psymbol)) != NULL ) {
13301 - printf(": ok\n");
13302 + if (!silent) printf(": ok\n");
13303 }
13304 else
13305 {
13306 diff --git soltools/cpp/_cpp.c soltools/cpp/_cpp.c
13307 index fc60eb3..40d6ad6 100644
13308 --- soltools/cpp/_cpp.c
13309 +++ soltools/cpp/_cpp.c
13310 @@ -30,8 +30,6 @@ __cdecl
13311 time_t t;
13312 char ebuf[BUFSIZ];
13313
13314 - fprintf(stderr,"%s","cpp version 17.8.1999\n");
13315 -
13316 setbuf(stderr, ebuf);
13317 t = time(NULL);
13318 curtime = ctime(&t);
13319 diff --git udkapi/util/target.pmk udkapi/util/target.pmk
13320 index f6e7bc9..935b359 100644
13321 --- udkapi/util/target.pmk
13322 +++ udkapi/util/target.pmk
13323 @@ -30,8 +30,8 @@
13324 #*************************************************************************
13325
13326 $(OUT)$/misc$/$(TARGET).idls: makefile.mk
13327 - -$(RM) $@
13328 - $(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@
13329 + $(COMMAND_ECHO)-$(RM) $@
13330 + $(COMMAND_ECHO)$(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@
13331
13332 ALLTAR: $(OUT)$/misc$/$(TARGET).idls
13333
13334 diff --git vcl/source/window/makefile.mk vcl/source/window/makefile.mk
13335 index 75e9107..d17ea6c 100644
13336 --- vcl/source/window/makefile.mk
13337 +++ vcl/source/window/makefile.mk
13338 @@ -97,10 +97,10 @@ SLOFILES= \
13339
13340 $(INCCOM)$/cuilib.hxx: makefile.mk
13341 .IF "$(GUI)"=="UNX"
13342 - $(RM) $@
13343 - echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@
13344 + @$(RM) $@
13345 + @echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@
13346 .ELSE
13347 - echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
13348 + @echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
13349 .ENDIF
13350
13351 $(SLO)$/abstdlg.obj : $(INCCOM)$/cuilib.hxx
13352 diff --git vcl/unx/source/gdi/makefile.mk vcl/unx/source/gdi/makefile.mk
13353 index bdd400b..20055f8 100644
13354 --- vcl/unx/source/gdi/makefile.mk
13355 +++ vcl/unx/source/gdi/makefile.mk
13356 @@ -107,8 +107,8 @@ ALLTAR : $(MACOSXRC)
13357 XSALSETLIBNAME=$(DLLPRE)spa$(DLLPOSTFIX)$(DLLPOST)
13358
13359 $(INCCOM)$/rtsname.hxx:
13360 - rm -f $(INCCOM)$/rtsname.hxx ; \
13361 - echo "#define _XSALSET_LIBNAME "\"$(XSALSETLIBNAME)\" > $(INCCOM)$/rtsname.hxx
13362 + @rm -f $(INCCOM)$/rtsname.hxx ; \
13363 + echo "#define _XSALSET_LIBNAME "\"$(XSALSETLIBNAME)\" > $(INCCOM)$/rtsname.hxx
13364
13365 $(SLO)$/salpimpl.obj : $(INCCOM)$/rtsname.hxx
13366 $(SLO)$/salprnpsp.obj : $(INCCOM)$/rtsname.hxx
13367 diff --git writerfilter/source/doctok/makefile.mk writerfilter/source/doctok/makefile.mk
13368 index 15124d4..757214e 100644
13369 --- writerfilter/source/doctok/makefile.mk
13370 +++ writerfilter/source/doctok/makefile.mk
13371 @@ -127,22 +127,26 @@ DOCTOKGENHEADERS=$(DOCTOKRESOURCEIDSHXX) $(SPRMIDSHXX) $(RESOURCESHXX)
13372 DOCTOKGENFILES=$(DOCTOKGENHEADERS) $(RESOURCESCXX)
13373
13374 $(DOCTOKHXXOUTDIRCREATED):
13375 - $(MKDIRHIER) $(DOCTOKHXXOUTDIR)
13376 - $(TOUCH) $@
13377 + @$(MKDIRHIER) $(DOCTOKHXXOUTDIR)
13378 + @$(TOUCH) $@
13379
13380 $(DOCTOKGENHEADERS): $(DOCTOKHXXOUTDIRCREATED)
13381
13382 $(RESOURCESHXX): $(DOCTOKRESOURCESXSL) $(DOCTOKMODEL)
13383 - $(XSLTPROC) $(DOCTOKRESOURCESXSL) $(DOCTOKMODEL) > $@
13384 + @echo "Making: " $(@:f)
13385 + $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCESXSL) $(DOCTOKMODEL) > $@
13386
13387 $(SPRMIDSHXX): $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL)
13388 - $(XSLTPROC) $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL) > $@
13389 + @echo "Making: " $(@:f)
13390 + $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL) > $@
13391
13392 $(RESOURCESCXX): $(DOCTOKRESOURCESIMPLXSL) $(DOCTOKMODEL) $(DOCTOKRESOURCEIDSHXX) $(DOCTOKRESOURCETOOLS)
13393 - $(XSLTPROC) $(DOCTOKRESOURCESIMPLXSL) $(DOCTOKMODEL) > $@
13394 + @echo "Making: " $(@:f)
13395 + $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCESIMPLXSL) $(DOCTOKMODEL) > $@
13396
13397 $(DOCTOKRESOURCEIDSHXX): $(DOCTOKRESOURCEIDSXSL) $(DOCTOKMODEL)
13398 - $(XSLTPROC) $(DOCTOKRESOURCEIDSXSL) $(DOCTOKMODEL) > $@
13399 + @echo "Making: " $(@:f)
13400 + $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCEIDSXSL) $(DOCTOKMODEL) > $@
13401
13402 $(SLOFILES) : $(DOCTOKGENHEADERS)
13403
13404 diff --git writerfilter/source/ooxml/makefile.mk writerfilter/source/ooxml/makefile.mk
13405 index e63ac5e..b30c7cc 100644
13406 --- writerfilter/source/ooxml/makefile.mk
13407 +++ writerfilter/source/ooxml/makefile.mk
13408 @@ -181,57 +181,68 @@ GENERATEDFILES= \
13409 $(TOKENXML)
13410
13411 $(TOKENXMLTMP): $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt
13412 - $(TYPE) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt | $(SED) "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
13413 + @$(TYPE) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt | $(SED) "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
13414
13415 $(TOKENXML): tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter
13416 - $(TYPE) tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter > $@
13417 + @$(TYPE) tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter > $@
13418
13419 $(MODELPROCESSED): $(OOXMLPREPROCESSXSL) $(OOXMLMODEL)
13420 - $(XSLTPROC) $(OOXMLPREPROCESSXSL) $(OOXMLMODEL) > $@
13421 + @echo "Making: " $(@:f)
13422 + $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLPREPROCESSXSL) $(OOXMLMODEL) > $@
13423
13424 $(OOXMLHXXOUTDIRCREATED):
13425 - $(MKDIRHIER) $(OOXMLHXXOUTDIR)
13426 - $(TOUCH) $@
13427 + @$(MKDIRHIER) $(OOXMLHXXOUTDIR)
13428 + @$(TOUCH) $@
13429
13430 $(OOXMLGENHEADERS): $(OOXMLHXXOUTDIRCREATED)
13431
13432 $(OOXMLFASTTOKENSHXX): $(OOXMLFASTTOKENSXSL) $(TOKENXML)
13433 - $(XSLTPROC) $(OOXMLFASTTOKENSXSL) $(TOKENXML) > $@
13434 + @echo "Making: " $(@:f)
13435 + $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLFASTTOKENSXSL) $(TOKENXML) > $@
13436
13437 $(OOXMLFASTRESOURCESHXX): $(OOXMLFASTRESOURCESXSL) $(MODELPROCESSED)
13438 - $(XSLTPROC) $(OOXMLFASTRESOURCESXSL) $(MODELPROCESSED) > $@
13439 + @echo "Making: " $(@:f)
13440 + $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLFASTRESOURCESXSL) $(MODELPROCESSED) > $@
13441
13442 $(OOXMLFASTRESOURCESCXX): $(OOXMLFASTRESOURCEHXXS) \
13443 $(OOXMLFASTRESOURCESIMPLXSL) $(MODELPROCESSED)
13444 - $(XSLTPROC) $(OOXMLFASTRESOURCESIMPLXSL) $(MODELPROCESSED) > $@
13445 + @echo "Making: " $(@:f)
13446 + $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLFASTRESOURCESIMPLXSL) $(MODELPROCESSED) > $@
13447
13448 $(OOXMLFASTRESOURCECXXS): $(MODELPROCESSED)
13449
13450 $(OOXMLFASTRESOURCEHXXS): $(MODELPROCESSED)
13451
13452 $(OOXMLCXXOUTDIR)$/OOXMLfastresources%.cxx: fastresourcesimpl%.xsl
13453 - $(XSLTPROC) $< $(MODELPROCESSED) > $@
13454 + @echo "Making: " $(@:f)
13455 + $(COMMAND_ECHO)$(XSLTPROC) $< $(MODELPROCESSED) > $@
13456
13457 $(OOXMLHXXOUTDIR)$/OOXMLfastresources%.hxx: fastresources%.xsl
13458 - $(XSLTPROC) $< $(MODELPROCESSED) > $@
13459 + @echo "Making: " $(@:f)
13460 + $(COMMAND_ECHO)$(XSLTPROC) $< $(MODELPROCESSED) > $@
13461
13462 $(OOXMLVALUESHXX): $(OOXMLVALUESXSL) $(MODELPROCESSED)
13463 - $(XSLTPROC) $(OOXMLVALUESXSL) $(MODELPROCESSED) > $@
13464 + @echo "Making: " $(@:f)
13465 + $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLVALUESXSL) $(MODELPROCESSED) > $@
13466
13467 $(OOXMLVALUESCXX): $(OOXMLVALUESIMPLXSL) $(MODELPROCESSED) \
13468 $(OOXMLFASTRESOURCESHXX)
13469 - $(XSLTPROC) $(OOXMLVALUESIMPLXSL) $(MODELPROCESSED) > $@
13470 + @echo "Making: " $(@:f)
13471 + $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLVALUESIMPLXSL) $(MODELPROCESSED) > $@
13472
13473 $(OOXMLRESOURCEIDSHXX): $(OOXMLHXXOUTDIRCREATED) $(OOXMLRESOURCEIDSXSL) \
13474 $(MODELPROCESSED)
13475 - $(XSLTPROC) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED) > $@
13476 + @echo "Making: " $(@:f)
13477 + $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED) > $@
13478
13479 $(OOXMLNAMESPACEIDSHXX): $(OOXMLHXXOUTDIRCREATED) $(OOXMLNAMESPACEIDSXSL) \
13480 $(MODELPROCESSED)
13481 - $(XSLTPROC) $(OOXMLNAMESPACEIDSXSL) $(MODELPROCESSED) > $@
13482 + @echo "Making: " $(@:f)
13483 + $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLNAMESPACEIDSXSL) $(MODELPROCESSED) > $@
13484
13485 $(GPERFFASTTOKENHXX): $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED)
13486 - $(XSLTPROC) $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED) | tr -d '\r' | gperf -I -t -E -S1 -c -G -LC++ > $@
13487 + @echo "Making: " $(@:f)
13488 + $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED) | tr -d '\r' | gperf -I -t -E -S1 -c -G -LC++ > $@
13489
13490 $(SLOFASTNAMESPACES): $(OOXMLFASTRESOURCESCXX) $(OOXMLGENHEADERS)
13491
13492 @@ -248,7 +259,7 @@ $(SLOFASTNAMESPACES): OOXMLFastHelper.hxx
13493 .PHONY: genclean genmake genheaders
13494
13495 genclean:
13496 - rm -f $(GENERATEDFILES)
13497 + @rm -f $(GENERATEDFILES)
13498
13499 genmake: $(GENERATEDFILES)
13500
13501 diff --git writerfilter/source/resourcemodel/makefile.mk writerfilter/source/resourcemodel/makefile.mk
13502 index 6bb943d..72cd9f4 100644
13503 --- writerfilter/source/resourcemodel/makefile.mk
13504 +++ writerfilter/source/resourcemodel/makefile.mk
13505 @@ -142,18 +142,21 @@ GENERATEDFILES= \
13506 $(SPRMCODETOSTRTMP)
13507
13508 $(OOXMLQNAMETOSTRTMP): $(OOXMLQNAMETOSTRXSL) $(MODELPROCESSED)
13509 - $(XSLTPROC) $(OOXMLQNAMETOSTRXSL:s!\!/!) $(MODELPROCESSED) > $@
13510 + @echo "Making: " $(@:f)
13511 + $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLQNAMETOSTRXSL:s!\!/!) $(MODELPROCESSED) > $@
13512
13513 $(DOCTOKQNAMETOSTRTMP): $(DOCTOKQNAMETOSTRXSL) $(DOCTOKMODEL)
13514 - $(XSLTPROC) $(DOCTOKQNAMETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@
13515 + @echo "Making: " $(@:f)
13516 + $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKQNAMETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@
13517
13518 $(QNAMETOSTRCXX): $(OOXMLQNAMETOSTRTMP) $(DOCTOKQNAMETOSTRTMP) qnametostrheader qnametostrfooter $(OOXMLRESOURCESTOOLSXSL) $(DOCTOKRESOURCETOOLS)
13519 - $(TYPE) qnametostrheader $(OOXMLQNAMETOSTRTMP) $(DOCTOKQNAMETOSTRTMP) qnametostrfooter > $@
13520 + @$(TYPE) qnametostrheader $(OOXMLQNAMETOSTRTMP) $(DOCTOKQNAMETOSTRTMP) qnametostrfooter > $@
13521 $(SPRMCODETOSTRTMP): $(DOCTOKSPRMCODETOSTRXSL) $(DOCTOKMODEL)
13522 - $(XSLTPROC) $(DOCTOKSPRMCODETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@
13523 + @echo "Making: " $(@:f)
13524 + $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKSPRMCODETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@
13525
13526 $(SPRMCODETOSTRCXX): sprmcodetostrheader $(SPRMCODETOSTRTMP) sprmcodetostrfooter
13527 - $(TYPE) $< > $@
13528 + @$(TYPE) $< > $@
13529
13530 $(SLO)$/sprmcodetostr.obj: $(SPRMCODETOSTRCXX)
13531 $(SLO)$/qnametostr.obj: $(QNAMETOSTRCXX)
13532 @@ -161,29 +164,33 @@ $(SLO)$/qnametostr.obj: $(QNAMETOSTRCXX)
13533 $(SLOFILES): $(GENERATEDHEADERS)
13534
13535 $(DOCTOKHXXOUTDIRCREATED):
13536 - $(MKDIRHIER) $(DOCTOKHXXOUTDIR)
13537 - $(TOUCH) $@
13538 + @$(MKDIRHIER) $(DOCTOKHXXOUTDIR)
13539 + @$(TOUCH) $@
13540
13541 $(DOCTOKRESOURCEIDSHXX): $(DOCTOKHXXOUTDIRCREATED) $(DOCTOKRESOURCETOOLS) $(DOCTOKRESOURCEIDSXSL)
13542 - $(XSLTPROC) $(DOCTOKRESOURCEIDSXSL:s!\!/!) $(DOCTOKMODEL) > $@
13543 + @echo "Making: " $(@:f)
13544 + $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCEIDSXSL:s!\!/!) $(DOCTOKMODEL) > $@
13545
13546 $(OOXMLHXXOUTDIRCREATED):
13547 - $(MKDIRHIER) $(OOXMLHXXOUTDIR)
13548 - $(TOUCH) $@
13549 + @$(MKDIRHIER) $(OOXMLHXXOUTDIR)
13550 + @$(TOUCH) $@
13551
13552 $(MODELPROCESSED): $(OOXMLMODEL) $(OOXMLRESOURCESTOOLSXSL) $(OOXMLPREPROCESSXSL)
13553 - $(XSLTPROC) $(OOXMLPREPROCESSXSL:s!\!/!) $(OOXMLMODEL) > $@
13554 + @echo "Making: " $(@:f)
13555 + $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLPREPROCESSXSL:s!\!/!) $(OOXMLMODEL) > $@
13556
13557 $(OOXMLRESOURCEIDSHXX): $(OOXMLHXXOUTDIRCREATED) $(OOXMLRESOURCESTOOLSXSL) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED)
13558 - $(XSLTPROC) $(OOXMLRESOURCEIDSXSL:s!\!/!) $(MODELPROCESSED) > $@
13559 + @echo "Making: " $(@:f)
13560 + $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLRESOURCEIDSXSL:s!\!/!) $(MODELPROCESSED) > $@
13561
13562 $(SPRMIDSHXX): $(DOCTOKHXXOUTDIRCREATED) $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL)
13563 - $(XSLTPROC) $(DOCTOKSPRMIDSXSL:s!\!/!) $(DOCTOKMODEL) > $@
13564 + @echo "Making: " $(@:f)
13565 + $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKSPRMIDSXSL:s!\!/!) $(DOCTOKMODEL) > $@
13566
13567 .PHONY: genclean genmake gendirs
13568
13569 genclean:
13570 - rm -f $(GENERATEDFILES)
13571 + @rm -f $(GENERATEDFILES)
13572
13573 genmake: $(GENERATEDFILES)
13574
vba interoperability for OOo