[前][次][番号順一覧][スレッド一覧]

ruby-changes:45656

From: nobu <ko1@a...>
Date: Mon, 27 Feb 2017 17:23:23 +0900 (JST)
Subject: [ruby-changes:45656] nobu:r57729 (trunk): Makefile.in: by exts.mk

nobu	2017-02-27 17:23:18 +0900 (Mon, 27 Feb 2017)

  New Revision: 57729

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57729

  Log:
    Makefile.in: by exts.mk
    
    * Makefile.in (clean-ext): recurse by exts.mk in parallel first.

  Modified files:
    trunk/Makefile.in
    trunk/template/exts.mk.tmpl
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 57728)
+++ Makefile.in	(revision 57729)
@@ -417,6 +417,7 @@ distclean-local:: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L417
 	-$(Q)$(RMDIRS) $(arch_hdrdir)/ruby 2> /dev/null || true
 
 clean-ext distclean-ext realclean-ext::
+	@[ -f $(EXTS_MK) ] && $(MAKE) -f $(EXTS_MK) $(@:-ext=)
 	@cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
 	test "$$#" = 0 && set .; \
 	set dummy `\
Index: template/exts.mk.tmpl
===================================================================
--- template/exts.mk.tmpl	(revision 57728)
+++ template/exts.mk.tmpl	(revision 57729)
@@ -91,6 +91,9 @@ end https://github.com/ruby/ruby/blob/trunk/template/exts.mk.tmpl#L91
 % unless macros["MFLAGS"].empty?
 MFLAGS =<%= macros["MFLAGS"].fold(column) %>
 % end
+% RbConfig::MAKEFILE_CONFIG.keys.grep(/RM/) do |k|
+<%=k%> = <%=RbConfig::MAKEFILE_CONFIG[k]%>
+% end
 
 extensions =<%= macros["extensions"].fold(column) %>
 EXTOBJS =<%= macros["EXTOBJS"].fold(column) %>
@@ -125,7 +128,13 @@ ext/extinit.<%=objext%>: https://github.com/ruby/ruby/blob/trunk/template/exts.mk.tmpl#L128
 
 % targets.product(macros["extensions"].map {|e|e.chomp("/.")}) do |t, e|
 <%=e%>/<%=t%>:
+%   if /^(dist|real)clean$/ =~ t
+	$(ECHO) $(@F)ing $(@D)
+%   end
 	$(Q)<%= submake %><%=mflags%> V=$(V) $(@F)
+%   if /^(dist|real)clean$/ =~ t
+	$(Q)$(RMDIRS) $(@D)
+%   end
 % end
 
 extso:

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]