From 04176e4b2a7a8605c6c25bf494fc06c580235324 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Wed, 17 Feb 2021 11:40:54 +0000 Subject: [CWEB] Main CWEB modules depend on COMMON interface. git-svn-id: svn://tug.org/texlive/trunk@57770 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/ChangeLog | 5 +++++ Build/source/texk/web2c/Makefile.in | 7 +++---- Build/source/texk/web2c/am/bootstrap.am | 7 +++---- Build/source/texk/web2c/cwebdir/ChangeLog | 4 ++++ Build/source/texk/web2c/cwebdir/Makefile | 6 +++--- 5 files changed, 18 insertions(+), 11 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 32c710863e1..4129e2c27e8 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,8 @@ +2021-02-16 Andreas Scherer + + * Makefile.in, + * am/bootstrap.am: Main CWEB modules depend on COMMON interface. + 2021-02-17 Karl Berry * NEWS, diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 3bf914b8f73..e623bd7fdde 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -21063,12 +21063,11 @@ tangleboot-web2c: tangleboot.p $(web2c_depend) .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 - @$(ctangleboot) common comm-w2c cweb.c -common-ctangle: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch ctangleboot-sh +cweb.c: common-ctangle cwebdir/common.w cwebdir/comm-w2c.ch @$(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: diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am index 5199f430e26..63717703ae3 100644 --- a/Build/source/texk/web2c/am/bootstrap.am +++ b/Build/source/texk/web2c/am/bootstrap.am @@ -62,12 +62,11 @@ nodist_ctangle_SOURCES = ctangle.c cweb.c # 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 - @$(ctangleboot) common comm-w2c cweb.c -common-ctangle: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch ctangleboot-sh +cweb.c: common-ctangle cwebdir/common.w cwebdir/comm-w2c.ch @$(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 diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index cddae2428d5..6a278c0ae5c 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -1,3 +1,7 @@ +2021-02-17 Andreas Scherer + + * Makefile: Main CWEB modules depend on COMMON inteface. + 2021-02-16 Andreas Scherer * common.c, diff --git a/Build/source/texk/web2c/cwebdir/Makefile b/Build/source/texk/web2c/cwebdir/Makefile index 8e4e6d33812..f8f30afefb4 100644 --- a/Build/source/texk/web2c/cwebdir/Makefile +++ b/Build/source/texk/web2c/cwebdir/Makefile @@ -125,7 +125,7 @@ SAVEctangle.c: 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 @@ common.o: common.c 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) -- cgit v1.2.3