ruby-changes:17758
From: nobu <ko1@a...>
Date: Fri, 12 Nov 2010 20:54:44 +0900 (JST)
Subject: [ruby-changes:17758] Ruby:r29769 (trunk): * Makefile.in, common.mk, cygwin/GNUmakefile.in, enc/depend,
nobu 2010-11-12 20:51:42 +0900 (Fri, 12 Nov 2010) New Revision: 29769 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29769 Log: * Makefile.in, common.mk, cygwin/GNUmakefile.in, enc/depend, ext/ripper/depend, lib/mkmf.rb, win32/Makefile.sub: caddle up. Modified files: trunk/ChangeLog trunk/Makefile.in trunk/common.mk trunk/cygwin/GNUmakefile.in trunk/enc/depend trunk/ext/ripper/depend trunk/lib/mkmf.rb trunk/win32/Makefile.sub Index: ChangeLog =================================================================== --- ChangeLog (revision 29768) +++ ChangeLog (revision 29769) @@ -1,3 +1,8 @@ +Fri Nov 12 20:51:29 2010 Nobuyoshi Nakada <nobu@r...> + + * Makefile.in, common.mk, cygwin/GNUmakefile.in, enc/depend, + ext/ripper/depend, lib/mkmf.rb, win32/Makefile.sub: caddle up. + Fri Nov 12 16:35:31 2010 NARUSE, Yui <naruse@r...> * configure.in: support C level backtrace information on FreeBSD. Index: enc/depend =================================================================== --- enc/depend (revision 29768) +++ enc/depend (revision 29769) @@ -81,8 +81,7 @@ <%=transvpath_prefix%>.trans<%=transvpath_prefix%>.c: $(ECHO) generating table from $@ - $(Q) \ - $(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<" + $(Q) $(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<" % unless encs.empty? or trans.empty? @@ -119,24 +118,20 @@ % base = File.basename(e) % cmd.sub!(/(?=\$\(DLDFLAGS\))/) {dldflags.sub(/\$\(TARGET\)/) {base} + " "} if dldflags % if df - $(Q) \ - echo> <%=df%> EXPORTS - $(Q) \ - echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%> + $(Q) echo> <%=df%> EXPORTS + $(Q) echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%> % cmd.sub!(/\$\(DEFFILE\)/) {df} % cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"} % end @$(MAKEDIRS) "$(@D)" - $(Q) \ - <%=cmd%> + $(Q) <%=cmd%> % end % dependencies.each do |e| <%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%> -@$(MAKEDIRS) "$(@D)" $(ECHO) compiling <%= "#{e}.c"%> - $(Q) \ - <%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%> + $(Q) <%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%> % end Index: lib/mkmf.rb =================================================================== --- lib/mkmf.rb (revision 29768) +++ lib/mkmf.rb (revision 29769) @@ -2005,8 +2005,8 @@ mfile.print "\n\n" if makedef mfile.print "$(DEFFILE): #{origdef}\n" - mfile.print "\t$(ECHO) generating $@\n\t$(Q) \\\n" - mfile.print "\t$(RUBY) #{makedef} #{origdef} > $@\n\n" + mfile.print "\t$(ECHO) generating $@\n" + mfile.print "\t$(Q) $(RUBY) #{makedef} #{origdef} > $@\n\n" end depend = File.join(srcdir, "depend") Index: common.mk =================================================================== --- common.mk (revision 29768) +++ common.mk (revision 29769) @@ -164,21 +164,17 @@ GORUBY = go$(RUBY_INSTALL_NAME) golf: $(LIBRUBY) $(GOLFOBJS) PHONY - $(Q) \ - $(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program + $(Q) $(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program capi: $(CAPIOUT)/.timestamp PHONY doc/capi/.timestamp: Doxyfile $(PREP) @$(MAKEDIRS) doc/capi $(ECHO) generating capi - $(Q) \ - $(DOXYGEN) -b - $(Q) \ - $(MINIRUBY) -e 'File.open("$(CAPIOUT)/.timestamp", "w"){|f| f.puts(Time.now)}' + $(Q) $(DOXYGEN) -b + $(Q) $(MINIRUBY) -e 'File.open("$(CAPIOUT)/.timestamp", "w"){|f| f.puts(Time.now)}' Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG) $(ECHO) generating $@ - $(Q) \ - $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \ + $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \ --srcdir="$(srcdir)" --miniruby="$(MINIRUBY)" program: $(PROGRAM) @@ -379,8 +375,7 @@ rdoc: PHONY main @echo Generating RDoc documentation - $(Q) \ - $(XRUBY) "$(srcdir)/bin/rdoc" --no-force-update --all --ri --op "$(RDOCOUT)" $(RDOCFLAGS) "$(srcdir)" + $(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --no-force-update --all --ri --op "$(RDOCOUT)" $(RDOCFLAGS) "$(srcdir)" nodoc: PHONY what-where-doc: no-install-doc @@ -486,8 +481,7 @@ encs: enc trans encs enc trans: showflags $(ENC_MK) $(LIBRUBY) $(PREP) $(ECHO) making $@ - $(Q) \ - $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) $@ + $(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) $@ enc: {$(VPATH)}encdb.h trans: {$(VPATH)}transdb.h @@ -495,8 +489,7 @@ $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \ $(srcdir)/lib/mkmf.rb $(RBCONFIG) $(ECHO) generating $@ - $(Q) \ - $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" $@ $(ENCS) + $(Q) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" $@ $(ENCS) .PRECIOUS: $(MKFILES) @@ -750,8 +743,7 @@ srcs-enc: $(ENC_MK) $(ECHO) making srcs under enc - $(Q) \ - $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs + $(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(VPATH)}known_errors.inc \ $(srcdir)/revision.h $(REVISION_H) enc/unicode/name2ctype.h @@ -760,8 +752,7 @@ id.h: parse.h $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl $(ECHO) generating $@ - $(Q) \ - $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \ + $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \ $(srcdir)/template/id.h.tmpl --vpath=$(VPATH) parse.h node_name.inc: {$(VPATH)}node.h @@ -769,35 +760,29 @@ encdb.h: $(PREP) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/encdb.h.tmpl $(ECHO) generating $@ - $(Q) \ - $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/encdb.h.tmpl $(srcdir)/enc enc + $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/encdb.h.tmpl $(srcdir)/enc enc transdb.h: $(PREP) srcs-enc $(srcdir)/tool/generic_erb.rb $(srcdir)/template/transdb.h.tmpl $(ECHO) generating $@ - $(Q) \ - $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/transdb.h.tmpl $(srcdir)/enc/trans enc/trans + $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/transdb.h.tmpl $(srcdir)/enc/trans enc/trans known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def $(ECHO) generating $@ - $(Q) \ - $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def + $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def miniprelude.c: $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $(ECHO) generating $@ - $(Q) \ - $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ + $(Q) $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) \ $(srcdir)/lib/rubygems/defaults.rb $(srcdir)/lib/rubygems/custom_require.rb \ $(PRELUDE_SCRIPTS) $(PREP) $(ECHO) generating $@ - $(Q) \ - $(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@ + $(Q) $(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@ golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP) $(ECHO) generating $@ - $(Q) \ - $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@ + $(Q) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@ prereq: incs srcs preludes PHONY Index: cygwin/GNUmakefile.in =================================================================== --- cygwin/GNUmakefile.in (revision 29768) +++ cygwin/GNUmakefile.in (revision 29769) @@ -41,21 +41,18 @@ %$(EXEEXT): bin/% $(STUBPROGRAM) $(ECHO) generating $@ - $(Q) \ - { cat $(STUBPROGRAM); echo; sed -e '1{' -e '/^#!.*ruby/!i\' -e '#!/bin/ruby' -e '}' $<; } > $@ + $(Q) { cat $(STUBPROGRAM); echo; sed -e '1{' -e '/^#!.*ruby/!i\' -e '#!/bin/ruby' -e '}' $<; } > $@ $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO) $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@ %.res.@OBJEXT@: %.rc $(ECHO) compiling $@ - $(Q) \ - $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@ + $(Q) $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@ $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb $(ECHO) generating $@ - $(Q) \ - $(MINIRUBY) $(srcdir)/win32/resource.rb \ + $(Q) $(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \ -so_name=$(DLL_BASE_NAME) \ . $(icondirs) $(srcdir)/win32 @@ -64,24 +61,20 @@ $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@ @rm -f $@ $(ECHO) linking $@ - $(Q) \ - $(PURIFY) $(CC) -mwindows -e $(SYMBOL_PREFIX)mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \ + $(Q) $(PURIFY) $(CC) -mwindows -e $(SYMBOL_PREFIX)mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \ $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@ $(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ stub.@OBJEXT@ @rm -f $@ $(ECHO) linking $@ - $(Q) \ - $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) \ + $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) \ stub.@OBJEXT@ $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@ $(RUBY_EXP): $(LIBRUBY_A) $(ECHO) creating $@ - $(Q) \ - $(DLLWRAP) \ + $(Q) $(DLLWRAP) \ --output-exp=$(RUBY_EXP) \ --export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM) - $(Q) \ - $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM) + $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM) @rm -f $(PROGRAM) GNUmakefile: $(srcdir)/cygwin/GNUmakefile.in @@ -96,8 +89,7 @@ $(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG) $(ECHO) generating $@ - $(Q) \ - $(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A) + $(Q) $(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A) clean-local:: @$(RM) $(RUBYDEF) @@ -105,8 +97,7 @@ ifeq (@target_os@,cygwin) cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A) $(RUBYDEF) $(ECHO) generating $@ - $(Q) \ - @DLLWRAP@ -s --def=$(RUBYDEF) -o $@ + $(Q) @DLLWRAP@ -s --def=$(RUBYDEF) -o $@ endif clean-local:: Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 29768) +++ win32/Makefile.sub (revision 29769) @@ -783,15 +783,11 @@ miniruby$(EXEEXT): @echo $(LIBS) $(ECHO) linking $@ - $(Q) \ - $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ -link $(LDFLAGS) + $(Q) $(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) -Fe$@ -link $(LDFLAGS) @$(RM) miniruby.lib miniruby.exp - $(Q) \ - miniruby.exe -v - $(Q) \ - $(LDSHARED_1) - $(Q) \ - $(LDSHARED_2) + $(Q) miniruby.exe -v + $(Q) $(LDSHARED_1) + $(Q) $(LDSHARED_2) miniruby.rc: @exit > $@ @@ -799,57 +795,43 @@ !if "$(PROGRAM)" != "" $(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res $(ECHO) linking $@ - $(Q) \ - $(PURIFY) $(CC) $(MAINOBJ) $(RUBY_INSTALL_NAME).res \ + $(Q) $(PURIFY) $(CC) $(MAINOBJ) $(RUBY_INSTALL_NAME).res \ $(OUTFLAG)$@ $(LIBRUBYARG) -link $(LDFLAGS) $(XLDFLAGS) - $(Q) \ - $(LDSHARED_0) - $(Q) \ - $(LDSHARED_1) - $(Q) \ - $(LDSHARED_2) + $(Q) $(LDSHARED_0) + $(Q) $(LDSHARED_1) + $(Q) $(LDSHARED_2) !endif !if "$(WPROGRAM)" != "" $(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res $(ECHO) linking $@ - $(Q) \ - $(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) \ + $(Q) $(PURIFY) $(CC) $(MAINOBJ) $(WINMAINOBJ) \ $(RUBYW_INSTALL_NAME).res $(OUTFLAG)$@ $(LIBRUBYARG) \ -link $(LDFLAGS) $(XLDFLAGS) -subsystem:Windows - $(Q) \ - $(LDSHARED_0) - $(Q) \ - $(LDSHARED_1) - $(Q) \ - $(LDSHARED_2) + $(Q) $(LDSHARED_0) + $(Q) $(LDSHARED_1) + $(Q) $(LDSHARED_2) !endif $(LIBRUBY_A): $(OBJS) $(DMYEXT) $(ECHO) linking static-library $@ - $(Q) \ - $(AR) $(ARFLAGS)$@ $(OBJS) $(DMYEXT) + $(Q) $(AR) $(ARFLAGS)$@ $(OBJS) $(DMYEXT) $(LIBRUBY): $(RUBYDEF) $(ECHO) linking import-library $@ - $(Q) \ - $(AR) $(ARFLAGS)$@ -def:$(RUBYDEF) + $(Q) $(AR) $(ARFLAGS)$@ -def:$(RUBYDEF) $(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res @echo $(DLDOBJS) @-$(PRE_LIBRUBY_UPDATE) $(ECHO) linking shared-library $@ - $(Q) \ - $(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \ + $(Q) $(LDSHARED) $(MAINOBJ) $(DLDOBJS) $(LIBRUBY_A) \ $(RUBY_SO_NAME).res $(LIBS) -Fe$@ -link $(LDFLAGS) \ $(LIBRUBY_DLDFLAGS) @$(RM) dummy.lib dummy.exp - $(Q) \ - $(LDSHARED_0) - $(Q) \ - $(LDSHARED_1) - $(Q) \ - $(LDSHARED_2) + $(Q) $(LDSHARED_0) + $(Q) $(LDSHARED_1) + $(Q) $(LDSHARED_2) $(RUBYDEF): $(LIBRUBY_A) $(PREP) $(MINIRUBY) $(srcdir)/win32/mkexports.rb \ @@ -934,71 +916,55 @@ {$(srcdir)/enc}.c.obj: $(ECHO) compiling $(<:\=/) - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) {$(srcdir)/missing}.c.obj: $(ECHO) compiling $(<:\=/) - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) {$(srcdir)/win32}.c.obj: $(ECHO) compiling $(<:\=/) - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) {$(win_srcdir)}.c.obj: $(ECHO) compiling $(<:\=/) - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) {$(win_srcdir)/sys}.c.obj: $(ECHO) compiling $(<:\=/) - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) {$(srcdir)}.c.obj: $(ECHO) compiling $(<:\=/) - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) .c.obj: $(ECHO) compiling $(<:\=/) - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c -Tc$(<:\=/) {$(srcdir)/missing}.c.asm: $(ECHO) translating $(<:\=/) - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/) + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/) {$(srcdir)/win32}.c.asm: $(ECHO) translating $(<:\=/) - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/) + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/) {$(srcdir)}.c.asm: $(ECHO) translating $(<:\=/) - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/) + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/) .c.asm: $(ECHO) translating $(<:\=/) - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/) + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -Fa$@ -c -Tc$(<:\=/) {$(srcdir)/missing}.c.i: $(ECHO) preprocessing $(<:\=/) - $(Q) \ - $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) > $@ + $(Q) $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) > $@ {$(srcdir)/win32}.c.i: $(ECHO) preprocessing $(<:\=/) - $(Q) \ - $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) + $(Q) $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) {$(srcdir)}.c.i: $(ECHO) preprocessing $(<:\=/) - $(Q) \ - $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) + $(Q) $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) .c.i: $(ECHO) preprocessing $(<:\=/) - $(Q) \ - $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) + $(Q) $(CC) $(XCFLAGS) $(CPPFLAGS) -P -Tc$(<:\=/) .rc.res: $(ECHO) compiling $(<:\=/) - $(Q) \ - $(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/) + $(Q) $(RC) -I. -I$(<D) $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:\=/) lex.c: {$(srcdir)}lex.c.blt copy $(?:/=\) $@ @@ -1013,8 +979,7 @@ ext/extinit.obj: ext/extinit.c $(SETUP) $(ECHO) compiling ext/extinit.c - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ vmtc.inc vm.inc Index: Makefile.in =================================================================== --- Makefile.in (revision 29768) +++ Makefile.in (revision 29769) @@ -154,14 +154,12 @@ miniruby$(EXEEXT): @-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi $(ECHO) linking $@ - $(Q) \ - $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) $(OUTFLAG)$@ + $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) $(OUTFLAG)$@ $(PROGRAM): @$(RM) $@ $(ECHO) linking $@ - $(Q) \ - $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@ + $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@ # We must `rm' the library each time this rule is invoked because "updating" a # MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not @@ -169,17 +167,14 @@ $(LIBRUBY_A): @$(RM) $@ $(ECHO) linking static-library $@ - $(Q) \ - $(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT) + $(Q) $(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT) @-$(RANLIB) $@ 2> /dev/null || true $(LIBRUBY_SO): @-$(PRE_LIBRUBY_UPDATE) $(ECHO) linking shared-library $@ - $(Q) \ - $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ - -$(Q) \ - $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)*_threadptr_*' $@ + $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ + -$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)*_threadptr_*' $@ @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \ File.symlink "$(LIBRUBY_SO)", link}' \ $(LIBRUBY_ALIASES) || true @@ -196,12 +191,9 @@ install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/config.h \ $(LIBRUBY_A) $(LIBRUBY_SO) $(ARCHFILE) $(ECHO) installing cross-compiling stuff - $(Q) \ - $(MAKEDIRS) $(XRUBY_RUBYLIBDIR)/$(arch) $(XRUBY_RUBYHDRDIR)/$(arch)/ruby - $(Q) \ - sed '/^\$$:\.unshift/q' $(arch)-fake.rb > fake.rb - $(Q) \ - $(BASERUBY) -p \ + $(Q) $(MAKEDIRS) $(XRUBY_RUBYLIBDIR)/$(arch) $(XRUBY_RUBYHDRDIR)/$(arch)/ruby + $(Q) sed '/^\$$:\.unshift/q' $(arch)-fake.rb > fake.rb + $(Q) $(BASERUBY) -p \ -e '~/^\s*CONFIG\["LDFLAGS"\]/ and' \ -e '$$_[/(?=\s*"$$)/] = %q[ #{(CONFIG["LIBPATHFLAG"]%File.dirname(__FILE__)).strip}]' \ rbconfig.rb > fake-rbconfig.rb @@ -279,23 +271,19 @@ .c.@OBJEXT@: @$(ECHO) compiling $< - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $< + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $< .s.@OBJEXT@: @$(ECHO) assembling $< - $(Q) \ - $(AS) $(ASFLAGS) -o $@ $< + $(Q) $(AS) $(ASFLAGS) -o $@ $< .c.S: @$(ECHO) translating $< - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $< + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $< .c.i: @$(ECHO) preprocessing $< - $(Q) \ - $(CPP) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@ + $(Q) $(CPP) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@ clean-local:: @$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output @@ -344,8 +332,7 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) $(ECHO) compiling $@ - $(Q) \ - $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c + $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c up:: @$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP) Index: ext/ripper/depend =================================================================== --- ext/ripper/depend (revision 29768) +++ ext/ripper/depend (revision 29769) @@ -16,10 +16,8 @@ .y.c: $(ECHO) compiling compiler $< - $(Q) \ - $(BISON) -t -v -oy.tab.c $< - $(Q) \ - sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@ + $(Q) $(BISON) -t -v -oy.tab.c $< + $(Q) sed -f $(top_srcdir)/tool/ytab.sed -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@ @$(RM) y.tab.c all: check @@ -27,28 +25,23 @@ ripper.y: $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y $(ECHO) extracting $@ from $< - $(Q) \ - $(RUBY) $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y --output=$@ + $(Q) $(RUBY) $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y --output=$@ check: $(GEN) $(SRC1) $(SRC2) $(ECHO) checking $(SRC1) and $(SRC2) - $(Q) \ - $(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2) + $(Q) $(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2) eventids1.c: $(srcdir)/tools/generate.rb $(SRC1) $(ECHO) generating $@ from $(SRC1) - $(Q) \ - $(RUBY) $(GEN) --mode=eventids1 --ids1src=$(SRC1) --output=$@ + $(Q) $(RUBY) $(GEN) --mode=eventids1 --ids1src=$(SRC1) --output=$@ eventids2table.c: $(srcdir)/tools/generate.rb $(SRC2) $(ECHO) generating $@ from $(SRC2) - $(Q) \ - $(RUBY) $(GEN) --mode=eventids2table --ids2src=$(SRC2) --output=$@ + $(Q) $(RUBY) $(GEN) --mode=eventids2table --ids2src=$(SRC2) --output=$@ # Entries for Ripper maintainer preproc: ripper.E ripper.E: ripper.c $(ECHO) preprocessing $< - $(Q) \ - $(CC) -E $(CPPFLAGS) ripper.c | $(RUBY) $(srcdir)/tools/strip.rb > $@ + $(Q) $(CC) -E $(CPPFLAGS) ripper.c | $(RUBY) $(srcdir)/tools/strip.rb > $@ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/