Ticket #9072: quiet-make-2.patch

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

Updated patch with configure changes

  • configure

     
    125125_endian=unknown
    126126_need_memalign=no
    127127_have_x86=no
     128_verbose_build=no
    128129_dynamic_modules=no
    129130_plugins_default=static
    130131_nasm=auto
    … …  
    660661        --disable-fluidsynth)     _fluidsynth=no  ;;
    661662        --enable-readline)        _readline=yes   ;;
    662663        --disable-readline)       _readline=no    ;;
     664        --enable-verbose-build)   _verbose_build=yes ;;
    663665        --enable-plugins)         _dynamic_modules=yes ;;
    664666        --default-dynamic)        _plugins_default=dynamic ;;
    665667        --enable-mt32emu)         _mt32emu=yes    ;;
    … …  
    15151519
    15161520add_to_config_h_if_yes $_need_memalign '#define SCUMM_NEED_ALIGNMENT'
    15171521
     1522#
     1523# Check whether to enable a verbose build
     1524#
     1525echo_n "Checking whether to have a verbose build... "
     1526echo "$_verbose_build"
     1527add_to_config_mk_if_yes "$_verbose_build" 'VERBOSE_BUILD = 1'
    15181528
    15191529#
    15201530# Check whether plugin support is requested and possible

  • Makefile.common

     
    6666# the build date in gScummVMBuildDate is correct.
    6767base/version.o: $(filter-out base/libbase.a,$(OBJS))
    6868
     69# Replace regular output with quiet messages
     70ifneq ($(findstring $(MAKEFLAGS),s),s)
     71ifneq ($(VERBOSE_BUILD),1)
     72ifneq ($(VERBOSE_BUILD),yes)
     73QUIET_CXX    = @echo '   ' C++ '    ' $@;
     74QUIET_NASM   = @echo '   ' NASM '   ' $@;
     75QUIET_AR     = @echo '   ' AR '     ' $@;
     76QUIET_RANLIB = @echo '   ' RANLIB ' ' $@;
     77QUIET_PLUGIN = @echo '   ' PLUGIN ' ' $@;
     78QUIET_LINK   = @echo '   ' LINK '   ' $@;
     79QUIET        = @
     80endif
     81endif
     82endif
     83
    6984# The build rule for the ScummVM executable
    7085$(EXECUTABLE): $(OBJS)
    71         $(CXX) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
     86        $(QUIET_LINK)$(CXX) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
    7287
    7388distclean: clean
    7489        $(RM) config.h config.mk config.log
    … …  
    87102# If you use GCC, disable the above and enable this for intelligent
    88103# dependency tracking.
    89104%.o: %.cpp
    90         $(MKDIR) $(*D)/$(DEPDIR)
    91         $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
    92         $(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
    93         $(CAT) "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
    94         $(RM) "$(*D)/$(DEPDIR)/$(*F).d2"
     105        $(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
     106        $(QUIET_CXX)$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
     107        $(QUIET)$(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
     108        $(QUIET)$(CAT) "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
     109        $(QUIET)$(RM) "$(*D)/$(DEPDIR)/$(*F).d2"
    95110else
    96111# If you even have GCC 3.x, you can use this build rule, which is safer; the above
    97112# rule can get you into a bad state if you Ctrl-C at the wrong moment.
    98113# Also, with this GCC inserts additional dummy rules for the involved headers,
    99114# which ensures a smooth compilation even if said headers become obsolete.
    100115%.o: %.cpp
    101         $(MKDIR) $(*D)/$(DEPDIR)
    102         $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
     116        $(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
     117        $(QUIET_CXX)$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
    103118%.o: %.m
    104         $(MKDIR) $(*D)/$(DEPDIR)
    105         $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(OBJCFLAGS) -c $(<) -o $*.o
     119        $(QUIET)$(MKDIR) $(*D)/$(DEPDIR)
     120        $(QUIET_CXX)$(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d",-MQ,"$@",-MP $(OBJCFLAGS) -c $(<) -o $*.o
    106121endif
    107122
    108123ifdef HAVE_NASM
    109124%.o: %.asm
    110         $(NASM) -O1 $(NASMFLAGS) -g -o $*.o $(<)
     125        $(QUIET_NASM)$(NASM) -O1 $(NASMFLAGS) -g -o $*.o $(<)
    111126endif
    112127
    113128# 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_CXX)$(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_PLUGIN)$(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.

  • tools/skycpt/Makefile

     
    99all: $(TARGET)
    1010
    1111clean:
    12         rm -f $(TARGET) $(OBJS)
     12        $(QUIET)$(RM) $(TARGET) $(OBJS)
    1313
    1414$(TARGET): $(OBJS)
    15         $(CC) $(OBJS) $(LDFLAGS) -o $(TARGET)
     15        $(QUIET_CXX)$(CXX) $(OBJS) $(LDFLAGS) -o $(TARGET)
    1616
    1717%.o: %.cpp
    18         $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
    19  No newline at end of file
     18        $(QUIET_CXX)$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@