Commit in reactos on MAIN
Makefile+1-111.269 -> 1.270
rules.mak+29-61.103 -> 1.104
hal/halx86/mp/Makefile+3-31.3 -> 1.4
hal/halx86/up/Makefile+3-31.3 -> 1.4
hal/halx86/xbox/Makefile+3-31.3 -> 1.4
tools/depend.mk-101.24 -> 1.25
     /helper.mk+11-131.100 -> 1.101
+50-49
7 modified files
Changed half-verbose build output a bit:
 - Do not print "Entering directory ..." messages
 - Do not print "Nothing to be done for ..." messages
 - Print the target name before the command which is executed (does not work with wine dlls yet)

Added/Changed stuff in rules.mak:
FULL_MAP was renamed to BUILD_MAP and can be set to 
 - full (default, like FULL_MAP=yes was - build maps with objdump) 
 - yes (like FULL_MAP=no was - build maps with nm)
 - no (don't build maps at all)
BUILD_SYM was added - can be set to yes/no (defaults to yes)
reactos
Makefile 1.269 -> 1.270
diff -u -r1.269 -r1.270
--- Makefile	11 Dec 2004 17:53:11 -0000	1.269
+++ Makefile	13 Dec 2004 02:20:08 -0000	1.270
@@ -1,4 +1,4 @@

-# $Id: Makefile,v 1.269 2004/12/11 17:53:11 blight Exp $

+# $Id: Makefile,v 1.270 2004/12/13 02:20:08 blight Exp $

 #
 # Global makefile
 #

@@ -7,16 +7,6 @@

 
 include $(PATH_TO_TOP)/rules.mak
 

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

 #
 # Define to build ReactOS external targets
 #
reactos
rules.mak 1.103 -> 1.104
diff -u -r1.103 -r1.104
--- rules.mak	11 Dec 2004 16:02:22 -0000	1.103
+++ rules.mak	13 Dec 2004 02:20:09 -0000	1.104
@@ -1,21 +1,38 @@

 # Default to half-verbose mode
 ifeq ($(VERBOSE),no)
   Q = @

+  HALFVERBOSEECHO = @:
+  # Do not print "Entering directory ..."
+  export MAKEFLAGS += --no-print-directory
+  # Be silent
+  export MAKEFLAGS += --silent

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

+  HALFVERBOSEECHO = @:

 else
   Q = @

+  # the following is a hack to get the target name for wine dlls
+  # it's disabled because it produces warnings about overriden rules for author.c
+  #ifeq ($(TARGET_TYPE),winedll)
+  #  export TOOLS_PATH = $(PATH_TO_TOP)/tools
+  #  -include Makefile.ros
+  #endif
+  ifeq ($(TARGET_NAME),)
+    HALFVERBOSEECHO = @echo
+  else
+    HALFVERBOSEECHO = @echo $(TARGET_NAME):
+  endif
+  # Do not print "Entering directory ..."
+  export MAKEFLAGS += --no-print-directory
+  # Be silent
+  export MAKEFLAGS += --silent

 endif
 endif
 
 export MAKE := @$(MAKE)
 
 ifeq ($(VERBOSE),no)

-# Do not print "Entering directory ..."
-export MAKEFLAGS += --no-print-directory
-# Be silent
-export MAKEFLAGS += --silent

 endif
 
 # Windows is default host environment

@@ -24,8 +41,14 @@

 endif
 
 # Default to building map files which includes source and asm code

-ifeq ($(FULL_MAP),)
-export FULL_MAP = yes

+# Other options are: yes
+ifeq ($(BUILD_MAP),)
+export BUILD_MAP = full
+endif
+
+# Default to dumping .sym files out of .nostrip files
+ifeq ($(BUILD_SYM),)
+export BUILD_SYM = yes

 endif
 
 # Default to minimal dependencies, making components not
reactos/hal/halx86/mp
Makefile 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile	4 Dec 2004 21:40:55 -0000	1.3
+++ Makefile	13 Dec 2004 02:20:09 -0000	1.4
@@ -1,4 +1,4 @@

-# $Id: Makefile,v 1.3 2004/12/04 21:40:55 gvg Exp $

+# $Id: Makefile,v 1.4 2004/12/13 02:20:09 blight Exp $

 
 PATH_TO_TOP = ../../..
 

@@ -6,6 +6,8 @@

 
 default: all
 

+TARGET_NAME = halmp
+

 #
 # Build configuration
 #

@@ -27,8 +29,6 @@

 # require os code to explicitly request A/W version of structs/functions
 TARGET_CFLAGS += -D_DISABLE_TIDENTS
 

-TARGET_NAME = halmp
-

 ifneq ($(MP), 1)
 TARGET_INSTALL = no
 else
reactos/hal/halx86/up
Makefile 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile	4 Dec 2004 21:40:55 -0000	1.3
+++ Makefile	13 Dec 2004 02:20:09 -0000	1.4
@@ -1,4 +1,4 @@

-# $Id: Makefile,v 1.3 2004/12/04 21:40:55 gvg Exp $

+# $Id: Makefile,v 1.4 2004/12/13 02:20:09 blight Exp $

 
 PATH_TO_TOP = ../../..
 

@@ -6,6 +6,8 @@

 
 default: all
 

+TARGET_NAME = halup
+

 #
 # Build configuration
 #

@@ -29,8 +31,6 @@

 # require os code to explicitly request A/W version of structs/functions
 TARGET_CFLAGS += -D_DISABLE_TIDENTS
 

-TARGET_NAME = halup
-

 ifeq ($(MP), 1)
 TARGET_INSTALL = no
 else
reactos/hal/halx86/xbox
Makefile 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- Makefile	8 Dec 2004 11:42:28 -0000	1.3
+++ Makefile	13 Dec 2004 02:20:09 -0000	1.4
@@ -1,4 +1,4 @@

-# $Id: Makefile,v 1.3 2004/12/08 11:42:28 gvg Exp $

+# $Id: Makefile,v 1.4 2004/12/13 02:20:09 blight Exp $

 
 PATH_TO_TOP = ../../..
 

@@ -6,6 +6,8 @@

 
 default: all
 

+TARGET_NAME = halxbox
+

 #
 # Build configuration
 #

@@ -29,8 +31,6 @@

 # require os code to explicitly request A/W version of structs/functions
 TARGET_CFLAGS += -D_DISABLE_TIDENTS
 

-TARGET_NAME = halxbox
-

 TARGET_INSTALL = no
 TARGET_BOOTSTRAP = no
reactos/tools
depend.mk 1.24 -> 1.25
diff -u -r1.24 -r1.25
--- depend.mk	11 Dec 2004 17:53:12 -0000	1.24
+++ depend.mk	13 Dec 2004 02:20:09 -0000	1.25
@@ -31,16 +31,6 @@

 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) $@
