nobu	2015-03-22 08:09:49 +0900 (Sun, 22 Mar 2015)

  New Revision: 50045

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

  Log:
    common.mk: strip autogenerated dependencies
    
    * common.mk (ext/ripper/ripper.c, ext/rbconfig/sizeof/sizes.c):
      strip autogenerated dependencies which have invalid syntax in
      other than nmake.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 50044)
+++ ChangeLog	(revision 50045)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Mar 22 08:09:47 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (ext/ripper/ripper.c, ext/rbconfig/sizeof/sizes.c):
+	  strip autogenerated dependencies which have invalid syntax in
+	  other than nmake.
+
 Sat Mar 21 15:01:26 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/io/console/console.c (console_set_winsize): use handle for
Index: common.mk
===================================================================
--- common.mk	(revision 50044)
+++ common.mk	(revision 50045)
@@ -835,9 +835,10 @@ $(REVISION_H): $(srcdir)/version.h $(src https://github.com/ruby/ruby/blob/trunk/common.mk#L835
 
 $(srcdir)/ext/ripper/ripper.c: parse.y id.h
 	$(ECHO) generating $@
-	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
-		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" VPATH="$(PWD)" \
-		top_srcdir=../.. srcdir=. \
+	$(Q) $(CHDIR) $(@D) && \
+	sed /AUTOGENERATED/q depend | \
+	$(exec) $(MAKE) -f - $(MFLAGS) \
+		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH=../.. \
 		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
 
 $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
@@ -848,7 +849,9 @@ $(srcdir)/ext/json/parser/parser.c: $(sr https://github.com/ruby/ruby/blob/trunk/common.mk#L849
 $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \
 		$(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in
 	$(ECHO) generating $@
-	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
+	$(Q) $(CHDIR) $(@D) && \
+	sed /AUTOGENERATED/q depend | \
+	$(exec) $(MAKE) -f - $(MFLAGS) \
 		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)"
 
 ##

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