summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/pdftexdir
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/pdftexdir
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/pdftexdir')
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog11
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/pdftex.am29
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftexextra.c11
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftexextra.h (renamed from Build/source/texk/web2c/pdftexdir/pdftexextra.in)10
4 files changed, 41 insertions, 20 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 157c274834a..78314204d15 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * pdftexextra.in: Renamed ...
+ * pdftexextra.h: into this; #include {e,pdf}tex_version.h
+ for {E,PDF}TEX_VERSION.
+
+ * pdftexextra.c (new): #include <pdftexd.h> and <lib/texmfmp.c>.
+
+ * am/pdftex.am: pdftexextra.[ch] are now distributed;
+ create {e,pdf}tex_version.h instead of {e,pdf}tex.version.
+
2010-12-01 Peter Breitenlohner <peb@mppmu.mpg.de>
* writet1.c: Drop unreachable code (after pdftex_fail).
diff --git a/Build/source/texk/web2c/pdftexdir/am/pdftex.am b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
index c7a46dcece1..bc9ec07ab19 100644
--- a/Build/source/texk/web2c/pdftexdir/am/pdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/pdftex.am
@@ -1,6 +1,6 @@
## texk/web2c/pdftexdir/am/pdftex.am: Makefile fragment for pdfTeX.
##
-## 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.
pdftex_cppflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES)
@@ -36,17 +36,18 @@ pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
-# We must create libpdftex.a before building the pdftex_OBJECTS.
-$(pdftex_OBJECTS): libpdftex.a
+# We must create libpdftex.a etc before building the pdftex_OBJECTS.
+pdftex_prereq = libpdftex.a pdftexdir/etex_version.h pdftexdir/pdftex_version.h
+$(pdftex_OBJECTS): $(pdftex_prereq)
pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
-nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c pdftexextra.c pdftexdir/pdftexextra.h
+nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c \
+ pdftexdir/etex_version.h pdftexdir/pdftex_version.h
+dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h
$(pdftex_c_h): pdftex-web2c
@$(web2c) pdftex
pdftex-web2c: pdftex.p $(web2c_texmf) pdftexdir/pdftex.defines
@$(web2c) pdftex
-pdftexextra.c: pdftexd.h pdftexdir/pdftexextra.h lib/texmfmp.c pdftexd.h
- sed s/TEX-OR-MF-OR-MP/pdftex/ $(srcdir)/lib/texmfmp.c >$@
pdftex.p pdftex.pool: pdftex-tangle
@$(pdf_tangle) pdftex pdftex
pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch tangle-sh
@@ -54,19 +55,15 @@ pdftex-tangle: tangle$(EXEEXT) pdftexdir/pdftex.web pdftex.ch tangle-sh
pdftex-pool.c: pdftex.pool pdftexd.h $(makecpool_stamp)
$(makecpool) pdftex >$@ || rm -f $@
# Extract etex version
-pdftexdir/etex.version: etexdir/etex.ch
+pdftexdir/etex_version.h: etexdir/etex.ch
$(MKDIR_P) pdftexdir
grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >$@
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
# Extract pdftex version
-pdftexdir/pdftex.version: pdftexdir/pdftex.web
+pdftexdir/pdftex_version.h: pdftexdir/pdftex.web
$(MKDIR_P) pdftexdir
grep '^@d pdftex_version_string==' $(srcdir)/pdftexdir/pdftex.web \
- | sed "s/^.*'-//;s/'.*$$//" >pdftexdir/pdftex.version
-pdftexdir/pdftexextra.h: pdftexdir/pdftexextra.in pdftexdir/pdftex.version pdftexdir/etex.version
- sed -e s/PDFTEX-VERSION/`cat pdftexdir/pdftex.version`/ \
- -e s/ETEX-VERSION/`cat pdftexdir/etex.version`/ \
- $(srcdir)/pdftexdir/pdftexextra.in >$@
+ | sed "s/^.*'-/#define PDFTEX_VERSION \"/;s/'.*$$/\"/" >$@
# Generate pdftex.ch
pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs)
$(tie) -c pdftex.ch $(pdftex_ch_srcs)
@@ -78,10 +75,10 @@ pdftex_ch_srcs = \
pdftexdir/pdftex.ch
##
EXTRA_DIST += $(pdftex_ch_srcs) etexdir/etex.ch \
- pdftexdir/pdftex.defines pdftexdir/pdftex.h pdftexdir/pdftexextra.in
+ pdftexdir/pdftex.defines pdftexdir/pdftex.h
DISTCLEANFILES += $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c \
- pdftex.p pdftex.pool pdftex-tangle pdftexdir/pdftex.version pdftexdir/etex.version
+ pdftex.p pdftex.pool pdftex-tangle
EXTRA_DIST += \
pdftexdir/ChangeLog \
diff --git a/Build/source/texk/web2c/pdftexdir/pdftexextra.c b/Build/source/texk/web2c/pdftexdir/pdftexextra.c
new file mode 100644
index 00000000000..3bad442a03d
--- /dev/null
+++ b/Build/source/texk/web2c/pdftexdir/pdftexextra.c
@@ -0,0 +1,11 @@
+/* pdftexextra.c: Hand-coded routines for pdfTeX.
+
+ This file is public domain. */
+
+#define EXTERN /* Instantiate data from pdftexd.h here. */
+
+/* This file defines TeX and pdfTeX. */
+#include <pdftexd.h>
+
+/* Hand-coded routines for TeX or Metafont in C. */
+#include <lib/texmfmp.c>
diff --git a/Build/source/texk/web2c/pdftexdir/pdftexextra.in b/Build/source/texk/web2c/pdftexdir/pdftexextra.h
index 09d8514d224..4ab411fd298 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftexextra.in
+++ b/Build/source/texk/web2c/pdftexdir/pdftexextra.h
@@ -19,13 +19,15 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-/* pdftexextra.in: banner etc. for pdfTeX.
+/* pdftexextra.h: banner etc. for pdfTeX.
- This is included by pdfTeX, from ../pdftexextra.c
- (generated from ../lib/texmfmp.c).
+ This is included by pdfTeX, from pdftexextra.c.
*/
-#define BANNER "This is pdfTeX, Version 3.1415926-PDFTEX-VERSION-ETEX-VERSION"
+#include <pdftexdir/pdftex_version.h> /* for PDFTEX_VERSION */
+#include <pdftexdir/etex_version.h> /* for ETEX_VERSION */
+
+#define BANNER "This is pdfTeX, Version 3.1415926-" PDFTEX_VERSION "-" ETEX_VERSION
#define COPYRIGHT_HOLDER "Peter Breitenlohner (eTeX)/Han The Thanh (pdfTeX)"
#define AUTHOR NULL
#define PROGRAM_HELP PDFTEXHELP