summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2022-09-02 22:41:07 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2022-09-03 15:01:05 +0900
commitbc5b9be1ee44817614bc8311e671fc79ca730625 (patch)
tree86132b9f9150f772579d31db08fc8f130d9f2683
parentc8c90e459e37632fee74718d77c63c22814268f7 (diff)
Move duplicate dependencies
-rw-r--r--common.mk2
-rw-r--r--template/Makefile.in5
-rw-r--r--win32/Makefile.sub2
3 files changed, 2 insertions, 7 deletions
diff --git a/common.mk b/common.mk
index 86226b58ca..b159436dae 100644
--- a/common.mk
+++ b/common.mk
@@ -839,6 +839,8 @@ extconf: $(PREP)
$(Q) $(MAKEDIRS) "$(EXTCONFDIR)"
$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
+rbconfig.rb: $(RBCONFIG)
+
$(RBCONFIG): $(tooldir)/mkconfig.rb config.status $(srcdir)/version.h
$(Q)$(BOOTSTRAPRUBY) -n \
-e 'BEGIN{version=ARGV.shift;mis=ARGV.dup}' \
diff --git a/template/Makefile.in b/template/Makefile.in
index facbf062f4..f60986a53f 100644
--- a/template/Makefile.in
+++ b/template/Makefile.in
@@ -355,10 +355,6 @@ pre-install-local:: pkgconfig-data
ruby-runner.h: template/ruby-runner.h.in config.status
@./config.status --file=$@:$(srcdir)/template/$(@F).in
-$(RBCONFIG): $(PREP)
-
-rbconfig.rb: $(RBCONFIG)
-
install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/config.h \
$(LIBRUBY_A) $(LIBRUBY_SO) $(ARCHFILE) pkgconfig-data
$(ECHO) installing cross-compiling stuff
@@ -671,7 +667,6 @@ $(INSNS): $(srcdir)/insns.def vm_opts.h \
$(ECHO) generating $@
$(Q) $(BASERUBY) -Ku $(tooldir)/insns2vm.rb $(INSNS2VMOPT) $@
-verconf.h: $(RBCONFIG)
loadpath: verconf.h
@$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 3de53d8372..bb9e12d3ca 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1211,8 +1211,6 @@ clean-enc distclean-enc realclean-enc:
-$(Q)$(MAKE) $(MAKE_ENC) $(@:-enc=)
!endif
-$(RBCONFIG): $(PREP)
-
$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
@$(MINIRUBY) $(srcdir)/win32/resource.rb \
-ruby_name=$(RUBY_INSTALL_NAME) \