have buildno invocation conform to VERBOSE setting

svn path=/branches/xmlbuildsystem/; revision=14095

diff --git a/reactos/Makefile b/reactos/Makefile
index 7843c79..4990f96 100644 (file)
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -32,17 +32,21 @@ endif
 ifeq ($(VERBOSE),no)
   Q = @
   HALFVERBOSEECHO = no
 ifeq ($(VERBOSE),no)
   Q = @
   HALFVERBOSEECHO = no

+  BUILDNO_QUIET = -q

 else
 ifeq ($(VERBOSE),yes)
   Q =
   HALFVERBOSEECHO = no
 else
 ifeq ($(VERBOSE),yes)
   Q =
   HALFVERBOSEECHO = no

+  BUILDNO_QUIET =

 else
   Q = @
   HALFVERBOSEECHO = yes
 else
   Q = @
   HALFVERBOSEECHO = yes

+  BUILDNO_QUIET = -q

 endif
 endif
 ifeq ($(HALFVERBOSEECHO),yes)
   ECHO_MKDIR  =@echo [MKDIR]   $@
 endif
 endif
 ifeq ($(HALFVERBOSEECHO),yes)
   ECHO_MKDIR  =@echo [MKDIR]   $@

+  ECHO_BUILDNO=@echo [BUILDNO] $@

   ECHO_INVOKE =@echo [INVOKE]  $<
   ECHO_PCH    =@echo [PCH]     $@
   ECHO_CC     =@echo [CC]      $<
   ECHO_INVOKE =@echo [INVOKE]  $<
   ECHO_PCH    =@echo [PCH]     $@
   ECHO_CC     =@echo [CC]      $<


@@ -63,6 +67,7 @@ ifeq ($(HALFVERBOSEECHO),yes)
   ECHO_TEST   =@echo [TEST]    $@
 else
   ECHO_MKDIR  =
   ECHO_TEST   =@echo [TEST]    $@
 else
   ECHO_MKDIR  =

+  ECHO_BUILDNO=

   ECHO_INVOKE =
   ECHO_PCH    =
   ECHO_CC     =
   ECHO_INVOKE =
   ECHO_PCH    =
   ECHO_CC     =


@@ -143,7 +148,7 @@ EXISTS = .exists
 INTERMEDIATE_EXISTS = $(INTERMEDIATE)$(EXISTS)
 
 $(INTERMEDIATE_EXISTS):
 INTERMEDIATE_EXISTS = $(INTERMEDIATE)$(EXISTS)
 
 $(INTERMEDIATE_EXISTS):

-       ${nmkdir} $(INTERMEDIATE_NO_SLASH)
+       -${nmkdir} $(INTERMEDIATE_NO_SLASH) 2>$(NUL) >$(NUL)

        @echo . > $@
 
 NTOSKRNL_MC = ntoskrnl$(SEP)ntoskrnl.mc
        @echo . > $@
 
 NTOSKRNL_MC = ntoskrnl$(SEP)ntoskrnl.mc

diff --git a/reactos/tools/buildno/buildno.mak b/reactos/tools/buildno/buildno.mak
index 0a9109b..a027de5 100644 (file)
--- a/reactos/tools/buildno/buildno.mak
+++ b/reactos/tools/buildno/buildno.mak
@@ -50,4 +50,5 @@ buildno_clean:
 clean: buildno_clean
 
 $(BUILDNO_H): $(BUILDNO_TARGET)
 clean: buildno_clean
 
 $(BUILDNO_H): $(BUILDNO_TARGET)

-       $(BUILDNO_TARGET) $(BUILDNO_H)
+       $(ECHO_BUILDNO)
+       $(Q)$(BUILDNO_TARGET) $(BUILDNO_QUIET) $(BUILDNO_H)