summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-21 09:44:45 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-21 09:44:45 +0000
commitb77e78eaf3652b80e78ae80f770bd3bdf721363d (patch)
treed3c67296e30534c63d02c5bb5e5790b1d9150cd0 /Build/source/texk/web2c
parentad04e2284cbf8d1a4b268636c7451f89d29c4d0a (diff)
new build system: mode texk/xdvik and general update
git-svn-id: svn://tug.org/texlive/trunk@12771 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/alephdir/am/aleph.am15
-rw-r--r--Build/source/texk/web2c/am/texmf.am2
-rw-r--r--Build/source/texk/web2c/etexdir/am/etex.am23
-rw-r--r--Build/source/texk/web2c/synctexdir/am/synctex.am38
-rw-r--r--Build/source/texk/web2c/web2c/ChangeLog6
-rwxr-xr-xBuild/source/texk/web2c/web2c/convert4
6 files changed, 74 insertions, 14 deletions
diff --git a/Build/source/texk/web2c/alephdir/am/aleph.am b/Build/source/texk/web2c/alephdir/am/aleph.am
index 6b3ec3846e5..36d4d1b71b8 100644
--- a/Build/source/texk/web2c/alephdir/am/aleph.am
+++ b/Build/source/texk/web2c/alephdir/am/aleph.am
@@ -8,9 +8,11 @@ endif ALEPH
EXTRA_PROGRAMS += aleph
## With --enable-ipc, Aleph may need to link with -lsocket.
-aleph_LDADD = $(LDADD) $(socketlibs)
+aleph_LDADD = $(LDADD) $(ipc_socketlibs)
aleph_CPPFLAGS = -I$(srcdir)/alephdir $(AM_CPPFLAGS)
+
+## Aleph C sources
aleph_c_h = alephini.c aleph0.c aleph1.c aleph2.c aleph3.c alephcoerce.h alephd.h
nodist_aleph_SOURCES = $(aleph_c_h) aleph-pool.c alephextra.c
aleph_SOURCES = \
@@ -28,15 +30,18 @@ aleph-web2c: aleph.p $(web2c_texmf) alephdir/aleph.defines
$(web2c) aleph
echo timestamp >$@
touch $(aleph_c_h)
+aleph-pool.c: aleph.pool $(makecpool) alephdir/aleph-pool.h
+ $(makecpool) aleph.pool $(srcdir)/alephdir/aleph-pool.h >$@ || rm -f $@
alephextra.c: lib/texmfmp.c alephdir/alephextra.h alephd.h
sed s/TEX-OR-MF-OR-MP/aleph/ $(srcdir)/lib/texmfmp.c >$@
+
+## Tangling Aleph
aleph.p aleph.pool: aleph-tangle
aleph-tangle: otangle$(EXEEXT) aleph.web aleph.ch
$(otangle) aleph aleph
echo timestamp >$@
touch aleph.p aleph.pool
-aleph-pool.c: aleph.pool $(makecpool) alephdir/aleph-pool.h
- $(makecpool) aleph.pool $(srcdir)/alephdir/aleph-pool.h >$@ || rm -f $@
+
## Generate aleph.web
aleph_web_srcs = \
tex.web \
@@ -64,6 +69,7 @@ aleph_web_srcs = \
alephdir/eochar.ch
aleph.web: $(TIE) $(aleph_web_srcs)
$(tie) -m aleph.web $(aleph_web_srcs)
+
## Generate aleph.ch
aleph_ch_srcs = \
alephdir/com16bit.ch \
@@ -80,7 +86,10 @@ aleph_ch_srcs = \
alephdir/ceostuff.ch
aleph.ch: $(TIE) aleph.web $(aleph_ch_srcs)
$(tie) -c aleph.ch aleph.web $(aleph_ch_srcs)
+
+##
EXTRA_DIST += $(aleph_web_srcs) $(aleph_ch_srcs) lib/texmfmp.c
+
DISTCLEANFILES += $(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c \
aleph.p aleph.pool aleph-tangle
diff --git a/Build/source/texk/web2c/am/texmf.am b/Build/source/texk/web2c/am/texmf.am
index b43eeeed711..bcecb570e5f 100644
--- a/Build/source/texk/web2c/am/texmf.am
+++ b/Build/source/texk/web2c/am/texmf.am
@@ -19,7 +19,7 @@ EXTRA_PROGRAMS += tex
tex_CPPFLAGS =
## With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(socketlibs)
+tex_LDADD = $(LDADD) $(ipc_socketlibs)
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
diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am
index 29c033eb7c7..d6a6d066686 100644
--- a/Build/source/texk/web2c/etexdir/am/etex.am
+++ b/Build/source/texk/web2c/etexdir/am/etex.am
@@ -10,33 +10,42 @@ EXTRA_PROGRAMS += etex
etex_CPPFLAGS =
## With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(socketlibs)
+etex_LDADD = $(LDADD) $(ipc_socketlibs)
+## e-TeX C sources
etex_c_h = etexini.c etex0.c etex1.c etex2.c etexcoerce.h etexd.h
nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexextra.c etexdir/etexextra.h
+
$(etex_c_h): etex-web2c
etex-web2c: etex.p $(web2c_texmf)
$(web2c) etex
: $(synctex_convert_etex)
echo timestamp >$@
touch $(etex_c_h)
+
+etex-pool.c: etex.pool $(makecpool) tmf-pool.h
+ $(makecpool) etex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
+
etexextra.c: etexdir/etexextra.h lib/texmfmp.c etexd.h
sed s/TEX-OR-MF-OR-MP/etex/ $(srcdir)/lib/texmfmp.c >$@
+
+etexdir/etexextra.h: etexdir/etexextra.in etexdir/etex.version
+ sed s/ETEX-VERSION/`cat etexdir/etex.version`/ \
+ $(srcdir)/etexdir/etexextra.in >$@
+
+## Tangling e-TeX
etex.p etex.pool: etex-tangle
etex-tangle: tangle$(EXEEXT) etex.web etex.ch
$(tangle) etex etex
echo timestamp >$@
touch etex.p etex.pool
-etex-pool.c: etex.pool $(makecpool) tmf-pool.h
- $(makecpool) etex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@
+
## Extract etex version
etexdir/etex.version: etexdir/etex.ch
$(mkdir_p) etexdir
grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
| sed "s/^.*'-//;s/'.*$$//" >etexdir/etex.version
-etexdir/etexextra.h: etexdir/etexextra.in etexdir/etex.version
- sed s/ETEX-VERSION/`cat etexdir/etex.version`/ \
- $(srcdir)/etexdir/etexextra.in >$@
+
## Generate etex.web
etex.web: $(TIE) $(etex_web_srcs)
$(tie) -m etex.web $(etex_web_srcs)
@@ -44,6 +53,7 @@ etex_web_srcs = \
tex.web \
etexdir/etex.ch \
etexdir/etex.fix
+
## Generate etex.ch
etex.ch: $(TIE) etex.web $(etex_ch_srcs)
$(tie) -c etex.ch etex.web $(etex_ch_srcs)
@@ -55,6 +65,7 @@ etex_ch_srcs = \
etexdir/tex.ch1 \
etexdir/tex.ech \
etexdir/etex-binpool.ch
+
##
EXTRA_DIST += $(etex_web_srcs) $(etex_ch_srcs) etexdir/etexextra.in \
lib/texmfmp.c tmf-pool.h
diff --git a/Build/source/texk/web2c/synctexdir/am/synctex.am b/Build/source/texk/web2c/synctexdir/am/synctex.am
index 4e26a01fe5d..578a49ace02 100644
--- a/Build/source/texk/web2c/synctexdir/am/synctex.am
+++ b/Build/source/texk/web2c/synctexdir/am/synctex.am
@@ -160,11 +160,45 @@ EXTRA_DIST += \
## SyncTeX infrastructure: XeTeX
+if XETEX_SYNCTEX
+
+xetex_CPPFLAGS += -I$(srcdir)/synctexdir
+
+xetex_ch_synctex = \
+ synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-e-mem.ch0 \
+ synctexdir/synctex-e-mem.ch1 \
+ synctexdir/synctex-xe-mem.ch2 \
+ synctexdir/synctex-rec.ch0 \
+ synctexdir/synctex-e-rec.ch0 \
+ synctexdir/synctex-xe-rec.ch2
+
+xetex_post_ch_synctex = \
+ synctexdir/synctex-xe-rec.ch3
+
+dist_xetex_SOURCES = \
+ synctexdir/synctex.h \
+ synctexdir/synctex-common.h \
+ synctexdir/synctex-xetex.h
+
+nodist_xetex_SOURCES += \
+ synctex-xe.c
+
+synctex_convert_xetex = && $(SHELL) $(srcdir)/synctexdir/synctex-convert.sh xetex
+
+else !XETEX_SYNCTEX
+
+synctex_convert_xetex = && echo "warning: SyncTeX for e-TeX is NOT enabled"
+
+endif !XETEX_SYNCTEX
+
+synctex-xe.c: xetexd.h synctexdir/synctex.c $(dist_xetex_SOURCES)
+ sed s/TEX-OR-MF-OR-MP/xetex/ $(srcdir)/synctexdir/synctex.c >$@
+
EXTRA_DIST += \
synctexdir/synctex-xe-mem.ch2 \
synctexdir/synctex-xe-rec.ch2 \
- synctexdir/synctex-xe-rec.ch3 \
- synctexdir/synctex-xetex.h
+ synctexdir/synctex-xe-rec.ch3
## Eventually delete these files
##
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index f7d72f90706..4c6aafa2047 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * convert: use ${basefile}coerce.hx, not x${basefile}coerce.h
+ as temp file name such that coverting etex does not destroy
+ xetexcoerce.h.
+
2009-03-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* common.defines, convert, fixwrites.c, splitup.c: remove all
diff --git a/Build/source/texk/web2c/web2c/convert b/Build/source/texk/web2c/web2c/convert
index 82f2cd3fe83..38f350ada57 100755
--- a/Build/source/texk/web2c/web2c/convert
+++ b/Build/source/texk/web2c/web2c/convert
@@ -148,8 +148,8 @@ case $basefile in
;;
tex|etex|luatex|pdftex|aleph|mf|mp|xetex)
sleep 2 # so timestamps are definitely later, to avoid make weirdness
- cat ${basefile}coerce.h $srcdir/web2c/coerce.h >x${basefile}coerce.h
- mv x${basefile}coerce.h ${basefile}coerce.h
+ cat ${basefile}coerce.h $srcdir/web2c/coerce.h >${basefile}coerce.hx
+ mv ${basefile}coerce.hx ${basefile}coerce.h
touch ${basefile}d.h
;;
esac