diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-27 02:03:54 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-27 02:03:54 +0000 |
| commit | d56e4b1b027e15c053407ecd75743ace00a681ae (patch) | |
| tree | 56b62871db9d335ff29906fd1240272e4bdf0231 /lib | |
| parent | 87ff93fb8618cf1b7aa8f88f20d5eb9323aece38 (diff) | |
| download | ruby-d56e4b1b027e15c053407ecd75743ace00a681ae.tar.gz ruby-d56e4b1b027e15c053407ecd75743ace00a681ae.tar.xz ruby-d56e4b1b027e15c053407ecd75743ace00a681ae.zip | |
* common.mk (distclean-enc, realclean-enc): do not call clean of
enc.mk twice or more.
* enc/depend (cleanobjs): added deffile.
* lib/mkmf.rb (create_makefile): removes deffile at clean instead
of distclean.
* win32/Makefile.sub (miniruby, LIBRUBY_SO): removes lib and exp
files.
* win32/Makefile.sub (clean, distclean): have moved to common.mk.
* win32/rmdirs.bat: omits `not empty' message.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 67f9b97aa..54db11829 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1599,7 +1599,7 @@ def create_makefile(target, srcprefix = nil) makedef = %{-e "puts 'EXPORTS', '#{EXPORT_PREFIX}Init_$(TARGET)'"} end if makedef - $distcleanfiles << '$(DEFFILE)' + $cleanfiles << '$(DEFFILE)' origdef = deffile deffile = "$(TARGET)-$(arch).def" end @@ -1649,7 +1649,7 @@ STATIC_LIB = #{staticlib unless $static.nil?} mfile.print " TARGET_SO = #{($extout ? '$(RUBYARCHDIR)/' : '')}$(DLLIB) CLEANLIBS = #{n}.#{CONFIG['DLEXT']} #{config_string('cleanlibs') {|t| t.gsub(/\$\*/) {n}}} -CLEANOBJS = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, '$(TARGET)')}} *.bak +CLEANOBJS = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, "$(TARGET)#{deffile ? '-$(arch)': ''}")} if target} *.bak all: #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"} static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} |