diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-08 19:48:22 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-08 19:48:22 +0000 |
commit | 3703431b51638c30ed1dd2212cbc22c89c919720 (patch) | |
tree | f084295d54e2b3a460049daa1cbe0b3034fe2c27 /lib/mkmf.rb | |
parent | 6c5f7c4466c58ffbe30389361d568eb01226026c (diff) | |
download | ruby-3703431b51638c30ed1dd2212cbc22c89c919720.tar.gz ruby-3703431b51638c30ed1dd2212cbc22c89c919720.tar.xz ruby-3703431b51638c30ed1dd2212cbc22c89c919720.zip |
* Makefile.in, win32/Makefile.sub (MINIRUBY): append MINIRUBYOPT.
* mkconfig.rb, ext/extmk.rb, lib/mkmf.rb, win32/mkexports.rb: suppress
warnings with $VERBOSE.
* win32/resource.rb: only file which has more than one icon is DLL.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10891 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
-rw-r--r-- | lib/mkmf.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index e336b6ecd..e29e43c4d 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1172,6 +1172,7 @@ def create_makefile(target, srcprefix = nil) elsif !(srcs = $srcs) srcs = $objs.collect {|obj| obj.sub(/\.o\z/, '.c')} end + $srcs = srcs for i in $objs i.sub!(/\.o\z/, ".#{$OBJEXT}") end @@ -1205,7 +1206,7 @@ def create_makefile(target, srcprefix = nil) dllib = target ? "$(TARGET).#{CONFIG['DLEXT']}" : "" staticlib = target ? "$(TARGET).#$LIBEXT" : "" mfile = open("Makefile", "wb") - mfile.print *configuration(srcprefix) + mfile.print(*configuration(srcprefix)) mfile.print %{ libpath = #{$LIBPATH.join(" ")} LIBPATH = #{libpath} @@ -1390,7 +1391,7 @@ site-install-rb: install-rb unless suffixes.empty? mfile.print ".SUFFIXES: .", suffixes.uniq.join(" ."), "\n\n" end - mfile.print *depout.flatten + mfile.print(*depout.flatten) else headers = %w[ruby.h defines.h] if RULE_SUBST |