Ticket #9072: quiet-make.patch

File quiet-make.patch, 5.1 KB (added by salty-horse, 15 years ago)

  • Makefile.common

     
    6262# the build date in gScummVMBuildDate is correct.
    6363base/version.o: $(filter-out base/libbase.a,$(OBJS))
    6464
     65ifneq ($(findstring $(MAKEFLAGS),s),s)
     66ifndef VERBOSE
     67QUIET_CC     = @echo '   ' CC '     ' $@;
     68QUIET_NASM   = @echo '   ' NASM '   ' $@;
     69QUIET_AR     = @echo '   ' AR '     ' $@;
     70QUIET_RANLIB = @echo '   ' RANLIB ' ' $@;
     71QUIET_SO     = @echo '   ' SO '     ' $@;
     72QUIET_LINK   = @echo '   ' LINK '   ' $@;
     73QUIET        = @
     74export VERBOSE
     75endif
     76endif
     77
    6578# The build rule for the ScummVM executable
    6679$(EXECUTABLE): $(OBJS)
    67         $(CXX) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
     80        $(QUIET_LINK)$(CXX) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
    6881
    6982distclean: clean
    7083        $(RM) config.h config.mk config.log
    … …  
    8396# If you use GCC, disable the above and enable this for intelligent
    8497# dependency tracking.
    8598%.o: %.cpp
    86         $(MKDIR) $(*D)/$(DEPDIR)
    87         $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
    88         $(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
    89         $(CAT) "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
    90         $(RM) "$(*D)/$(DEPDIR)/$(*F).d2"
     99        $(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
     100        $(QUIET_CC)$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
     101        $(QUIET)$(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
     102        $(QUIET)$(CAT) "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
     103        $(QUIET)$(RM) "$(*D)/$(DEPDIR)/$(*F).d2"
    91104else
    92105# If you even have GCC 3.x, you can use this build rule, which is safer; the above
    93106# rule can get you into a bad state if you Ctrl-C at the wrong moment.
    94107# Also, with this GCC inserts additional dummy rules for the involved headers,
    95108# which ensures a smooth compilation even if said headers become obsolete.
    96109%.o: %.cpp
    97         $(MKDIR) $(*D)/$(DEPDIR)
    98         $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
     110        $(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
     111        $(QUIET_CC)$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
    99112%.o: %.m
    100         $(MKDIR) $(*D)/$(DEPDIR)
    101         $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(OBJCFLAGS) -c $(<) -o $*.o
     113        $(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
     114        $(QUIET_CC)$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(OBJCFLAGS) -c $(<) -o $*.o
    102115endif
    103116
    104117ifdef HAVE_NASM
    105118%.o: %.asm
    106         $(NASM) -O1 $(NASMFLAGS) -g -o $*.o $(<)
     119        $(QUIET_NASM)$(NASM) -O1 $(NASMFLAGS) -g -o $*.o $(<)
    107120endif
    108121
    109122# Include the dependency tracking files.

  • rules.mk

     
    2323################################################
    2424TOOL-$(MODULE) := $(MODULE)/$(TOOL_EXECUTABLE)$(EXEEXT)
    2525$(TOOL-$(MODULE)): $(MODULE_OBJS-$(MODULE))
    26         $(CXX) $(LDFLAGS) $+ -o $@
     26        $(QUIET_CC)$(CXX) $(LDFLAGS) $+ -o $@
    2727
    2828# Reset TOOL_EXECUTABLE var
    2929TOOL_EXECUTABLE:=
    … …  
    4242################################################
    4343PLUGIN-$(MODULE) := plugins/$(PLUGIN_PREFIX)$(notdir $(MODULE))$(PLUGIN_SUFFIX)
    4444$(PLUGIN-$(MODULE)): $(MODULE_OBJS-$(MODULE)) $(PLUGIN_EXTRA_DEPS)
    45         $(MKDIR) plugins
    46         $(CXX) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@
     45        $(QUIET)$(MKDIR) plugins
     46        $(QUIET_SO)$(CXX) $(filter-out $(PLUGIN_EXTRA_DEPS),$+) $(PLUGIN_LDFLAGS) -o $@
    4747
    4848# Reset PLUGIN var
    4949PLUGIN:=
    … …  
    6969
    7070# Convenience library target
    7171$(MODULE_LIB-$(MODULE)): $(MODULE_OBJS-$(MODULE))
    72         -$(RM) $@
    73         $(AR) $@ $+
    74         $(RANLIB) $@
     72        $(QUIET)-$(RM) $@
     73        $(QUIET_AR)$(AR) $@ $+
     74        $(QUIET_RANLIB)$(RANLIB) $@
    7575
    7676# Pseudo target for comfort, allows for "make common", "make gui" etc.
    7777$(MODULE): $(MODULE_LIB-$(MODULE))

  • test/module.mk

     
    2222test: test/runner
    2323        ./test/runner
    2424test/runner: test/runner.cpp $(TEST_LIBS)
    25         $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TEST_LDFLAGS) $(TEST_CFLAGS) -o $@ $+
     25        $(QUIET_LINK)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TEST_LDFLAGS) $(TEST_CFLAGS) -o $@ $+
    2626test/runner.cpp: $(TESTS)
    2727        @mkdir -p test
    2828        $(srcdir)/test/cxxtest/cxxtestgen.py $(TEST_FLAGS) -o $@ $+

  • tools/module.mk

     
    3333#
    3434
    3535tools/convbdf$(EXEEXT): $(srcdir)/tools/convbdf.c
    36         $(MKDIR) tools/$(DEPDIR)
    37         $(CC) $(CFLAGS) -Wall -o $@ $<
     36        $(QUIET)$(MKDIR) tools/$(DEPDIR)
     37        $(QUIET_LINK)$(CC) $(CFLAGS) -Wall -o $@ $<
    3838
    3939tools/md5table$(EXEEXT): $(srcdir)/tools/md5table.c
    40         $(MKDIR) tools/$(DEPDIR)
    41         $(CC) $(CFLAGS) -Wall -o $@ $<
     40        $(QUIET)$(MKDIR) tools/$(DEPDIR)
     41        $(QUIET_LINK)$(CC) $(CFLAGS) -Wall -o $@ $<
    4242
    4343tools/make-scumm-fontdata$(EXEEXT): $(srcdir)/tools/make-scumm-fontdata.c
    44         $(MKDIR) tools/$(DEPDIR)
    45         $(CC) $(CFLAGS) -Wall -o $@ $<
     44        $(QUIET)$(MKDIR) tools/$(DEPDIR)
     45        $(QUIET_LINK)$(CC) $(CFLAGS) -Wall -o $@ $<
    4646
    4747#
    4848# Rules to explicitly rebuild the credits / MD5 tables.