texlive[57770] Build/source/texk/web2c: [CWEB] Main CWEB modules

[commits+ascherer at tug.org]

Revision: 57770
          http://tug.org/svn/texlive?view=revision&revision=57770
Author:   ascherer
Date:     2021-02-17 12:40:54 +0100 (Wed, 17 Feb 2021)
Log Message:
-----------
[CWEB] Main CWEB modules depend on COMMON interface.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/ChangeLog
    trunk/Build/source/texk/web2c/Makefile.in
    trunk/Build/source/texk/web2c/am/bootstrap.am
    trunk/Build/source/texk/web2c/cwebdir/ChangeLog
    trunk/Build/source/texk/web2c/cwebdir/Makefile

Modified: trunk/Build/source/texk/web2c/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/ChangeLog	2021-02-17 03:03:54 UTC (rev 57769)
+++ trunk/Build/source/texk/web2c/ChangeLog	2021-02-17 11:40:54 UTC (rev 57770)
@@ -1,3 +1,8 @@
+2021-02-16  Andreas Scherer  <https://ascherer.github.io>
+
+	* Makefile.in,
+	* am/bootstrap.am: Main CWEB modules depend on COMMON interface.
+
 2021-02-17  Karl Berry  <karl at tug.org>
 
 	* NEWS,

Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in	2021-02-17 03:03:54 UTC (rev 57769)
+++ trunk/Build/source/texk/web2c/Makefile.in	2021-02-17 11:40:54 UTC (rev 57770)
@@ -21063,12 +21063,11 @@
 .pin.p:
 	$(cp_silent)cp -f $< $@
 $(tangleboot_OBJECTS): $(tangleboot_DEPENDENCIES)
-ctangle.c: ctangleboot$(EXEEXT) cwebdir/comm-w2c.h cwebdir/ctangle.w cwebdir/ctang-w2c.ch ctangleboot-sh
+ctangle.c: common-ctangle cwebdir/ctangle.w cwebdir/ctang-w2c.ch
 	@$(ctangleboot) ctangle ctang-w2c
-cweb.c: common-ctangle
+cweb.c: common-ctangle cwebdir/common.w cwebdir/comm-w2c.ch
 	@$(ctangleboot) common comm-w2c cweb.c
-common-ctangle: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch ctangleboot-sh
-	@$(ctangleboot) common comm-w2c cweb.c
+common-ctangle: ctangleboot$(EXEEXT) cwebdir/comm-w2c.h ctangleboot-sh
 $(ctangleboot_OBJECTS): $(ctangleboot_DEPENDENCIES)
 # ctangleboot.cin and cwebboot.cin are in the distribution
 .cin.c:

Modified: trunk/Build/source/texk/web2c/am/bootstrap.am
===================================================================
--- trunk/Build/source/texk/web2c/am/bootstrap.am	2021-02-17 03:03:54 UTC (rev 57769)
+++ trunk/Build/source/texk/web2c/am/bootstrap.am	2021-02-17 11:40:54 UTC (rev 57770)
@@ -62,12 +62,11 @@
 # ctangle.c and cweb.c are special cases, since they are needed to compile
 # themselves.  We depend on ctangleboot, even though we might not use it.
 ctangleboot = AM_V_P=$(AM_V_P) $(SHELL) ./ctangleboot-sh $@
-ctangle.c: ctangleboot$(EXEEXT) cwebdir/comm-w2c.h cwebdir/ctangle.w cwebdir/ctang-w2c.ch ctangleboot-sh
+ctangle.c: common-ctangle cwebdir/ctangle.w cwebdir/ctang-w2c.ch
 	@$(ctangleboot) ctangle ctang-w2c
-cweb.c: common-ctangle
+cweb.c: common-ctangle cwebdir/common.w cwebdir/comm-w2c.ch
 	@$(ctangleboot) common comm-w2c cweb.c
-common-ctangle: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch ctangleboot-sh
-	@$(ctangleboot) common comm-w2c cweb.c
+common-ctangle: ctangleboot$(EXEEXT) cwebdir/comm-w2c.h ctangleboot-sh
 EXTRA_DIST += cwebdir
 NEVER_DIST += cwebdir/cweave.log cwebdir/cweave.trs
 NEVER_DIST += cwebdir/ctwill.log cwebdir/ctwill.trs

Modified: trunk/Build/source/texk/web2c/cwebdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2021-02-17 03:03:54 UTC (rev 57769)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2021-02-17 11:40:54 UTC (rev 57770)
@@ -1,3 +1,7 @@
+2021-02-17  Andreas Scherer  <https://ascherer.github.io>
+
+	* Makefile: Main CWEB modules depend on COMMON inteface.
+
 2021-02-16  Andreas Scherer  <https://ascherer.github.io>
 
 	* common.c,

Modified: trunk/Build/source/texk/web2c/cwebdir/Makefile
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/Makefile	2021-02-17 03:03:54 UTC (rev 57769)
+++ trunk/Build/source/texk/web2c/cwebdir/Makefile	2021-02-17 11:40:54 UTC (rev 57770)
@@ -125,7 +125,7 @@
 SAVEcommon.c:
 	$(CP) common.c SAVEcommon.c
 
-common.c: common.w $(CCHANGES)
+common.c: common.w $(CCHANGES) common.h
 	$(CTANGLE) common $(CCHANGES)
 
 common.o: common.c
@@ -134,13 +134,13 @@
 ctangle: ctangle.o common.o
 	$(CC) $(LINKFLAGS) -o ctangle ctangle.o common.o 
 
-ctangle.c: ctangle.w $(TCHANGES)
+ctangle.c: ctangle.w $(TCHANGES) common.h
 	$(CTANGLE) ctangle $(TCHANGES)
 
 cweave: cweave.o common.o
 	$(CC) $(LINKFLAGS) -o cweave cweave.o common.o
 
-cweave.c: cweave.w $(WCHANGES)
+cweave.c: cweave.w $(WCHANGES) common.h prod.w
 	$(CTANGLE) cweave $(WCHANGES)
 
 doc: $(SOURCES:.w=.dvi)