summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-14 12:38:56 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-14 12:38:56 +0000
commit45bedb3177b9154e6f33b56b7dfb74f9eac5b558 (patch)
tree7567d16968338bd7617020de9cbb2d71474b86ab /Build
parentf1d3ba0a3734449d269ee61143f02c6956b88ced (diff)
build system fixes: mft.test, parallel make problems
git-svn-id: svn://tug.org/texlive/trunk@13085 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfm/configure.ac2
-rw-r--r--Build/source/texk/web2c/Makefile.in12
-rw-r--r--Build/source/texk/web2c/alephdir/am/aleph.am2
-rw-r--r--Build/source/texk/web2c/am/texmf.am8
-rwxr-xr-xBuild/source/texk/web2c/mft.test5
-rw-r--r--Build/source/texk/web2c/mpdir/am/mp.am2
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/libpdftex.am2
-rw-r--r--Build/source/texk/web2c/xetexdir/am/xetex.am2
8 files changed, 25 insertions, 10 deletions
diff --git a/Build/source/texk/dvipdfm/configure.ac b/Build/source/texk/dvipdfm/configure.ac
index c78be4f0b26..87284149143 100644
--- a/Build/source/texk/dvipdfm/configure.ac
+++ b/Build/source/texk/dvipdfm/configure.ac
@@ -43,7 +43,7 @@ KPSE_LIBPNG_FLAGS
KPSE_ADD_FLAGS([kpathsea])
dnl Check for required file formats.
-dnl We need tex-ps_header, type1, and vf;
+dnl We need tex_ps_header, type1, and vf;
dnl of these type1 was introduced last (Feb 1996).
KPSE_CHECK_KPSE_FORMAT([type1], ,
[KPSE_MSG_ERROR([dvipdfm],
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 47a1736b039..ec4109f6088 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -8171,8 +8171,11 @@ cweave.c: ctangle$(EXEEXT) cwebdir/cweave.w cwebdir/cweav-w2c.ch
CWEBINPUTS=$(srcdir)/cwebdir $(ctangle) cweave cweav-w2c
tie.c: ctangle$(EXEEXT) tiedir/tie.w tiedir/tie-w2c.ch
CWEBINPUTS=$(srcdir)/tiedir $(ctangle) tie.w tie-w2c.ch
-$(tex_c_h): tex-web2c
+# We must create texd.h before building the tex_OBJECTS.
+$(tex_OBJECTS): texd.h
+
+$(tex_c_h): tex-web2c
tex-web2c: tex.p $(web2c_texmf)
$(web2c) tex
: $(synctex_convert_tex)
@@ -8204,6 +8207,9 @@ trip-clean:
$(windowlib): mfd.h $(srcdir)/window/*.c
cd window && $(MAKE) $(AM_MAKEFLAGS) libwindow.a
+# We must create mfd.h before building the libmf_a_OBJECTS.
+$(libmf_a_OBJECTS): mfd.h
+
$(mf_c_h): mf-web2c
mf-web2c: mf.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed
$(web2c) mf
@@ -8249,6 +8255,7 @@ mp-tangle: tangle$(EXEEXT) mp.web mp.ch
mp-pool.c: mp.pool $(makecpool_stamp) mpdir/mplib.h
$(makecpool) mp.pool $(srcdir)/mpdir/mplib.h >$@ || rm -f $@
+# We must create mpd.h before building the liboldmpost_a_OBJECTS.
$(liboldmpost_a_OBJECTS): mpd.h
mpost.c: ctangle$(EXEEXT) mplibdir/mpost.w
@@ -8376,6 +8383,7 @@ pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version etexd
pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
$(tie) -c pdftex.ch $(pdftex_ch_srcs)
+# We must create pdftexd.h before building the libpdftex_a_OBJECTS.
$(libpdftex_a_OBJECTS): pdftexd.h
$(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libpdftex.a
@@ -8460,6 +8468,7 @@ xetexdir/xetex.version: xetexdir/xetex.ch
xetex.web: tie$(EXEEXT) $(xetex_web_srcs)
$(tie) -m xetex.web $(xetex_web_srcs)
+# We must create xetexd.h before building the libxetex_a_OBJECTS.
$(libxetex_a_OBJECTS): xetexd.h
odvicopy.c odvicopy.h: odvicopy-web2c
odvicopy-web2c: $(web2c_depend) odvicopy.p
@@ -8511,6 +8520,7 @@ ovp2ovf-web2c: $(web2c_depend) ovp2ovf.p
ovp2ovf.p: tangle$(EXEEXT) $(ovp2ovf_sources)
$(ow_tangle) ovp2ovf ovp2ovf
+# We must create alephd.h before building the aleph_OBJECTS.
$(aleph_OBJECTS): alephd.h
$(aleph_c_h): aleph-web2c
diff --git a/Build/source/texk/web2c/alephdir/am/aleph.am b/Build/source/texk/web2c/alephdir/am/aleph.am
index 2b2908075ac..ee967d7d4c1 100644
--- a/Build/source/texk/web2c/alephdir/am/aleph.am
+++ b/Build/source/texk/web2c/alephdir/am/aleph.am
@@ -25,7 +25,7 @@ aleph_SOURCES = \
alephdir/alephmem.h \
alephdir/aleph-pool.h
-## We must create alephd.h before building the aleph_OBJECTS.
+# We must create alephd.h before building the aleph_OBJECTS.
$(aleph_OBJECTS): alephd.h
$(aleph_c_h): aleph-web2c
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am
index 5798ec28c5d..fe256a3e7ec 100644
--- a/Build/source/texk/web2c/am/texmf.am
+++ b/Build/source/texk/web2c/am/texmf.am
@@ -27,8 +27,11 @@ tex_LDADD = $(LDADD) $(ipc_socketlibs)
# TeX C sources
tex_c_h = texini.c tex0.c tex1.c tex2.c texcoerce.h texd.h
nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c
-$(tex_c_h): tex-web2c
+# We must create texd.h before building the tex_OBJECTS.
+$(tex_OBJECTS): texd.h
+
+$(tex_c_h): tex-web2c
tex-web2c: tex.p $(web2c_texmf)
$(web2c) tex
: $(synctex_convert_tex)
@@ -122,6 +125,9 @@ mf_c_h = mfini.c mf0.c mf1.c mfcoerce.h mfd.h
nodist_libmf_a_SOURCES = $(mf_c_h) mf-pool.c
libmf_a_CPPFLAGS = -DMETA_FONT
+# We must create mfd.h before building the libmf_a_OBJECTS.
+$(libmf_a_OBJECTS): mfd.h
+
$(mf_c_h): mf-web2c
mf-web2c: mf.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed
$(web2c) mf
diff --git a/Build/source/texk/web2c/mft.test b/Build/source/texk/web2c/mft.test
index 68e3f658d71..ba86719d90f 100755
--- a/Build/source/texk/web2c/mft.test
+++ b/Build/source/texk/web2c/mft.test
@@ -3,7 +3,6 @@
test -d tests || mkdir -p tests
TEXMFCNF=$srcdir/../kpathsea \
- ./mft $srcdir/tests/io ## && mv -f io.tex tests/io.tex || exit 1
-## fails with: ./mft: fatal: mft file `plain.mft' not found.
-exit 0
+ MFTINPUTS=$srcdir/tests \
+ ./mft $srcdir/tests/io && mv -f io.tex tests/io.tex || exit 1
diff --git a/Build/source/texk/web2c/mpdir/am/mp.am b/Build/source/texk/web2c/mpdir/am/mp.am
index 9b597823923..b7074ef3250 100644
--- a/Build/source/texk/web2c/mpdir/am/mp.am
+++ b/Build/source/texk/web2c/mpdir/am/mp.am
@@ -51,7 +51,7 @@ liboldmpost_a_SOURCES = \
mpdir/writefont.c \
mpdir/writet1.c
-## We must create mpd.h before building the liboldmpost_a_OBJECTS.
+# We must create mpd.h before building the liboldmpost_a_OBJECTS.
$(liboldmpost_a_OBJECTS): mpd.h
## Eventually delete these files
diff --git a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
index 0e3c5b90f19..e51220cae5b 100644
--- a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
@@ -46,7 +46,7 @@ libpdftex_a_SOURCES += \
pdftexdir/regex/regex.h
endif MINGW32
-## We must create pdftexd.h before building the libpdftex_a_OBJECTS.
+# We must create pdftexd.h before building the libpdftex_a_OBJECTS.
$(libpdftex_a_OBJECTS): pdftexd.h
## included by pdftexdir/writettf.c
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 6cbdbaf910f..bd9f2bffc12 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -197,7 +197,7 @@ libxetex_a_SOURCES += \
endif XETEX_GRAPHITE
-## We must create xetexd.h before building the libxetex_a_OBJECTS.
+# We must create xetexd.h before building the libxetex_a_OBJECTS.
$(libxetex_a_OBJECTS): xetexd.h
## libxetexmm (Mac OS X only)