Skip to content

Commit be7b116

Browse files
committed
Split autogenerated dependency to depend file from common.mk
1 parent 1998614 commit be7b116

File tree

7 files changed

+20437
-20439
lines changed

7 files changed

+20437
-20439
lines changed

common.mk

Lines changed: 0 additions & 20432 deletions
Large diffs are not rendered by default.

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4693,8 +4693,8 @@ AC_CONFIG_FILES(Makefile:template/Makefile.in, [
46934693
sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
46944694
echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
46954695
AS_IF([test "$gnumake" != yes], [
4696-
echo ['$(MKFILES): $(srcdir)/common.mk']
4697-
sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
4696+
echo ['$(MKFILES): $(srcdir)/common.mk $(srcdir)/depend']
4697+
sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk ${srcdir}/depend
46984698
AS_IF([test "$YJIT_SUPPORT" = yes], [
46994699
cat ${srcdir}/yjit/not_gmake.mk
47004700
echo ['$(MKFILES): ${srcdir}/yjit/not_gmake.mk']

defs/gmake.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ post-commit: $(if $(DOT_WAIT),,do-commit)
204204
+$(Q) \
205205
{ \
206206
$(in-srcdir) \
207-
exec sed -f tool/prereq.status defs/gmake.mk template/Makefile.in common.mk; \
207+
exec sed -f tool/prereq.status defs/gmake.mk template/Makefile.in common.mk depend; \
208208
} | \
209209
$(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) \
210210
top_srcdir="$(top_srcdir)" srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \

depend

Lines changed: 20429 additions & 0 deletions
Large diffs are not rendered by default.

template/Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,8 +397,8 @@ $(MKFILES): config.status $(srcdir)/version.h $(ABI_VERSION_HDR)
397397
$(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \
398398
{ echo "$@ updated, restart."; exit 1; }
399399

400-
uncommon.mk: $(srcdir)/common.mk
401-
sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@
400+
uncommon.mk: $(srcdir)/common.mk $(srcdir)/depend
401+
sed 's/{\$$([^(){}]*)[^{}]*}//g' $(srcdir)/common.mk $(srcdir)/depend > $@
402402

403403
.PHONY: reconfig
404404
reconfig-args = $(srcdir)/$(CONFIGURE) $(yes_silence:yes=--silent) $(configure_args)

tool/update-deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ def in_makefile(target, source)
214214
when %r{\Acoroutine/} then source2 = "{$(VPATH)}$(COROUTINE_H)"
215215
else source2 = "$(top_srcdir)/#{source}"
216216
end
217-
["common.mk", target2, source2]
217+
["depend", target2, source2]
218218
when %r{\Aenc/}
219219
target2 = "#{target.sub(/\.o\z/, '.$(OBJEXT)')}"
220220
case source

win32/Makefile.sub

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ MESSAGE_END = ) do @echo.%~I)
537537
ECHO_BEGIN = @echo.
538538
ECHO_END =
539539

540-
all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk
540+
all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk $(srcdir)/depend
541541
prog: config
542542

543543
ruby: $(PROGRAM)
@@ -569,6 +569,7 @@ ACTIONS_ENDGROUP = @::
569569
ABI_VERSION_HDR = $(hdrdir)/ruby/internal/abi.h
570570

571571
!include $(srcdir)/common.mk
572+
!include $(srcdir)/depend
572573

573574
!ifdef SCRIPTPROGRAMS
574575
!else if [echo>scriptbin.mk SCRIPTPROGRAMS = \]

0 commit comments

Comments
 (0)