# Default to half-verbose mode
ifeq ($(VERBOSE),no)
Q = @
- HALFVERBOSEECHO = @:
+ HALFVERBOSEECHO = no
else
ifeq ($(VERBOSE),yes)
Q =
- HALFVERBOSEECHO = @:
+ HALFVERBOSEECHO = no
else
Q = @
- HALFVERBOSEECHO = @echo
+ HALFVERBOSEECHO = yes
endif
endif
+ifeq ($(HALFVERBOSEECHO),yes)
+ ECHO_INVOKE =@echo [INVOKE] $<
+ ECHO_PCH =@echo [PCH] $@
+ ECHO_CC =@echo [CC] $<
+ ECHO_GAS =@echo [GAS] $<
+ ECHO_NASM =@echo [NASM] $<
+ ECHO_AR =@echo [AR] $@
+ ECHO_WINEBLD=@echo [WINEBLD] $@
+ ECHO_WRC =@echo [WRC] $@
+ ECHO_BIN2RES=@echo [BIN2RES] $<
+ ECHO_DLLTOOL=@echo [DLLTOOL] $@
+ ECHO_LD =@echo [LD] $@
+ ECHO_RBUILD =@echo [RBUILD] $@
+ ECHO_RSYM =@echo [RSYM] $@
+ ECHO_NCI =@echo [NCI] $@
+ ECHO_CABMAN =@echo [CABMAN] $<
+ ECHO_CDMAKE =@echo [CDMAKE] $@
+ ECHO_TEST =@echo [TEST] $@
+else
+ ECHO_INVOKE =@true
+ ECHO_PCH =@true
+ ECHO_CC =@true
+ ECHO_GAS =@true
+ ECHO_NASM =@true
+ ECHO_AR =@true
+ ECHO_WINEBLD=@true
+ ECHO_WRC =@true
+ ECHO_BIN2RES=@true
+ ECHO_DLLTOOL=@true
+ ECHO_LD =@true
+ ECHO_RBUILD =@true
+ ECHO_RSYM =@true
+ ECHO_NCI =@true
+ ECHO_CABMAN =@true
+ ECHO_CDMAKE =@true
+ ECHO_TEST =@true
+endif
host_gcc = $(Q)gcc
makefile.auto: $(RMKDIR_TARGET) $(BUILDNO_TARGET) $(NCI_SERVICE_FILES) $(WMC_TARGET) $(WRC_TARGET) \
$(RSYM_TARGET) $(CDMAKE_TARGET) $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
- $(HALFVERBOSEECHO) [RBUILD] makefile.auto
+ $(ECHO_RBUILD)
$(Q)tools$(SEP)rbuild$(SEP)rbuild$(EXEPOSTFIX) mingw
"%s: %s\n",\r
objectFilename.c_str (),\r
deps.c_str () );\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [CC] $<\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_CC)\n" );\r
fprintf ( fMakefile,\r
"\t%s -c %s -o %s %s\n",\r
cc.c_str (),\r
"%s: %s\n",\r
objectFilename.c_str (),\r
sourceFilename.c_str () );\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [GAS] $<\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_GAS)\n" );\r
fprintf ( fMakefile,\r
"\t%s -x assembler-with-cpp -c %s -o %s -D__ASM__ %s\n",\r
cc.c_str (),\r
"%s: %s\n",\r
objectFilename.c_str (),\r
sourceFilename.c_str () );\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [NASM] $<\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_NASM)\n" );\r
fprintf ( fMakefile,\r
"\t%s -f win32 %s -o %s %s\n",\r
"$(Q)nasm",\r
"%s: %s\n",\r
objectFilename.c_str (),\r
sourceFilename.c_str () );\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [WRC] $@\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_WRC)\n" );\r
fprintf ( fMakefile,\r
"\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n",\r
windresflagsMacro.c_str (),\r
"%s: %s\n",\r
def_file.c_str (),\r
sourceFilename.c_str () );\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [WINEBLD] $@\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" );\r
fprintf ( fMakefile,\r
"\t%s --def=%s -o %s\n",\r
"${winebuild}",\r
"%s: %s\n",\r
stub_file.c_str (),\r
sourceFilename.c_str () );\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [WINEBLD] $@\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" );\r
fprintf ( fMakefile,\r
"\t%s --pedll=%s -o %s\n",\r
"${winebuild}",\r
const string& libsMacro,\r
string_list& clean_files ) const\r
{\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [LD] $@\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_LD)\n" );\r
string targetName ( module.GetTargetName () );\r
string target ( FixupTargetFilename ( module.GetPath () ) );\r
if ( module.importLibrary != NULL )\r
GetLinkerMacro ( module ).c_str () );\r
}\r
\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [RSYM] $@\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" );\r
fprintf ( fMakefile,\r
"\t${rsym} %s %s\n\n",\r
target.c_str (),\r
"%s: %s\n",\r
gch_file.c_str(),\r
pch_file.c_str() );\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [PCH] $@\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_PCH)\n" );\r
fprintf (\r
fMakefile,\r
"\t%s -c %s -o %s %s\n\n",\r
archiveFilename.c_str (),\r
objs_macro.c_str ());\r
\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [AR] $@\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_AR)\n" );\r
\r
fprintf ( fMakefile,\r
"\t%s -rc %s %s\n\n",\r
"%s: %s\n",\r
invoke.GetTargets ().c_str (),\r
FixupTargetFilename ( invoke.invokeModule->GetPath () ).c_str () );\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [INVOKE] $<\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_INVOKE)\n" );\r
fprintf ( fMakefile,\r
"\t%s %s\n\n",\r
FixupTargetFilename ( invoke.invokeModule->GetPath () ).c_str (),\r
library_target.c_str (),\r
definitionDependencies.c_str () );\r
\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [DLLTOOL] $@\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" );\r
\r
string killAt = module.mangledSymbols ? "" : "--kill-at";\r
fprintf ( fMakefile,\r
target.c_str (),\r
objectsMacro.c_str (),\r
linkDepsMacro.c_str () );\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [LD] $@\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_LD)\n" );\r
fprintf ( fMakefile,\r
"\t%s %s -o %s %s %s\n\n",\r
linker.c_str (),\r
target.c_str (),\r
objectsMacro.c_str (),\r
linkDepsMacro.c_str () );\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [LD] $@\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_LD)\n" );\r
fprintf ( fMakefile,\r
"\t${gcc} %s %s -Wl,--base-file,%s -o %s %s %s\n",\r
GetLinkerMacro ( module ).c_str (),\r
fprintf ( fMakefile,\r
"\t-@${rm} %s\n",\r
temp_exp.c_str () );\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [RSYM] $@\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" );\r
fprintf ( fMakefile,\r
"\t${rsym} %s %s\n\n",\r
target.c_str (),\r
if ( extension == ".rc" || extension == ".RC" )\r
{\r
string resource = FixupTargetFilename ( file.name );\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [BIN2RES] $<\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_BIN2RES)\n" );\r
fprintf ( fMakefile, "\t@:echo ${bin2res} -f -x %s\n",\r
resource.c_str () );\r
}\r
objectsMacro.c_str (),\r
linkDepsMacro.c_str () );\r
\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [LD] $@\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_LD)\n" );\r
\r
fprintf ( fMakefile,\r
"\t${ld} %s -N -Ttext=0x8000 -o %s %s %s\n",\r
isoboot.c_str (),\r
cdDirectories.c_str (),\r
cdFiles.c_str () );\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [CABMAN] $<\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" );\r
fprintf ( fMakefile,\r
"\t${cabman} -C %s -L %s -I\n",\r
reactosDff.c_str (),\r
module );\r
OutputCdfileCopyCommands ( bootcdDirectory,\r
module );\r
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [CDMAKE] $@\n" );\r
+ fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" );\r
fprintf ( fMakefile,\r
"\t${cdmake} -v -m -b %s %s REACTOS ReactOS.iso\n",\r
isoboot.c_str (),\r