diff --git a/reactos/ChangeLog b/reactos/ChangeLog index 2b0348d9cb8..45cabdf73ac 100644 --- a/reactos/ChangeLog +++ b/reactos/ChangeLog @@ -1,3 +1,10 @@ +2004-07-21 Casper S. Hornstrup + + * rules.mak, iface/addsys/makefile, iface/native/makefile, + tools/Makefile: Be quiet if VERBOSE=no. + * tools/helper.mk: Print module name if it was successfully built. + * tools/regtests.c, tools/wine2ros/wine2ros.c: Be quiet. + 2004-06-05 Casper S. Hornstrup * tools/helper.mk: Skip automatic dependency tracking if diff --git a/reactos/iface/addsys/makefile b/reactos/iface/addsys/makefile index a85b94f209e..5dd5b43123f 100644 --- a/reactos/iface/addsys/makefile +++ b/reactos/iface/addsys/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.13 2003/12/03 21:50:49 gvg Exp $ +# $Id: makefile,v 1.14 2004/07/21 18:17:50 chorns Exp $ # # ReactOS Operating System # @@ -36,7 +36,7 @@ $(TARGETNAME)$(EXE_POSTFIX): $(TARGETNAME).c $(TARGETNAME).c $(SVC_FILES): $(SVC_DB) $(TARGETNAME)$(EXE_POSTFIX) - ./$(TARGETNAME)$(EXE_POSTFIX) \ + @./$(TARGETNAME)$(EXE_POSTFIX) \ $(SVC_DB) \ $(SVC_SERVICE_TABLE) \ $(SVC_GDI_STUBS) \ diff --git a/reactos/iface/native/makefile b/reactos/iface/native/makefile index b5f81878065..55b21953052 100644 --- a/reactos/iface/native/makefile +++ b/reactos/iface/native/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.13 2003/11/14 17:13:30 weiden Exp $ +# $Id: makefile,v 1.14 2004/07/21 18:17:50 chorns Exp $ # # ReactOS Operating System # @@ -22,7 +22,7 @@ BASE_CFLAGS = -I../../include all: $(TARGET)$(EXE_POSTFIX) $(NAPI_FILES) $(NAPI_FILES): $(SYSTEM_CALLS_DB) $(TARGET)$(EXE_POSTFIX) - ./$(TARGET)$(EXE_POSTFIX) \ + @./$(TARGET)$(EXE_POSTFIX) \ $(SYSTEM_CALLS_DB) \ $(NTDLL_STUBS) \ $(KERNEL_SERVICE_TABLE) \ diff --git a/reactos/rules.mak b/reactos/rules.mak index fa84e83cbf2..4291fd32ebf 100644 --- a/reactos/rules.mak +++ b/reactos/rules.mak @@ -3,6 +3,18 @@ # .EXPORT_ALL_VARIABLES: +# Default to verbose mode +ifeq ($(VERBOSE),no) + Q = @ +else + Q = +endif + +MAKE := @$(MAKE) + +# Do not print "Entering directory ..." +MAKEFLAGS += --no-print-directory + # Windows is default host environment ifeq ($(HOST),) HOST = mingw32-windows @@ -44,12 +56,12 @@ NASM_FORMAT = win32 PREFIX = EXE_PREFIX := EXE_POSTFIX := .exe -DLLTOOL = $(PREFIX)dlltool --as=$(PREFIX)as +DLLTOOL = $(Q)$(PREFIX)dlltool --as=$(PREFIX)as # # Do not change NASM_CMD to NASM because older versions of # nasm doesn't like an environment variable NASM # -NASM_CMD = nasmw +NASM_CMD = $(Q)nasmw DOSCLI = yes FLOPPY_DIR = A: SEP := \$(EMPTY_VAR) @@ -80,38 +92,41 @@ endif endif -CC = $(PREFIX)gcc -CXX = $(PREFIX)g++ -HOST_CC = gcc -HOST_CXX = g++ -HOST_AR = ar -HOST_NM = nm -LD = $(PREFIX)ld -NM = $(PREFIX)nm -OBJCOPY = $(PREFIX)objcopy -STRIP = $(PREFIX)strip -AS = $(PREFIX)gcc -c -x assembler-with-cpp -CPP = $(PREFIX)cpp -AR = $(PREFIX)ar -RC = $(PREFIX)windres -WRC = $(WINE_TOP)/tools/wrc/wrc -OBJCOPY = $(PREFIX)objcopy -OBJDUMP =$(PREFIX)objdump +CC = $(Q)$(PREFIX)gcc +CXX = $(Q)$(PREFIX)g++ +HOST_CC = $(Q)gcc +HOST_CXX = $(Q)g++ +HOST_AR = $(Q)ar +HOST_NM = $(Q)nm +LD = $(Q)$(PREFIX)ld +NM = $(Q)$(PREFIX)nm +OBJCOPY = $(Q)$(PREFIX)objcopy +STRIP = $(Q)$(PREFIX)strip +AS = $(Q)$(PREFIX)gcc -c -x assembler-with-cpp +CPP = $(Q)$(PREFIX)cpp +AR = $(Q)$(PREFIX)ar +RC = $(Q)$(PREFIX)windres +WRC = $(Q)$(WINE_TOP)/tools/wrc/wrc +OBJCOPY = $(Q)$(PREFIX)objcopy +OBJDUMP =$(Q)$(PREFIX)objdump TOOLS_PATH = $(PATH_TO_TOP)/tools W32API_PATH = $(PATH_TO_TOP)/w32api -CP = $(TOOLS_PATH)/rcopy -RM = $(TOOLS_PATH)/rdel -RLINE = $(TOOLS_PATH)/rline -RMDIR = $(TOOLS_PATH)/rrmdir -RMKDIR = $(TOOLS_PATH)/rmkdir -RSYM = $(TOOLS_PATH)/rsym -RTOUCH = $(TOOLS_PATH)/rtouch -REGTESTS = $(TOOLS_PATH)/regtests -MC = $(TOOLS_PATH)/wmc/wmc -CABMAN = $(TOOLS_PATH)/cabman/cabman -WINEBUILD = $(TOOLS_PATH)/winebuild/winebuild -WINE2ROS = $(TOOLS_PATH)/wine2ros/wine2ros -XSLTPROC = xsltproc +CP = $(Q)$(TOOLS_PATH)/rcopy +RM = $(Q)$(TOOLS_PATH)/rdel +RLINE = $(Q)$(TOOLS_PATH)/rline +RMDIR = $(Q)$(TOOLS_PATH)/rrmdir +RMKDIR = $(Q)$(TOOLS_PATH)/rmkdir +RSYM = $(Q)$(TOOLS_PATH)/rsym +RTOUCH = $(Q)$(TOOLS_PATH)/rtouch +REGTESTS = $(Q)$(TOOLS_PATH)/regtests +MC = $(Q)$(TOOLS_PATH)/wmc/wmc +CABMAN = $(Q)$(TOOLS_PATH)/cabman/cabman +WINEBUILD = $(Q)$(TOOLS_PATH)/winebuild/winebuild +WINE2ROS = $(Q)$(TOOLS_PATH)/wine2ros/wine2ros +MKHIVE = $(Q)$(TOOLS_PATH)/mkhive/mkhive +CDMAKE = $(Q)$(TOOLS_PATH)/cdmake/cdmake +BIN2RES = $(Q)$(TOOLS_PATH)/bin2res/bin2res +XSLTPROC = $(Q)xsltproc STD_CFLAGS = -I$(PATH_TO_TOP)/include -I$(W32API_PATH)/include -pipe -march=i386 -D_M_IX86 STD_CPPFLAGS = $(STD_CFLAGS) diff --git a/reactos/tools/Makefile b/reactos/tools/Makefile index 05b1e0ec922..d221e11577b 100644 --- a/reactos/tools/Makefile +++ b/reactos/tools/Makefile @@ -144,8 +144,8 @@ clean: $(MAKE) -C wine2ros clean $(MAKE) -C winebuild clean $(MAKE) -C bin2res clean - rm mkconfig - rm $(TOOLS) + @rm mkconfig + @rm $(TOOLS) endif ifeq ($(HOST),mingw32-windows) clean: @@ -158,7 +158,7 @@ clean: $(MAKE) -C wine2ros clean $(MAKE) -C winebuild clean $(MAKE) -C bin2res clean - -del *$(EXE_POSTFIX) + -@del *$(EXE_POSTFIX) endif .PHONY: all clean diff --git a/reactos/tools/helper.mk b/reactos/tools/helper.mk index 54aac3b16c1..ad02acfd72f 100644 --- a/reactos/tools/helper.mk +++ b/reactos/tools/helper.mk @@ -1,4 +1,4 @@ -# $Id: helper.mk,v 1.69 2004/06/21 20:55:16 hyperion Exp $ +# $Id: helper.mk,v 1.70 2004/07/21 18:17:50 chorns Exp $ # # Helper makefile for ReactOS modules # Variables this makefile accepts: @@ -654,7 +654,7 @@ endif ifeq ($(TARGET_REGTESTS),yes) REGTEST_TARGETS := tests/_regtests.c tests/Makefile.tests tests/_rtstub.c ifeq ($(MK_MODE),user) - MK_LIBS := $(SDK_PATH_LIB)/rtshared.a $(MK_LIBS) + MK_LIBS := $(SDK_PATH_LIB)/rtshared.a $(MK_LIBS) endif MK_REGTESTS_CLEAN := clean_regtests MK_OBJECTS += tests/_rtstub.o tests/regtests.a @@ -700,7 +700,10 @@ else MK_EXTRACMD2 := endif -$(MK_NOSTRIPNAME): $(MK_FULLRES) $(MK_OBJECTS) $(MK_EXTRADEP) $(MK_LIBS) +$(MK_BASENAME).a: $(MK_OBJECTS) + $(AR) -r $(MK_BASENAME).a $(MK_OBJECTS) + +$(MK_NOSTRIPNAME): $(MK_FULLRES) $(MK_BASENAME).a $(MK_EXTRADEP) $(MK_LIBS) ifeq ($(MK_EXETYPE),dll) $(LD_CC) -Wl,--base-file,base.tmp \ -Wl,--entry,$(TARGET_ENTRY) \ @@ -778,6 +781,7 @@ ifneq ($(TARGET_CPPAPP),yes) else - $(RM) temp.exp endif + @echo $(MK_FULLNAME) was successfully built. endif # KM_MODE @@ -854,6 +858,7 @@ ifneq ($(TARGET_CPPAPP),yes) else - $(RM) temp.exp endif + @echo $(MK_FULLNAME) was successfully built. endif # MK_MODE @@ -862,6 +867,7 @@ ifeq ($(MK_MODE),static) $(MK_FULLNAME): $(TARGET_OBJECTS) $(AR) -r $(MK_FULLNAME) $(TARGET_OBJECTS) + @echo $(MK_BASENAME)$(MK_EXT) was successfully built. # Static libraries dont have a nostrip version $(MK_NOSTRIPNAME): @@ -936,6 +942,7 @@ ifeq ($(INSTALL_SYMBOLS),yes) install: $(SUBDIRS:%=%_install) $(MK_FULLNAME) $(MK_BASENAME).sym -$(CP) $(MK_FULLNAME) $(INSTALL_DIR)/$(MK_INSTALLDIR)/$(MK_FULLNAME) -$(CP) $(MK_BASENAME).sym $(INSTALL_DIR)/symbols/$(MK_BASENAME).sym + @echo $(MK_FULLNAME) was successfully installed. else # INSTALL_SYMBOLS @@ -969,10 +976,10 @@ endif # MK_IMPLIBONLY ifeq ($(TARGET_TYPE),winedll) Makefile.ros: Makefile.in Makefile.ros-template - $(TOOLS_PATH)/wine2ros/wine2ros Makefile.in Makefile.ros-template Makefile.ros + $(WINE2ROS) Makefile.in Makefile.ros-template Makefile.ros $(MK_RC_BINARIES): $(TARGET_RC_BINSRC) - $(TOOLS_PATH)/bin2res/bin2res -f -o $@ $(TARGET_RC_BINSRC) + $(BIN2RES) -f -o $@ $(TARGET_RC_BINSRC) $(MK_RESOURCE): $(MK_RC_BINARIES) endif @@ -1074,5 +1081,3 @@ endif # ROS_USE_PCH # Compatibility CFLAGS := $(TARGET_CFLAGS) NFLAGS := $(TARGET_NFLAGS) - -# EOF diff --git a/reactos/tools/regtests.c b/reactos/tools/regtests.c index 2175ebe0da4..825908d2934 100755 --- a/reactos/tools/regtests.c +++ b/reactos/tools/regtests.c @@ -632,7 +632,5 @@ int main(int argc, char **argv) } } - printf("Successfully generated regression test registrations.\n"); - return 0; } diff --git a/reactos/tools/wine2ros/wine2ros.c b/reactos/tools/wine2ros/wine2ros.c index e293ad3da5b..46ae0748341 100644 --- a/reactos/tools/wine2ros/wine2ros.c +++ b/reactos/tools/wine2ros/wine2ros.c @@ -649,8 +649,6 @@ write_makefile(PMAKEFILE_INFO makefile_info) } while (1); close_file(); - - printf("ReactOS makefile successfully generated.\n"); } static char HELP[] =