Commit in reactos on MAIN
rules.mak+5-11.102 -> 1.103
tools/depend.mk+171.22 -> 1.23
     /helper.mk+49-111.98 -> 1.99
+71-12
3 modified files
Add half-verbose output to build system and make it the default (the old output is available via setting VERBOSE=yes)
reactos
rules.mak 1.102 -> 1.103
diff -u -r1.102 -r1.103
--- rules.mak	23 Oct 2004 21:05:11 -0000	1.102
+++ rules.mak	11 Dec 2004 16:02:22 -0000	1.103
@@ -1,8 +1,12 @@

-# Default to verbose mode

+# Default to half-verbose mode

 ifeq ($(VERBOSE),no)
   Q = @
 else

+ifeq ($(VERBOSE),yes)

   Q =

+else
+  Q = @
+endif

 endif
 
 export MAKE := @$(MAKE)
reactos/tools
depend.mk 1.22 -> 1.23
diff -u -r1.22 -r1.23
--- depend.mk	7 Sep 2004 08:20:06 -0000	1.22
+++ depend.mk	11 Dec 2004 16:02:22 -0000	1.23
@@ -31,25 +31,42 @@

 DEPENDS_PATH := $(PATH_TO_TOP)/tools
 endif
 

+ifeq ($(VERBOSE),no)
+  HALFVERBOSEECHO = :
+else
+ifeq ($(VERBOSE),yes)
+  HALFVERBOSEECHO = :
+else
+  HALFVERBOSEECHO = @echo
+endif
+endif
+

 .%.d: %.c $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)

+	$(HALFVERBOSEECHO) [DEPENDS] $@

 	$(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
 
 .%.d: %.cc $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)

+	$(HALFVERBOSEECHO) [DEPENDS] $@

 	$(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
 
 .%.d: %.cpp $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)

+	$(HALFVERBOSEECHO) [DEPENDS] $@

 	$(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
 
 .%.d: %.S  $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)

+	$(HALFVERBOSEECHO) [DEPENDS] $@

 	$(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
 
 .%.d: %.s  $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)

+	$(HALFVERBOSEECHO) [DEPENDS] $@

 	$(CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
 
 .%.d: %.asm $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES)

