ruby-changes:45652
From: nobu <ko1@a...>
Date: Mon, 27 Feb 2017 15:31:31 +0900 (JST)
Subject: [ruby-changes:45652] nobu:r57725 (trunk): Makefile.in: clean exts.mk files
nobu 2017-02-27 15:31:25 +0900 (Mon, 27 Feb 2017) New Revision: 57725 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57725 Log: Makefile.in: clean exts.mk files * Makefile.in (clean-ext): remove exts.mk files in subdirectories underneath ext. Modified files: trunk/Makefile.in Index: Makefile.in =================================================================== --- Makefile.in (revision 57724) +++ Makefile.in (revision 57725) @@ -420,12 +420,15 @@ clean-ext distclean-ext realclean-ext:: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L420 @cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \ test "$$#" = 0 && set .; \ set dummy `\ - find "$$@" -name Makefile -print | sed 's:^\./::;s:/Makefile$$::' | sort; \ + find "$$@" \( -name Makefile -o -name exts.mk \) -print | \ + sed -n 's:/[^/]*$$::;s:^\./::p' | sort -u; \ `; shift; \ cd ..; \ for dir do \ echo $(@:-ext=)ing "$$dir"; \ - (cd "ext/$$dir" && exec $(MAKE) $(mflags) $(@:-ext=)) && \ + $(RM) "ext/$$dir/exts.mk"; \ + { [ ! -f "ext/$$dir/Makefile" ] || \ + (cd "ext/$$dir" && exec $(MAKE) $(mflags) $(@:-ext=)); } && \ case "$@" in \ *distclean-ext*|*realclean-ext*) \ $(RMDIRS) "ext/$$dir" 2> /dev/null || true;; \ @@ -434,7 +437,7 @@ clean-ext distclean-ext realclean-ext:: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L437 -$(Q)$(RM) ext/extinit.$(OBJEXT) distclean-ext realclean-ext:: - -$(Q)$(RM) ext/extinit.c ext/configure-ext.mk ext/*/exts.mk + -$(Q)$(RM) ext/extinit.c ext/configure-ext.mk -$(Q)$(RMDIR) ext 2> /dev/null || true clean-extout: -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/