1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* common.mk, ext/extmk.rb: make ext and .ext get removed by distclean.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2004-04-22 09:25:16 +00:00
parent 074852e540
commit 7b9431d98d
3 changed files with 10 additions and 5 deletions

View file

@ -1,3 +1,7 @@
Thu Apr 22 18:25:10 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk, ext/extmk.rb: make ext and .ext get removed by distclean.
Thu Apr 22 10:07:01 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* */Makefile.sub (distclean-local): should remove $(RBCONFIG).

View file

@ -103,7 +103,7 @@ install-doc: $(PROGRAM)
clean: clean-ext clean-local
clean-local::
@$(RM) $(OBJS) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT)
@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(PREP) $(ARCHFILE)
clean-ext:
@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) clean

View file

@ -126,7 +126,7 @@ def extmake(target)
end
args = sysquote($mflags)
if $static
args += ["static"]
args += ["static"] unless $clean
$extlist.push [$static, $target, File.basename($target), $preload]
end
unless system($make, *args)
@ -317,10 +317,10 @@ exts |= Dir.glob("#{ext_prefix}/*/**/MANIFEST").collect {|d|
} unless $extension
if $extout
Config.expand(extout = $extout+"/.", Config::CONFIG.merge("topdir"=>$topdir))
Config.expand(extout = $extout, Config::CONFIG.merge("topdir"=>$topdir))
if $install
Config.expand(dest = "#{$destdir}#{$rubylibdir}")
FileUtils.cp_r(extout, dest, :verbose => true, :noop => $dryrun)
FileUtils.cp_r(extout+"/.", dest, :verbose => true, :noop => $dryrun)
exit
end
unless $ignore
@ -340,10 +340,11 @@ $hdrdir = $top_srcdir = srcdir
$topdir = "."
if $ignore
FileUtils.rm_f(%W"extinit.c extinit.#{$OBJEXT}") if $clean
Dir.chdir ".."
if $clean
Dir.rmdir('ext') rescue nil
FileUtils.rm_rf($extout) if $extout
FileUtils.rm_rf(extout) if $extout
end
exit
end