fixup! Gererate prism source files dependencies from template.rb

Author: nobu

common.mk

@@ -1302,6 +1302,11 @@ $(REVISION_H)$(yes_baseruby:yes=~disabled~):
 # uncommon.mk: $(REVISION_H)
 # $(MKFILES): $(REVISION_H)
 
+# $(common_mk_includes) is set by config.status or GNUmakefile
+common_mk__$(gnumake:yes=artifact)_ = uncommon.mk
+common_mk_$(gnumake)_artifact_ = $(MKFILES)
+$(common_mk__artifact_): $(srcdir)/common.mk $(common_mk_includes)
+
 ripper_srcs: $(RIPPER_SRCS)
 
 $(RIPPER_SRCS): $(srcdir)/parse.y $(srcdir)/defs/id.def

configure.ac

@@ -4670,12 +4670,6 @@ AS_IF([test ! -f "$srcdir/revision.h"], [
     ])
 ])
 
-set X `sed -n 's/^!include  *//p' ${srcdir}/common.mk`
-shift
-X_common_mk_includes="$*"
-AC_SUBST(X_common_mk_includes)
-common_mk_includes="`echo \"${X_common_mk_includes}\" | sed 's|\$(srcdir)|'\"${srcdir}|g\"`"
-
 AS_IF([test x"$firstmf" != x], [
     AC_CONFIG_FILES($firstmf:$firsttmpl, [], [firstmf="$firstmf" firsttmpl="$firsttmpl"])
 ])
@@ -4704,8 +4698,12 @@ AC_CONFIG_FILES(Makefile:template/Makefile.in, [
 	sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
 	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
 	AS_IF([test "$gnumake" != yes], [
-	    echo ['$(MKFILES): $(srcdir)/common.mk '"${X_common_mk_includes}"]
-	    sed ['s/{\$([^(){}]*)[^{}]*}//g;/^!/d'] ${srcdir}/common.mk ${common_mk_includes}
+	    # extract NMake-style include list
+	    set = `sed -n 's/^!include  *//p' ${srcdir}/common.mk`
+	    echo common_mk_includes "@S|@*" # generate the macro assignment
+	    shift
+	    common_mk_includes="`echo \"@S|@*\" | sed 's|\$(srcdir)|.|g'`"
+	    (cd ${srcdir} && sed -f tool/prereq.status common.mk ${common_mk_includes})
             AS_IF([test "$YJIT_SUPPORT" = yes], [
                 cat ${srcdir}/yjit/not_gmake.mk
                 echo ['$(MKFILES): ${srcdir}/yjit/not_gmake.mk']

template/GNUmakefile.in

@@ -27,5 +27,8 @@ override UNICODE_TABLES_DEPENDENTS = \
 		    $(UNICODE_TABLES_DATA_FILES)))),\
 	    force,none)
 
+# extract NMake-style include list
+common_mk_includes := $(shell sed -n 's/^!include  *//p' $(srcdir)/common.mk)
+
 -include uncommon.mk
 include $(srcdir)/defs/gmake.mk

template/Makefile.in

@@ -426,8 +426,8 @@ $(MKFILES): config.status $(srcdir)/version.h $(ABI_VERSION_HDR)
 		$(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \
 		{ echo "$@ updated, restart."; exit 1; }
 
-uncommon.mk: $(srcdir)/common.mk @X_common_mk_includes@
-	sed -f $(srcdir)/tool/prereq.status $(srcdir)/common.mk @X_common_mk_includes@ > $@
+uncommon.mk: $(srcdir)/tool/prereq.status
+	sed -f $(srcdir)/tool/prereq.status $(srcdir)/common.mk $(common_mk_includes) > $@
 
 .PHONY: reconfig
 reconfig-args = $(srcdir)/$(CONFIGURE) $(yes_silence:yes=--silent) $(configure_args)