diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-01 12:16:24 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-01 12:16:24 +0000 |
| commit | b128ab3e555a4f8ccb40450273be35cce60fd525 (patch) | |
| tree | 1ba8fc5267f7cfde1a1c35165e82f1f612467df5 /Build/source/texk | |
| parent | d23f168a1eae3fe44920853473b2cb3d959c9532 (diff) | |
new build system: fixed libs/gd/ header and texk/web2c/ctangleboot parallel build problems
git-svn-id: svn://tug.org/texlive/trunk@12590 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
| -rw-r--r-- | Build/source/texk/web2c/Makefile.in | 4 | ||||
| -rw-r--r-- | Build/source/texk/web2c/am/bootstrap.am | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index f58be76c7ed..39a2c00e240 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -7051,7 +7051,7 @@ cweb.c: ctangleboot$(EXEEXT) cwebdir/common.w cwebdir/comm-w2c.ch CWEBINPUTS=$(srcdir)/cwebdir $(ctangleboot) common comm-w2c cweb.c stamp-ctangle: ctangleboot.c cwebboot.c date >stamp-ctangle -ctangleboot.c: cwebdir/ctangle.w cwebdir/ctang-w2c.ch +ctangleboot.c: cwebboot.c cwebdir/ctangle.w cwebdir/ctang-w2c.ch if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \ CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) ctangle ctang-w2c; \ mv ctangle.c ctangleboot.c; \ @@ -7071,8 +7071,6 @@ cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch else \ cp $(srcdir)/cwebboot.c .; \ fi - date >stamp-ctangle - $(MAKE) $(AM_MAKEFLAGS) ctangle$(EXEEXT) bibtex.c bibtex.h: bibtex-web2c bibtex-web2c: $(web2c_common) $(web2c_programs) web2c/cvtbib.sed bibtex.p $(web2c) bibtex diff --git a/Build/source/texk/web2c/am/bootstrap.am b/Build/source/texk/web2c/am/bootstrap.am index 3b91ffe67c5..a4dd05ccc80 100644 --- a/Build/source/texk/web2c/am/bootstrap.am +++ b/Build/source/texk/web2c/am/bootstrap.am @@ -1,7 +1,7 @@ ## texk/web2c/am/bootstrap.am: Makefile fragment for tangle and ctangle. ## Bootstrapping tangle requires making it with itself. We use the opportunity -## to create an up-to-date tangleboot as well. +## to create an up-to-date tangleboot.p as well. bin_PROGRAMS += tangle nodist_tangle_SOURCES = tangle.c tangle.h tangle.c tangle.h: tangle-web2c @@ -53,7 +53,7 @@ tangleboot.p: tangle.web tangle.ch DISTCLEANFILES += stamp-tangle tangleboot.c tangleboot.h ## Bootstrapping ctangle requires making it with itself. We use the opportunity -## to create an up-to-date ctangleboot as well. +## to create an up-to-date ctangleboot.c and cwebboot.c as well. bin_PROGRAMS += ctangle nodist_ctangle_SOURCES = ctangle.c cweb.c ## ctangle.c is a special case, since it is needed to compile itself. @@ -76,7 +76,8 @@ stamp-ctangle: ctangleboot.c cwebboot.c ## This is not run unless one of the cwebdir/* files is changed. ## Only try to run ./ctangle if it actually exists, otherwise ## just touch ctangleboot.c and/or cwebboot.c and build ctangle. -ctangleboot.c: cwebdir/ctangle.w cwebdir/ctang-w2c.ch +## We must serialize this. +ctangleboot.c: cwebboot.c cwebdir/ctangle.w cwebdir/ctang-w2c.ch if [ -r $(CTANGLE) ] || [ -r $(CTANGLE).exe ]; then \ CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) ctangle ctang-w2c; \ mv ctangle.c ctangleboot.c; \ @@ -96,8 +97,6 @@ cwebboot.c: cwebdir/common.w cwebdir/comm-w2c.ch else \ cp $(srcdir)/cwebboot.c .; \ fi - date >stamp-ctangle - $(MAKE) $(AM_MAKEFLAGS) ctangle$(EXEEXT) DISTCLEANFILES += stamp-ctangle ## Tests |