summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/etexdir
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/etexdir
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/etexdir')
-rw-r--r--Build/source/texk/web2c/etexdir/ChangeLog11
-rw-r--r--Build/source/texk/web2c/etexdir/am/etex.am25
-rw-r--r--Build/source/texk/web2c/etexdir/etexextra.c11
-rw-r--r--Build/source/texk/web2c/etexdir/etexextra.h (renamed from Build/source/texk/web2c/etexdir/etexextra.in)9
4 files changed, 36 insertions, 20 deletions
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index 9f8d67b3668..27c8c8a2b4b 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * etexextra.in: Renamed ...
+ * etexextra.h: into this; #include etex_version.h
+ for ETEX_VERSION.
+
+ * etexextra.c (new): #include <etexd.h> and <lib/texmfmp.c>.
+
+ * am/etex.am: etexextra.[ch] are now distributed;
+ create etex_version.h instead of etex.version.
+
2010-06-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/etex.am (etex_CPPFLAGS): Add $(AM_CPPFLAGS).
diff --git a/Build/source/texk/web2c/etexdir/am/etex.am b/Build/source/texk/web2c/etexdir/am/etex.am
index 61b2146efce..cc0ffa08f0c 100644
--- a/Build/source/texk/web2c/etexdir/am/etex.am
+++ b/Build/source/texk/web2c/etexdir/am/etex.am
@@ -1,6 +1,6 @@
## texk/web2c/etexdir/am/etex.am: Makefile fragment for e-TeX.
##
-## Copyright (C) 2009, 2010 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.
## e-TeX
@@ -18,10 +18,11 @@ etex_LDADD = $(LDADD) $(ipc_socketlibs)
# e-TeX C sources
etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
-nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexextra.c etexdir/etexextra.h
+nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexdir/etex_version.h
+dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h
-# We must create etexd.h before building the etex_OBJECTS.
-etex_prereq = etexd.h
+# We must create etexd.h and etexdir/etex_version.h before building the etex_OBJECTS.
+etex_prereq = etexd.h etexdir/etex_version.h
$(etex_OBJECTS): $(etex_prereq)
$(etex_c_h): etex-web2c
@@ -32,13 +33,6 @@ etex-web2c: etex.p $(web2c_texmf)
etex-pool.c: etex.pool etexd.h $(makecpool_stamp)
$(makecpool) etex >$@ || 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
@$(texmf_tangle) etex etex
@@ -46,10 +40,10 @@ etex-tangle: tangle$(EXEEXT) etex.web etex.ch tangle-sh
@$(texmf_tangle) etex etex
# Extract etex version
-etexdir/etex.version: etexdir/etex.ch
+etexdir/etex_version.h: etexdir/etex.ch
$(MKDIR_P) etexdir
grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >etexdir/etex.version
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
# Generate etex.web
etex.web: tie$(EXEEXT) $(etex_web_srcs)
@@ -70,11 +64,10 @@ etex_ch_srcs = \
etexdir/tex.ech \
tex-binpool.ch
##
-EXTRA_DIST += $(etex_web_srcs) $(etex_ch_srcs) etexdir/etexextra.in \
- lib/texmfmp.c
+EXTRA_DIST += $(etex_web_srcs) $(etex_ch_srcs)
DISTCLEANFILES += $(nodist_etex_SOURCES) etex.web etex.ch etex-web2c \
- etex.p etex.pool etex-tangle etexdir/etex.version
+ etex.p etex.pool etex-tangle
EXTRA_DIST += \
etexdir/ChangeLog \
diff --git a/Build/source/texk/web2c/etexdir/etexextra.c b/Build/source/texk/web2c/etexdir/etexextra.c
new file mode 100644
index 00000000000..573f9da6a1a
--- /dev/null
+++ b/Build/source/texk/web2c/etexdir/etexextra.c
@@ -0,0 +1,11 @@
+/* etexextra.c: Hand-coded routines for e-TeX.
+
+ This file is public domain. */
+
+#define EXTERN /* Instantiate data from etexd.h here. */
+
+/* This file defines TeX and eTeX. */
+#include <etexd.h>
+
+/* Hand-coded routines for TeX or Metafont in C. */
+#include <lib/texmfmp.c>
diff --git a/Build/source/texk/web2c/etexdir/etexextra.in b/Build/source/texk/web2c/etexdir/etexextra.h
index f64645f119d..4d8158e9ab9 100644
--- a/Build/source/texk/web2c/etexdir/etexextra.in
+++ b/Build/source/texk/web2c/etexdir/etexextra.h
@@ -1,7 +1,6 @@
-/* etexextra.in: banner etc. for e-TeX.
+/* etexextra.h: banner etc. for e-TeX.
- This is included by e-TeX, from ../etexextra.c
- (generated from ../lib/texmfmp.c).
+ This is included by e-TeX, from etexextra.c.
Copyright (C) 1995, 1996, 2009 Karl Berry.
Copyright (C) 2004 Olaf Weber.
@@ -20,7 +19,9 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-#define BANNER "This is e-TeX, Version 3.1415926-ETEX-VERSION"
+#include <etexdir/etex_version.h> /* for ETEX_VERSION */
+
+#define BANNER "This is e-TeX, Version 3.1415926-" ETEX_VERSION
#define COPYRIGHT_HOLDER "Peter Breitenlohner"
#define AUTHOR NULL
#define PROGRAM_HELP ETEXHELP