summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/alephdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-07 12:07:12 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-07 12:07:12 +0000
commit1c2a7c6d12cd8d1cb6ca50cd0a71d2a1605fc4d4 (patch)
tree4117cd024fa1de1fd9f28aa9050b2c8b6e7f5f0f /Build/source/texk/web2c/alephdir
parent9e12f984a50b65e418bec2d5f33536d5857e8d95 (diff)
Reorganize build system for TeX & MF engines
No more sed substitutions for *extra.[ch], they are now distributed and #include lib/texmfmp.c resp. the generated */*_version.h git-svn-id: svn://tug.org/texlive/trunk@20964 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/alephdir')
-rw-r--r--Build/source/texk/web2c/alephdir/ChangeLog10
-rw-r--r--Build/source/texk/web2c/alephdir/alephextra.c11
-rw-r--r--Build/source/texk/web2c/alephdir/am/aleph.am11
3 files changed, 26 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog
index 3f7ce719757..5e6875f9485 100644
--- a/Build/source/texk/web2c/alephdir/ChangeLog
+++ b/Build/source/texk/web2c/alephdir/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * alephextra.c (new): #include <alephd.h> and <lib/texmfmp.c>.
+
+ * am/aleph.am: alephextra.c is now distributed.
+
+2010-12-31 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/aleph.am (alephextra.c): Uniform dependencies and rules.
+
2010-05-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* aleph.c (new_input_line): Cast integer to long for printing
diff --git a/Build/source/texk/web2c/alephdir/alephextra.c b/Build/source/texk/web2c/alephdir/alephextra.c
new file mode 100644
index 00000000000..8b57266c05f
--- /dev/null
+++ b/Build/source/texk/web2c/alephdir/alephextra.c
@@ -0,0 +1,11 @@
+/* alephextra.c: Hand-coded routines for Aleph.
+
+ This file is public domain. */
+
+#define EXTERN /* Instantiate data from alephd.h here. */
+
+/* This file defines TeX and Aleph. */
+#include <alephd.h>
+
+/* Hand-coded routines for TeX or Metafont in C. */
+#include <lib/texmfmp.c>
diff --git a/Build/source/texk/web2c/alephdir/am/aleph.am b/Build/source/texk/web2c/alephdir/am/aleph.am
index 20006b68f13..4bb996a2592 100644
--- a/Build/source/texk/web2c/alephdir/am/aleph.am
+++ b/Build/source/texk/web2c/alephdir/am/aleph.am
@@ -1,6 +1,6 @@
## texk/web2c/alephdir/am/aleph.am: Makefile fragment for Aleph.
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## Aleph
@@ -18,10 +18,11 @@ aleph_CFLAGS = $(WARNING_CFLAGS)
# Aleph C sources
aleph_c_h = alephini.c aleph0.c alephcoerce.h alephd.h
-nodist_aleph_SOURCES = $(aleph_c_h) aleph-pool.c alephextra.c
-aleph_SOURCES = \
+nodist_aleph_SOURCES = $(aleph_c_h) aleph-pool.c
+dist_aleph_SOURCES = \
alephdir/aleph.c \
alephdir/alephbis.c \
+ alephdir/alephextra.c \
alephdir/alephextra.h \
alephdir/alephmem.h
@@ -34,8 +35,6 @@ aleph-web2c: aleph.p $(web2c_texmf) alephdir/aleph.defines
@$(web2c) aleph
aleph-pool.c: aleph.pool alephd.h $(makecpool_stamp)
$(makecpool) aleph >$@ || 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
@@ -89,7 +88,7 @@ aleph.ch: tie$(EXEEXT) 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
+EXTRA_DIST += $(aleph_web_srcs) $(aleph_ch_srcs)
DISTCLEANFILES += $(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c \
aleph.p aleph.pool aleph-tangle