archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Split autogenerated dependency to depend file from common.mk

Browse source
This commit is contained in:
Hiroshi SHIBATA 2025-07-22 11:48:57 +09:00
parent 199861424e
commit be7b1164e6
7 changed files with 20437 additions and 20439 deletions
Download patch file Download diff file Expand all files Collapse all files

20432
common.mk
View file

File diff suppressed because it is too large Load diff

4
configure.ac
View file

@ -4693,8 +4693,8 @@ AC_CONFIG_FILES(Makefile:template/Makefile.in, [
sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)' echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
AS_IF([test "$gnumake" != yes], [ AS_IF([test "$gnumake" != yes], [
echo ['$(MKFILES): $(srcdir)/common.mk'] echo ['$(MKFILES): $(srcdir)/common.mk $(srcdir)/depend']
sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk ${srcdir}/depend
AS_IF([test "$YJIT_SUPPORT" = yes], [ AS_IF([test "$YJIT_SUPPORT" = yes], [
cat ${srcdir}/yjit/not_gmake.mk cat ${srcdir}/yjit/not_gmake.mk
echo ['$(MKFILES): ${srcdir}/yjit/not_gmake.mk'] echo ['$(MKFILES): ${srcdir}/yjit/not_gmake.mk']

2
defs/gmake.mk
View file

@ -204,7 +204,7 @@ post-commit: $(if $(DOT_WAIT),,do-commit)
+$(Q) \ +$(Q) \
{ \ { \
$(in-srcdir) \ $(in-srcdir) \
exec sed -f tool/prereq.status defs/gmake.mk template/Makefile.in common.mk; \ exec sed -f tool/prereq.status defs/gmake.mk template/Makefile.in common.mk depend; \
} | \ } | \
$(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) \ $(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) \
top_srcdir="$(top_srcdir)" srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \ top_srcdir="$(top_srcdir)" srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \

20429
depend Normal file
View file

File diff suppressed because it is too large Load diff

4
template/Makefile.in
View file

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

2
tool/update-deps
View file

@ -214,7 +214,7 @@ def in_makefile(target, source)
when %r{\Acoroutine/} then source2 = "{$(VPATH)}$(COROUTINE_H)" when %r{\Acoroutine/} then source2 = "{$(VPATH)}$(COROUTINE_H)"
else source2 = "$(top_srcdir)/#{source}" else source2 = "$(top_srcdir)/#{source}"
end end
["common.mk", target2, source2] ["depend", target2, source2]
when %r{\Aenc/} when %r{\Aenc/}
target2 = "#{target.sub(/\.o\z/, '.$(OBJEXT)')}" target2 = "#{target.sub(/\.o\z/, '.$(OBJEXT)')}"
case source case source

3
win32/Makefile.sub
View file

@ -537,7 +537,7 @@ MESSAGE_END = ) do @echo.%~I)
ECHO_BEGIN = @echo. ECHO_BEGIN = @echo.
ECHO_END = ECHO_END =
all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk $(srcdir)/depend
prog: config prog: config
ruby: $(PROGRAM) ruby: $(PROGRAM)
@ -569,6 +569,7 @@ ACTIONS_ENDGROUP = @::
ABI_VERSION_HDR = $(hdrdir)/ruby/internal/abi.h ABI_VERSION_HDR = $(hdrdir)/ruby/internal/abi.h
!include $(srcdir)/common.mk !include $(srcdir)/common.mk
!include $(srcdir)/depend
!ifdef SCRIPTPROGRAMS !ifdef SCRIPTPROGRAMS
!else if [echo>scriptbin.mk SCRIPTPROGRAMS = \] !else if [echo>scriptbin.mk SCRIPTPROGRAMS = \]