diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rwxr-xr-x | ext/extmk.rb | 34 |
2 files changed, 20 insertions, 18 deletions
@@ -1,4 +1,6 @@ -Sat May 19 11:35:33 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sat May 19 11:36:22 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb (command_output): fold long macro lines. * Makefile.in (LIBEXT): add macro. diff --git a/ext/extmk.rb b/ext/extmk.rb index 45c0afd423..45fc9dad81 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -628,25 +628,25 @@ if $configure_only and $command_output mf.puts "MFLAGS = -$(MAKEFLAGS)" if $nmake mf.puts - mf.print "extensions =" - w = 12 - exts.each do |d| - if d.size + w > 70 - mf.print " \\\n\t " - w = 12 + def mf.macro(name, values, max = 70) + print name, " =" + w = w0 = name.size + 2 + h = " \\\n" + "\t" * (w / 8) + " " * (w % 8) + values.each do |s| + if s.size + w > max + print h + w = w0 + end + print " ", s + w += s.size + 1 end - mf.print " #{d}" - w += d.size + 1 + puts end - mf.puts - if !$extlist.empty? - mf.puts "EXTOBJS = ext/extinit.#{$OBJEXT} #{$extobjs.join(' ')}" - mf.puts "EXTLIBS = #{$extlibs.join(' ')}" - else - mf.puts "EXTOBJS = " - mf.puts "EXTLIBS = " - end - mf.puts "EXTLDFLAGS = #{$extflags}" + + mf.macro "extensions", exts + mf.macro "EXTOBJS", $extlist.empty? ? [] : ["ext/extinit.#{$OBJEXT}", *$extobjs] + mf.macro "EXTLIBS", $extlibs + mf.macro "EXTLDFLAGS", $extflags.split mf.puts targets = %w[all install static install-so install-rb clean distclean realclean] targets.each do |tgt| |