diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-09-01 16:13:18 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-12-05 17:09:49 +0900 |
| commit | 30379e33c3f5fdac0692ed56cf3cf90aa31a3d3a (patch) | |
| tree | 4148e34b1ec7a4c885db50960aba0921c2873f85 | |
| parent | facb5cd4d5405dafabe0bd150f5dc56dc73aa96a (diff) | |
| download | ruby-30379e33c3f5fdac0692ed56cf3cf90aa31a3d3a.tar.gz | |
Handle depend files on nmake
| -rw-r--r-- | common.mk | 12 | ||||
| -rw-r--r-- | template/Makefile.in | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 |
3 files changed, 11 insertions, 6 deletions
@@ -1225,9 +1225,9 @@ $(REVISION_H)$(yes_baseruby:yes=~disabled~): $(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/parse.y $(srcdir)/defs/id.def $(srcdir)/ext/ripper/depend $(ECHO) generating $@ $(Q) $(CHDIR) $(@D) && \ - sed -e "s/{\$$([^(){}]*)[^{}]*}//g" -e /AUTOGENERATED/q depend | \ + $(CAT_DEPEND) depend | \ $(exec) $(MAKE) -f - $(mflags) \ - Q=$(Q) ECHO=$(ECHO) RM="$(RM1)" BISON=$(YACC) top_srcdir=../.. srcdir=. VPATH=../.. \ + Q=$(Q) ECHO=$(ECHO) RM="$(RM1)" BISON="$(YACC)" top_srcdir=../.. srcdir=. VPATH=../.. \ RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" LANG=C $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(srcdir)/ext/json/parser/prereq.mk @@ -1244,7 +1244,7 @@ $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \ $(tooldir)/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.ac $(ECHO) generating $@ $(Q) $(CHDIR) $(@D) && \ - sed /AUTOGENERATED/q depend | \ + $(CAT_DEPEND) depend | \ $(exec) $(MAKE) -f - $(mflags) \ Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)" $(@F) @@ -1252,19 +1252,19 @@ $(srcdir)/ext/rbconfig/sizeof/limits.c: $(srcdir)/ext/rbconfig/sizeof/depend \ $(tooldir)/generic_erb.rb $(srcdir)/template/limits.c.tmpl $(ECHO) generating $@ $(Q) $(CHDIR) $(@D) && \ - sed /AUTOGENERATED/q depend | \ + $(CAT_DEPEND) depend | \ $(exec) $(MAKE) -f - $(mflags) \ Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)" $(@F) $(srcdir)/ext/socket/constdefs.c: $(srcdir)/ext/socket/depend $(Q) $(CHDIR) $(@D) && \ - sed /AUTOGENERATED/q depend | \ + $(CAT_DEPEND) depend | \ $(exec) $(MAKE) -f - $(mflags) \ Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)" $(srcdir)/ext/etc/constdefs.h: $(srcdir)/ext/etc/depend $(Q) $(CHDIR) $(@D) && \ - sed /AUTOGENERATED/q depend | \ + $(CAT_DEPEND) depend | \ $(exec) $(MAKE) -f - $(mflags) \ Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)" diff --git a/template/Makefile.in b/template/Makefile.in index ab82bcfb7b..c0cf9f0494 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -283,6 +283,8 @@ configure_args = @configure_args@ ABI_VERSION_HDR = $(hdrdir)/ruby/internal/abi.h +CAT_DEPEND = sed -e 's/{\$$([^(){}]*)[^{}]*}//g' -e /AUTOGENERATED/q + .SUFFIXES: .inc .h .c .y .i .$(ASMEXT) .$(DTRACE_EXT) all: diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 02333d0206..0f4dd62ac0 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -91,6 +91,7 @@ PURIFY = AUTOCONF = autoconf IFCHANGE = $(COMSPEC) /C $(srcdir:/=\)\win32\ifchange.bat RM = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat +RM1 = del RMDIR = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat RMDIRS = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat -f -r @@ -105,6 +106,8 @@ BASERUBY = ruby TEST_RUNNABLE = yes !endif +CAT_DEPEND = type + !if !defined(MACHINE) MACHINE = x86 !endif |