reactos/tools
helper.mk 1.100 -> 1.101
diff -u -r1.100 -r1.101
--- helper.mk	11 Dec 2004 17:53:12 -0000	1.100
+++ helper.mk	13 Dec 2004 02:20:09 -0000	1.101
@@ -1,4 +1,4 @@

-# $Id: helper.mk,v 1.100 2004/12/11 17:53:12 blight Exp $

+# $Id: helper.mk,v 1.101 2004/12/13 02:20:09 blight Exp $

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

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

   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)

@@ -786,15 +776,19 @@

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

+ifeq ($(BUILD_SYM),yes)

 	$(HALFVERBOSEECHO) [RSYM]    $(MK_BASENAME).sym
 	- $(RSYM) $(MK_NOSTRIPNAME) $(MK_BASENAME).sym

-ifeq ($(FULL_MAP),yes)

+endif
+ifeq ($(BUILD_MAP),full)

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

+ifeq ($(BUILD_MAP),yes)

 	$(HALFVERBOSEECHO) [NM]      $(MK_BASENAME).map
 	$(NM) --numeric-sort $(MK_NOSTRIPNAME) > $(MK_BASENAME).map
 endif

+endif

 
 $(MK_FULLNAME): $(MK_NOSTRIPNAME) $(MK_EXTRADEP)
 	$(HALFVERBOSEECHO) [LD]      $(MK_FULLNAME)

@@ -877,15 +871,19 @@

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

+ifeq ($(BUILD_SYM),yes)

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

-ifeq ($(FULL_MAP),yes)

+endif
+ifeq ($(BUILD_MAP),full)

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

+ifeq ($(BUILD_MAP),yes)

 	$(HALFVERBOSEECHO) [NM]      $(MK_BASENAME).map
 	$(NM) --numeric-sort $(MK_NOSTRIPNAME) > $(MK_BASENAME).map
 endif

+endif

 
 $(MK_FULLNAME): $(MK_EXTRADEP) $(MK_FULLRES) $(MK_BASENAME).a $(MK_LIBS) $(MK_NOSTRIPNAME)
 	-
CVSspam 0.2.8