+	$(HALFVERBOSEECHO) [DEPENDS] $@

 	$(NASM_CMD) $(NFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
 
 .%.d: %.h $(PATH_TO_TOP)/tools/depends$(EXE_POSTFIX) $(GENERATED_HEADER_FILES) 

+	$(HALFVERBOSEECHO) [DEPENDS] $@

 	$(PCH_CC) $(CFLAGS) -M $< | $(DEPENDS_PATH)$(SEP)depends$(EXE_POSTFIX) $(@D) $@
 
 endif
reactos/tools
helper.mk 1.98 -> 1.99
diff -u -r1.98 -r1.99
--- helper.mk	5 Dec 2004 16:27:45 -0000	1.98
+++ helper.mk	11 Dec 2004 16:02:22 -0000	1.99
@@ -1,4 +1,4 @@

-# $Id: helper.mk,v 1.98 2004/12/05 16:27:45 gvg Exp $

+# $Id: helper.mk,v 1.99 2004/12/11 16:02:22 blight Exp $

 #
 # Helper makefile for ReactOS modules
 # Variables this makefile accepts:

@@ -89,12 +89,12 @@

 # MK_CFLAGS        = C compiler command-line flags for this target
 # MK_CPPFLAGS      = C++ compiler command-line flags for this target
 # MK_DDKLIBS       = Import libraries from the ReactOS DDK to link with

-# MK_DEFENTRY      = Module entry point: 

+# MK_DEFENTRY      = Module entry point:

 #                    _WinMain@16 for windows EXE files that are export libraries

-#                    _DriverEntry@8 for .SYS files 

+#                    _DriverEntry@8 for .SYS files

 #                    _DllMain@12 for .DLL files
 #                    _DrvEnableDriver@12 for GDI drivers

-#                    _WinMainCRTStartup for Win32 EXE files 

+#                    _WinMainCRTStartup for Win32 EXE files

 #                    _NtProcessStartup@4 for Native EXE files
 #                    _mainCRTStartup for Console EXE files
 # MK_DEFEXT        = Extension to give compiled modules (.EXE, .DLL, .SYS, .a)

@@ -705,6 +705,16 @@

   MK_INSTALL_FULLNAME := $(MK_FULLNAME)
 endif
 

+ifeq ($(VERBOSE),no)
+  HALFVERBOSEECHO = :
+else
+ifeq ($(VERBOSE),yes)
+  HALFVERBOSEECHO = :
+else
+  HALFVERBOSEECHO = @echo
+endif
+endif
+

 ifeq ($(MK_IMPLIBONLY),yes)
 
 TARGET_CLEAN += $(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME)

@@ -712,6 +722,7 @@

 all: $(REGTEST_TARGETS) $(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME)
 
 $(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME): $(MK_OBJECTS) $(MK_DEFNAME)

+	$(HALFVERBOSEECHO) [DLLTOOL] $(MK_IMPLIB_FULLNAME)

 	$(DLLTOOL) \
 		--dllname $(MK_FULLNAME) \
 		--def $(MK_DEFNAME) \

@@ -742,9 +753,11 @@

 endif
 
 $(MK_BASENAME).a: $(MK_OBJECTS)

+	$(HALFVERBOSEECHO) [AR]      $(MK_BASENAME).a

 	$(AR) -rc $(MK_BASENAME).a $(MK_OBJECTS)
 
 $(MK_NOSTRIPNAME): $(MK_EXTRADEP) $(MK_FULLRES) $(MK_BASENAME).a $(MK_LIBS) $(MK_STUBS_SRC) $(MK_STUBS_OBJ)

+	$(HALFVERBOSEECHO) [LD]      $(MK_NOSTRIPNAME)

 ifeq ($(MK_EXETYPE),dll)
 	$(LD_CC) -Wl,--base-file,base.tmp \
 		-Wl,--entry,$(TARGET_ENTRY) \

@@ -773,14 +786,18 @@

 	  	-o $(MK_NOSTRIPNAME) \
 	  	$(MK_FULLRES) $(MK_OBJECTS) $(MK_LIBS) $(MK_GCCLIBS)
 	- $(RM) temp.exp

+	$(HALFVERBOSEECHO) [RSYM]    $(MK_BASENAME).sym

 	- $(RSYM) $(MK_NOSTRIPNAME) $(MK_BASENAME).sym
 ifeq ($(FULL_MAP),yes)

+	$(HALFVERBOSEECHO) [OBJDUMP] $(MK_BASENAME).map

 	$(OBJDUMP) -d -S $(MK_NOSTRIPNAME) > $(MK_BASENAME).map
 else

+	$(HALFVERBOSEECHO) [NM]      $(MK_BASENAME).map

 	$(NM) --numeric-sort $(MK_NOSTRIPNAME) > $(MK_BASENAME).map
 endif
 
 $(MK_FULLNAME): $(MK_NOSTRIPNAME) $(MK_EXTRADEP)

+	$(HALFVERBOSEECHO) [LD]      $(MK_FULLNAME)

 	-
 ifneq ($(TARGET_CPPAPP),yes)
 	$(LD) --strip-debug -r -o $(MK_STRIPPED_OBJECT) $(MK_OBJECTS)

@@ -835,9 +852,11 @@

 endif
 
 $(MK_BASENAME).a: $(MK_OBJECTS)

+	$(HALFVERBOSEECHO) [AR]      $(MK_BASENAME).a

 	$(AR) -rc $(MK_BASENAME).a $(MK_OBJECTS)
 
 $(MK_NOSTRIPNAME): $(MK_EXTRADEP) $(MK_FULLRES) $(MK_BASENAME).a $(MK_LIBS)

+	$(HALFVERBOSEECHO) [LD]      $(MK_NOSTRIPNAME)

 	$(LD_CC) -Wl,--base-file,base.tmp \
 		-Wl,--entry,$(TARGET_ENTRY) \
 		$(TARGET_LFLAGS) \

@@ -858,15 +877,19 @@

 		-o $(MK_NOSTRIPNAME) \
 	  	$(MK_FULLRES) $(MK_OBJECTS) $(MK_LIBS) $(MK_GCCLIBS)
 	- $(RM) temp.exp

+	$(HALFVERBOSEECHO) [RSYM]    $(MK_BASENAME).sym

 	$(RSYM) $(MK_NOSTRIPNAME) $(MK_BASENAME).sym
 ifeq ($(FULL_MAP),yes)

+	$(HALFVERBOSEECHO) [OBJDUMP] $(MK_BASENAME).map

 	$(OBJDUMP) -d -S $(MK_NOSTRIPNAME) > $(MK_BASENAME).map
 else

+	$(HALFVERBOSEECHO) [NM]      $(MK_BASENAME).map

 	$(NM) --numeric-sort $(MK_NOSTRIPNAME) > $(MK_BASENAME).map
 endif
 
 $(MK_FULLNAME): $(MK_EXTRADEP) $(MK_FULLRES) $(MK_BASENAME).a $(MK_LIBS) $(MK_NOSTRIPNAME)
 	-

+	$(HALFVERBOSEECHO) [LD]      $(MK_FULLNAME)

 ifneq ($(TARGET_CPPAPP),yes)
 	$(LD) --strip-debug -r -o $(MK_STRIPPED_OBJECT) $(MK_OBJECTS)
 endif

@@ -902,6 +925,7 @@

 ifeq ($(MK_MODE),static)
 
 $(MK_FULLNAME): $(MK_EXTRADEP) $(MK_OBJECTS)

+	$(HALFVERBOSEECHO) [AR]      $(MK_FULLNAME)

 	$(AR) -rc $(MK_FULLNAME) $(MK_OBJECTS)
 ifneq ($(TARGET_TYPE),test)
 	@echo $(MK_FULLNAME) was successfully built.

@@ -928,6 +952,7 @@

 
 ifeq ($(MK_IMPLIB),yes)
 $(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME): $(MK_DEFNAME)

+	$(HALFVERBOSEECHO) [DLLTOOL] $(MK_IMPLIB_FULLNAME)

 	$(DLLTOOL) --dllname $(MK_FULLNAME) \
 		--def $(MK_DEFNAME) \
 		--output-lib $(MK_IMPLIBPATH)/$(MK_IMPLIB_FULLNAME) \

@@ -954,7 +979,7 @@

 
 
 endif # TARGET_PCH

-else  # 

+else  #

 MK_PCHNAME =
 endif # ROS_USE_PCH
 

@@ -994,8 +1019,8 @@

 forceinstall:
 
 install:

-	
-bootcd:	

+
+bootcd:

 
 else # MK_MODE
 

@@ -1039,10 +1064,10 @@

 else # TARGET_BOOTSTRAP
 
 bootcd:

-	

+

 endif # TARGET_BOOTSTRAP

-    
-endif # MK_MODE     

+
+endif # MK_MODE

 
 endif # MK_IMPLIBONLY
 

@@ -1114,35 +1139,48 @@

 	@$(RM) _runtest.exe
 endif
 

-

 %.o: %.c $(MK_PCHNAME)

+	$(HALFVERBOSEECHO) [CC]      $<

 	$(CC) $(TARGET_CFLAGS) -c $< -o $@
 %.o: %.cc $(MK_PCHNAME)

+	$(HALFVERBOSEECHO) [CXX]     $<

 	$(CXX) $(TARGET_CPPFLAGS) -c $< -o $@
 %.o: %.cxx $(MK_PCHNAME)

+	$(HALFVERBOSEECHO) [CXX]     $<

 	$(CXX) $(TARGET_CPPFLAGS) -c $< -o $@
 %.o: %.cpp $(MK_PCHNANE)

+	$(HALFVERBOSEECHO) [CXX]     $<

 	$(CXX) $(TARGET_CPPFLAGS) -c $< -o $@
 %.o: %.S

+	$(HALFVERBOSEECHO) [AS]      $<

 	$(AS) $(TARGET_ASFLAGS) -c $< -o $@
 %.o: %.s

+	$(HALFVERBOSEECHO) [AS]      $<

 	$(AS) $(TARGET_ASFLAGS) -c $< -o $@
 %.o: %.asm

+	$(HALFVERBOSEECHO) [NASM]    $<

 	$(NASM_CMD) $(TARGET_NFLAGS) $< -o $@
 %.coff: %.rc

+	$(HALFVERBOSEECHO) [RC]      $<

 	$(RC) $(TARGET_RCFLAGS) $< -o $@
 %.spec.def: %.spec

+	$(HALFVERBOSEECHO) [DEF]     $<

 	$(WINEBUILD) $(DEFS) -o $@ --def $<
 %.drv.spec.def: %.spec

+	$(HALFVERBOSEECHO) [DEF]     $<

 	$(WINEBUILD) $(DEFS) -o $@ --def $<
 %.stubs.c: %.spec

+	$(HALFVERBOSEECHO) [STUBS]   $<

 	$(WINEBUILD) $(DEFS) -o $@ --pedll $<
 %.i: %.c

+	$(HALFVERBOSEECHO) [CPP]     $<

 	$(CC) $(TARGET_CFLAGS) -E $< > $@
 %.h.gch: %.h

+	$(HALFVERBOSEECHO) [PCH]     $<

 	$(PCH_CC) $(CFLAGS) $<
 # rule for msvc conversion
 %.c: %_msvc.c

+	$(HALFVERBOSEECHO) [MS2PS]   $<

 	$(subst /,$(SEP),$(MS2PS)) -try try -except except -finally finally < $< > $@
 
 # Kill implicit rule
CVSspam 0.2.8