simplified verbosity
Modified: branches/xmlbuildsystem/reactos/Makefile Modified: branches/xmlbuildsystem/reactos/tools/Makefile Modified: branches/xmlbuildsystem/reactos/tools/buildno/makefile Modified: branches/xmlbuildsystem/reactos/tools/cdmake/makefile Modified: branches/xmlbuildsystem/reactos/tools/nci/makefile Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile Modified: branches/xmlbuildsystem/reactos/tools/unicode/makefile Modified: branches/xmlbuildsystem/reactos/tools/wmc/makefile Modified: branches/xmlbuildsystem/reactos/tools/wpp/Makefile Modified: branches/xmlbuildsystem/reactos/tools/wrc/makefile
--- branches/xmlbuildsystem/reactos/Makefile 2005-03-10 17:46:44 UTC (rev 13914) +++ branches/xmlbuildsystem/reactos/Makefile 2005-03-10 19:56:46 UTC (rev 13915) @@ -1,16 +1,53 @@
# 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 @@ -77,7 +114,7 @@
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
--- branches/xmlbuildsystem/reactos/tools/Makefile 2005-03-10 17:46:44 UTC (rev 13914) +++ branches/xmlbuildsystem/reactos/tools/Makefile 2005-03-10 19:56:46 UTC (rev 13915) @@ -14,11 +14,11 @@
RMKDIR_HOST_LFLAGS = -g $(RMKDIR_TARGET): $(RMKDIR_OBJECTS)
- $(HALFVERBOSEECHO) [LD] $@
+ $(ECHO_LD)
${host_gcc} $(RMKDIR_OBJECTS) $(RMKDIR_HOST_LFLAGS) -o $(RMKDIR_TARGET)
$(RMKDIR_OBJECTS): %.o : %.c
- $(HALFVERBOSEECHO) [CC] $<
+ $(ECHO_CC)
${host_gcc} $(RMKDIR_HOST_CFLAGS) -c $< -o $@
.PHONY: rmkdir_clean
@@ -43,11 +43,11 @@
RSYM_HOST_LFLAGS = -g $(RSYM_TARGET): $(RSYM_OBJECTS)
- $(HALFVERBOSEECHO) [LD] $@
+ $(ECHO_LD)
${host_gcc} $(RSYM_OBJECTS) $(RSYM_HOST_LFLAGS) -o $(RSYM_TARGET)
$(RSYM_OBJECTS): %.o : %.c
- $(HALFVERBOSEECHO) [CC] $<
+ $(ECHO_CC)
${host_gcc} $(RSYM_HOST_CFLAGS) -c $< -o $@
.PHONY: rsym_clean
--- branches/xmlbuildsystem/reactos/tools/buildno/makefile 2005-03-10 17:46:44 UTC (rev 13914) +++ branches/xmlbuildsystem/reactos/tools/buildno/makefile 2005-03-10 19:56:46 UTC (rev 13915) @@ -17,11 +17,11 @@
BUILDNO_HOST_LFLAGS = -g $(BUILDNO_TARGET): $(BUILDNO_OBJECTS)
- $(HALFVERBOSEECHO) [LD] $@
+ $(ECHO_LD)
${host_gpp} $(BUILDNO_OBJECTS) $(BUILDNO_HOST_CFLAGS) -o $(BUILDNO_TARGET)
$(BUILDNO_OBJECTS): %.o : %.cpp include$(SEP)reactos$(SEP)version.h
- $(HALFVERBOSEECHO) [CC] $<
+ $(ECHO_CC)
${host_gpp} $(BUILDNO_HOST_CFLAGS) -c $< -o $@
.PHONY: buildno_clean
--- branches/xmlbuildsystem/reactos/tools/cdmake/makefile 2005-03-10 17:46:44 UTC (rev 13914) +++ branches/xmlbuildsystem/reactos/tools/cdmake/makefile 2005-03-10 19:56:46 UTC (rev 13915) @@ -15,11 +15,11 @@
CDMAKE_HOST_LFLAGS = -g $(CDMAKE_TARGET): $(CDMAKE_OBJECTS)
- $(HALFVERBOSEECHO) [LD] $@
+ $(ECHO_LD)
${host_gcc} $(CDMAKE_OBJECTS) $(CDMAKE_HOST_CFLAGS) -o $(CDMAKE_TARGET)
$(CDMAKE_OBJECTS): %.o : %.c
- $(HALFVERBOSEECHO) [CC] $<
+ $(ECHO_CC)
${host_gcc} $(CDMAKE_CFLAGS) -c $< -o $@
.PHONY: cdmake_clean
--- branches/xmlbuildsystem/reactos/tools/nci/makefile 2005-03-10 17:46:44 UTC (rev 13914) +++ branches/xmlbuildsystem/reactos/tools/nci/makefile 2005-03-10 19:56:46 UTC (rev 13915) @@ -14,11 +14,11 @@
NCI_HOST_LFLAGS = -g $(NCI_TARGET): $(NCI_OBJECTS)
- $(HALFVERBOSEECHO) [LD] $@
+ $(ECHO_LD)
${host_gcc} $(NCI_OBJECTS) $(NCI_HOST_CFLAGS) -o $(NCI_TARGET)
$(NCI_OBJECTS): %.o : %.c
- $(HALFVERBOSEECHO) [CC] $<
+ $(ECHO_CC)
${host_gcc} $(NCI_HOST_CFLAGS) -c $< -o $@
.PHONY: nci_clean
@@ -47,7 +47,7 @@
$(WIN32K_USER_STUBS) $(NCI_SERVICE_FILES): $(NCI_TARGET)
- $(HALFVERBOSEECHO) [NCI] $@
+ $(ECHO_NCI)
$(Q)$(EXEPREFIX)$(NCI_TARGET) \ $(KERNEL_SVC_DB) \ $(WIN32K_SVC_DB) \
--- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-03-10 17:46:44 UTC (rev 13914) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-03-10 19:56:46 UTC (rev 13915) @@ -726,7 +726,7 @@
"%s: %s\n", objectFilename.c_str (), deps.c_str () );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [CC] $<\n" );
+ fprintf ( fMakefile, "\t$(ECHO_CC)\n" );
fprintf ( fMakefile, "\t%s -c %s -o %s %s\n", cc.c_str (), @@ -746,7 +746,7 @@
"%s: %s\n", objectFilename.c_str (), sourceFilename.c_str () );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [GAS] $<\n" );
+ fprintf ( fMakefile, "\t$(ECHO_GAS)\n" );
fprintf ( fMakefile, "\t%s -x assembler-with-cpp -c %s -o %s -D__ASM__ %s\n", cc.c_str (), @@ -765,7 +765,7 @@
"%s: %s\n", objectFilename.c_str (), sourceFilename.c_str () );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [NASM] $<\n" );
+ fprintf ( fMakefile, "\t$(ECHO_NASM)\n" );
fprintf ( fMakefile, "\t%s -f win32 %s -o %s %s\n", "$(Q)nasm", @@ -788,7 +788,7 @@
"%s: %s\n", objectFilename.c_str (), sourceFilename.c_str () );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [WRC] $@\n" );
+ fprintf ( fMakefile, "\t$(ECHO_WRC)\n" );
fprintf ( fMakefile,
"\t${gcc} -xc -E -DRC_INVOKED ${%s} %s > %s\n",
windresflagsMacro.c_str (),
@@ -829,7 +829,7 @@
"%s: %s\n", def_file.c_str (), sourceFilename.c_str () );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [WINEBLD] $@\n" );
+ fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" );
fprintf ( fMakefile,
"\t%s --def=%s -o %s\n",
"${winebuild}",
@@ -840,7 +840,7 @@
"%s: %s\n", stub_file.c_str (), sourceFilename.c_str () );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [WINEBLD] $@\n" );
+ fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" );
fprintf ( fMakefile,
"\t%s --pedll=%s -o %s\n",
"${winebuild}",
@@ -929,7 +929,7 @@
const string& libsMacro,
string_list& clean_files ) const
{
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [LD] $@\n" );
+ fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
string targetName ( module.GetTargetName () ); string target ( FixupTargetFilename ( module.GetPath () ) ); if ( module.importLibrary != NULL ) @@ -996,7 +996,7 @@
GetLinkerMacro ( module ).c_str () ); }
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [RSYM] $@\n" );
+ fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" );
fprintf ( fMakefile,
"\t${rsym} %s %s\n\n",
target.c_str (),
@@ -1066,7 +1066,7 @@
"%s: %s\n", gch_file.c_str(), pch_file.c_str() );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [PCH] $@\n" );
+ fprintf ( fMakefile, "\t$(ECHO_PCH)\n" );
fprintf ( fMakefile, "\t%s -c %s -o %s %s\n\n", @@ -1115,7 +1115,7 @@
archiveFilename.c_str (), objs_macro.c_str ());
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [AR] $@\n" );
+ fprintf ( fMakefile, "\t$(ECHO_AR)\n" );
fprintf ( fMakefile, "\t%s -rc %s %s\n\n", @@ -1320,7 +1320,7 @@
"%s: %s\n", invoke.GetTargets ().c_str (), FixupTargetFilename ( invoke.invokeModule->GetPath () ).c_str () );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [INVOKE] $<\n" );
+ fprintf ( fMakefile, "\t$(ECHO_INVOKE)\n" );
fprintf ( fMakefile, "\t%s %s\n\n", FixupTargetFilename ( invoke.invokeModule->GetPath () ).c_str (), @@ -1415,7 +1415,7 @@
library_target.c_str (), definitionDependencies.c_str () );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [DLLTOOL] $@\n" );
+ fprintf ( fMakefile, "\t$(ECHO_DLLTOOL)\n" );
string killAt = module.mangledSymbols ? "" : "--kill-at"; fprintf ( fMakefile, @@ -1506,7 +1506,7 @@
target.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str () );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [LD] $@\n" );
+ fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
fprintf ( fMakefile, "\t%s %s -o %s %s %s\n\n", linker.c_str (), @@ -1561,7 +1561,7 @@
target.c_str (), objectsMacro.c_str (), linkDepsMacro.c_str () );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [LD] $@\n" );
+ fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
fprintf ( fMakefile,
"\t${gcc} %s %s -Wl,--base-file,%s -o %s %s %s\n",
GetLinkerMacro ( module ).c_str (),
@@ -1594,7 +1594,7 @@
fprintf ( fMakefile,
"\t-@${rm} %s\n",
temp_exp.c_str () );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [RSYM] $@\n" );
+ fprintf ( fMakefile, "\t$(ECHO_RSYM)\n" );
fprintf ( fMakefile,
"\t${rsym} %s %s\n\n",
target.c_str (),
@@ -1914,7 +1914,7 @@
if ( extension == ".rc" || extension == ".RC" )
{
string resource = FixupTargetFilename ( file.name );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [BIN2RES] $<\n" );
+ fprintf ( fMakefile, "\t$(ECHO_BIN2RES)\n" );
fprintf ( fMakefile, "\t@:echo ${bin2res} -f -x %s\n",
resource.c_str () );
}
@@ -2130,7 +2130,7 @@
objectsMacro.c_str (), linkDepsMacro.c_str () );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [LD] $@\n" );
+ fprintf ( fMakefile, "\t$(ECHO_LD)\n" );
fprintf ( fMakefile,
"\t${ld} %s -N -Ttext=0x8000 -o %s %s %s\n",
@@ -2346,7 +2346,7 @@
isoboot.c_str (), cdDirectories.c_str (), cdFiles.c_str () );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [CABMAN] $<\n" );
+ fprintf ( fMakefile, "\t$(ECHO_CABMAN)\n" );
fprintf ( fMakefile,
"\t${cabman} -C %s -L %s -I\n",
reactosDff.c_str (),
@@ -2363,7 +2363,7 @@
module ); OutputCdfileCopyCommands ( bootcdDirectory, module );
- fprintf ( fMakefile, "\t$(HALFVERBOSEECHO) [CDMAKE] $@\n" );
+ fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" );
fprintf ( fMakefile,
"\t${cdmake} -v -m -b %s %s REACTOS ReactOS.iso\n",
isoboot.c_str (),
--- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-03-10 17:46:44 UTC (rev 13914) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-03-10 19:56:46 UTC (rev 13915) @@ -85,29 +85,29 @@
RBUILD_HOST_LFLAGS = -g $(RBUILD_TARGET): $(RBUILD_OBJECTS)
- $(HALFVERBOSEECHO) [LD] $@
+ $(ECHO_LD)
${host_gpp} $(RBUILD_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $(RBUILD_TARGET)
$(RBUILD_COMMON_OBJECTS): %.o: %.cpp
- $(HALFVERBOSEECHO) [CC] $<
+ $(ECHO_CC)
${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
$(RBUILD_SPECIAL_OBJECTS): %.o: %.cpp
- $(HALFVERBOSEECHO) [CC] $<
+ $(ECHO_CC)
${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
$(RBUILD_TEST_TARGET): $(RBUILD_TEST_OBJECTS)
- $(HALFVERBOSEECHO) [LD] $@
+ $(ECHO_LD)
${host_gpp} $(RBUILD_TEST_OBJECTS) $(RBUILD_HOST_LFLAGS) -o $(RBUILD_TEST_TARGET)
$(RBUILD_TEST_SPECIAL_OBJECTS): %.o: %.cpp
- $(HALFVERBOSEECHO) [CC] $<
+ $(ECHO_CC)
${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@
.PHONY: rbuild_test
rbuild_test: $(RBUILD_TEST_TARGET)
- $(HALFVERBOSEECHO) [TEST] $@
+ $(ECHO_TEST)
$(Q)$(RBUILD_TEST_TARGET) .PHONY: rbuild_clean
--- branches/xmlbuildsystem/reactos/tools/unicode/makefile 2005-03-10 17:46:44 UTC (rev 13914) +++ branches/xmlbuildsystem/reactos/tools/unicode/makefile 2005-03-10 19:56:46 UTC (rev 13915) @@ -83,12 +83,15 @@
-Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \ -I$(UNICODE_BASE) -Iinclude/wine -Iw32api/include
+.PHONY: unicode +unicode: $(UNICODE_TARGET) +
$(UNICODE_TARGET): $(UNICODE_OBJECTS)
- $(HALFVERBOSEECHO) [AR] $@
+ $(ECHO_AR)
${host_ar} -rc $(UNICODE_TARGET) $(UNICODE_OBJECTS)
$(UNICODE_OBJECTS): %.o : %.c
- $(HALFVERBOSEECHO) [CC] $<
+ $(ECHO_CC)
${host_gcc} $(UNICODE_HOST_CFLAGS) -c $< -o $@
.PHONY: unicode_clean
--- branches/xmlbuildsystem/reactos/tools/wmc/makefile 2005-03-10 17:46:44 UTC (rev 13914) +++ branches/xmlbuildsystem/reactos/tools/wmc/makefile 2005-03-10 19:56:46 UTC (rev 13915) @@ -21,11 +21,11 @@
WMC_HOST_LFLAGS = -g $(WMC_TARGET): $(WMC_OBJECTS)
- $(HALFVERBOSEECHO) [LD] $@
+ $(ECHO_LD)
${host_gcc} $(WMC_OBJECTS) $(WMC_HOST_LFLAGS) -o $(WMC_TARGET)
$(WMC_OBJECTS): %.o : %.c
- $(HALFVERBOSEECHO) [CC] $<
+ $(ECHO_CC)
${host_gcc} $(WMC_HOST_CXXFLAGS) -c $< -o $@
.PHONY: wmc_clean
--- branches/xmlbuildsystem/reactos/tools/wpp/Makefile 2005-03-10 17:46:44 UTC (rev 13914) +++ branches/xmlbuildsystem/reactos/tools/wpp/Makefile 2005-03-10 19:56:46 UTC (rev 13915) @@ -15,11 +15,11 @@
WPP_HOST_CFLAGS = -D__USE_W32API -I$(WPP_BASE) -Iinclude -Iinclude/wine -g $(WPP_TARGET): $(WPP_OBJECTS)
- $(HALFVERBOSEECHO) [AR] $@
+ $(ECHO_AR)
${host_ar} -rc $(WPP_TARGET) $(WPP_OBJECTS)
$(WPP_OBJECTS): %.o : %.c
- $(HALFVERBOSEECHO) [CC] $<
+ $(ECHO_CC)
${host_gcc} $(WPP_HOST_CFLAGS) -c $< -o $@
.PHONY: wpp_clean
--- branches/xmlbuildsystem/reactos/tools/wrc/makefile 2005-03-10 17:46:44 UTC (rev 13914) +++ branches/xmlbuildsystem/reactos/tools/wrc/makefile 2005-03-10 19:56:46 UTC (rev 13915) @@ -28,11 +28,11 @@
WRC_HOST_LFLAGS = -g $(WRC_TARGET): $(WRC_OBJECTS) $(UNICODE_TARGET) $(WPP_TARGET)
- $(HALFVERBOSEECHO) [LD] $@
+ $(ECHO_LD)
${host_gcc} $(WRC_OBJECTS) $(UNICODE_TARGET) $(WPP_TARGET) $(WRC_HOST_LFLAGS) -o $(WRC_TARGET)
$(WRC_OBJECTS): %.o : %.c
- $(HALFVERBOSEECHO) [CC] $<
+ $(ECHO_CC)
${host_gcc} $(WRC_HOST_CFLAGS) -c $< -o $@
.PHONY: wrc_clean