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

* configure.in (Makefile): removes GNU make specific files on

distclean.

* Makefile.in (distclean-ext): removes extension directories.

* lib/mkmf.rb (try_do): removes conftest.dSYM


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20965 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-12-24 04:45:34 +00:00
parent d1af8511af
commit b8e79f34a2
3 changed files with 9 additions and 2 deletions

View file

@ -227,7 +227,8 @@ clean-ext distclean-ext realclean-ext::
@find ext -name Makefile | sort | while read mk; do \
dir=`dirname "$$mk"`; \
echo $(@:-ext=)ing `expr "$$dir" : 'ext/\(.*\)'`; \
(cd "$$dir"; $(MAKE) $(MFLAGS) $(@:-ext=)); \
(cd "$$dir"; $(MAKE) $(MFLAGS) $(@:-ext=)) && \
test $@ != clean-ext && rmdir -p "$$dir" 2> /dev/null; \
done
ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)

View file

@ -2144,6 +2144,8 @@ AC_CONFIG_FILES(Makefile, [{
if test "$gnumake" != yes; then
echo ['$(MKFILES): $(srcdir)/common.mk']
sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
else
echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
fi
} >> confmk$$.tmp && mv -f confmk$$.tmp Makefile],
[RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT gnumake=$gnumake])

View file

@ -194,6 +194,10 @@ def rm_f(*files)
FileUtils.rm_f(Dir[*files])
end
def rm_rf(*files)
FileUtils.rm_rf(Dir[*files])
end
# Returns time stamp of the +target+ file if it exists and is newer
# than or equal to all of +times+.
def modified?(target, times)
@ -361,6 +365,7 @@ MSG
xsystem(command)
ensure
log_src(src)
rm_rf 'conftest.dSYM'
end
def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
@ -1894,7 +1899,6 @@ clean:
\t\t@-$(RM) $(CLEANLIBS#{sep}) $(CLEANOBJS#{sep}) $(CLEANFILES#{sep})
distclean: clean
\t\t@-$(RM_RF) conftest.dSYM
\t\t@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
\t\t@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep})