summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/xetexdir
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/xetexdir')
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog11
-rw-r--r--Build/source/texk/web2c/xetexdir/am/xetex.am34
-rw-r--r--Build/source/texk/web2c/xetexdir/xetex.mk335
-rw-r--r--Build/source/texk/web2c/xetexdir/xetexextra.c11
-rw-r--r--Build/source/texk/web2c/xetexdir/xetexextra.h (renamed from Build/source/texk/web2c/xetexdir/xetexextra.in)10
5 files changed, 40 insertions, 361 deletions
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index 171cd0a22e9..7aa765ad4c1 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * xetexextra.in: Renamed ...
+ * xetexextra.h: into this; #include {e,xe}tex_version.h
+ for {E,XE}TEX_VERSION.
+
+ * xetexextra.c (new): #include <xetexd.h> and <lib/texmfmp.c>.
+
+ * am/xetex.am: xetexextra.[ch] are now distributed;
+ create {e,xe}tex_version.h instead of {e,xe}tex.version.
+
2010-09-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* xetex.test (new): Just testing 'xetex -version'.
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 01f4efccdf0..09ecaf10e30 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -1,6 +1,6 @@
## texk/web2c/xetexdir/am/xetex.am: Makefile fragment for XeTeX.
##
-## 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.
## XeTeX
@@ -62,12 +62,15 @@ xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
## With --enable-ipc, XeTeX may need to link with -lsocket.
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
-xetex_prereq = $(libxetex)
+# We must create libxetex.a etc before building the xetex_OBJECTS
+xetex_prereq = $(libxetex) xetexdir/etex_version.h xetexdir/xetex_version.h
$(xetex_OBJECTS): $(xetex_prereq)
## XeTeX C sources
xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
-nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c xetexextra.c xetexdir/xetexextra.h
+nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c \
+ xetexdir/etex_version.h xetexdir/xetex_version.h
+dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h
$(xetex_c_h): xetex-web2c
@$(web2c) xetex
@@ -77,15 +80,6 @@ xetex-web2c: xetex.p $(web2c_texmf) xetexdir/xetex.defines
xetex_pool.c: xetex.pool xetexd.h
perl $(srcdir)/xetexdir/pool2c.pl $< $@
-xetexextra.c: xetexdir/xetexextra.h lib/texmfmp.c xetexd.h
- sed s/TEX-OR-MF-OR-MP/xetex/ $(srcdir)/lib/texmfmp.c >$@
-
-xetexdir/xetexextra.h: xetexdir/xetexextra.in xetexdir/xetex.version xetexdir/etex.version
- $(MKDIR_P) xetexdir
- sed -e s/XETEX-VERSION/`cat xetexdir/xetex.version`/ \
- -e s/ETEX-VERSION/`cat xetexdir/etex.version`/ \
- $(srcdir)/xetexdir/xetexextra.in >$@
-
## Tangling XeTeX
xetex.p xetex.pool: xetex-tangle
@$(o_tangle) xetex
@@ -93,16 +87,16 @@ xetex-tangle: ./otangle$(EXEEXT) xetex.web tangle-sh
@$(o_tangle) xetex
## Extract etex version
-xetexdir/etex.version: etexdir/etex.ch
+xetexdir/etex_version.h: etexdir/etex.ch
$(MKDIR_P) xetexdir
grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >$@
+ | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
## Extract xetex version
-xetexdir/xetex.version: xetexdir/xetex.ch
+xetexdir/xetex_version.h: xetexdir/xetex.ch
$(MKDIR_P) xetexdir
grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >$@
+ | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@
## Generate xetex.web
xetex.web: tie$(EXEEXT) $(xetex_web_srcs)
@@ -121,10 +115,10 @@ xetex_web_srcs = \
xetexdir/xetex-hz.ch \
$(xetex_post_ch_synctex)
##
-EXTRA_DIST += $(xetex_web_srcs) xetexdir/xetex.defines xetexdir/xetexextra.in
+EXTRA_DIST += $(xetex_web_srcs) xetexdir/xetex.defines
DISTCLEANFILES += $(nodist_xetex_SOURCES) xetex.web xetex-web2c \
- xetex.p xetex.pool xetex-tangle xetexdir/etex.version xetexdir/xetex.version
+ xetex.p xetex.pool xetex-tangle
EXTRA_DIST += \
xetexdir/pool2c.pl \
@@ -247,7 +241,3 @@ endif XETEX
##
EXTRA_DIST += xetexdir/LICENSE.txt
-## Eventually delete these files
-##
-EXTRA_DIST += xetexdir/xetex.mk
-
diff --git a/Build/source/texk/web2c/xetexdir/xetex.mk b/Build/source/texk/web2c/xetexdir/xetex.mk
deleted file mode 100644
index 9c3a180c091..00000000000
--- a/Build/source/texk/web2c/xetexdir/xetex.mk
+++ /dev/null
@@ -1,335 +0,0 @@
-# Makefile fragment for XeTeX and web2c. -- Jonathan Kew -- Public domain.
-# This fragment contains the parts of the makefile that are most likely to
-# differ between releases of XeTeX.
-
-Makefile: $(srcdir)/xetexdir/xetex.mk
-
-# this should probably move to common.mk some day,
-# but need to check possible effect on other programs
-ALL_CXXFLAGS = @CXXFLAGS@
-
-# We build xetex unless configure decides to skip it
-xetex = @XETEX@ xetex
-
-### Platform-specific defines and files to be built
-
-# On Mac OS X:
-@XETEX_MACOSX@ xetex_platform_o = XeTeX_mac.o XeTeXFontMgr_Mac.o
-@XETEX_MACOSX@ xetex_platform_layout_o = XeTeXFontInst_Mac.o XeTeXFontInst_FT2.o
-@XETEX_MACOSX@ xetex_platform_layout_cxx = XeTeXFontInst_Mac.cpp XeTeXFontInst_FT2.cpp
-@XETEX_MACOSX@ xetex_images_o =
-
-@XETEX_MACOSX@ XETEX_DEFINES = -DXETEX_MAC
-
-@XETEX_MACOSX@ EXTRALIBS = -framework Carbon -framework Cocoa -framework QuickTime
-
-@XETEX_MACOSX@ EXTRADEPS =
-
-# On non-Mac platforms:
-@XETEX_GENERIC@ xetex_platform_o = XeTeXFontMgr_FC.o
-@XETEX_GENERIC@ xetex_platform_layout_o = XeTeXFontInst_FT2.o
-@XETEX_GENERIC@ xetex_platform_layout_cxx = XeTeXFontInst_FT2.cpp
-@XETEX_GENERIC@ xetex_images_o = mfileio.o numbers.o pdfimage.o bmpimage.o jpegimage.o pngimage.o XeTeX_pic.o
-
-@XETEX_GENERIC@ XETEX_DEFINES = -DXETEX_OTHER
-
-@XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@
-
-@XETEX_GENERIC@ EXTRADEPS = @LIBXPDFDEP@ @LIBPNGDEP@
-
-### is Graphite support included?
-
-@XETEX_GRAPHITE@ xetex_graphite_layout_o = XeTeXGrLayout.o
-@XETEX_GRAPHITE@ XETEX_GRAPHITE = -DXETEX_GRAPHITE
-
-@XETEX_GRAPHITE@ GRAPHITEDIR = ../../libs/graphite-engine
-@XETEX_GRAPHITE@ GRAPHITESRCDIR = $(srcdir)/$(GRAPHITEDIR)
-
-@XETEX_GRAPHITE@ GRAPHITEFLAGS = @GRAPHITECPPFLAGS@
-@XETEX_GRAPHITE@ LDGRAPHITE = @LDGRAPHITE@
-@XETEX_GRAPHITE@ GRAPHITEDEP = @GRAPHITEDEP@
-
-### end of platform-specific setup
-
-LDLIBXPDF=@LDLIBXPDF@
-LIBXPDFCPPFLAGS=@LIBXPDFCPPFLAGS@
-LIBXPDFDEP=@LIBXPDFDEP@
-
-LIBXPDFDIR=../../libs/xpdf
-LIBXPDFSRCDIR=$(srcdir)/$(LIBXPDFDIR)
-
-LDLIBPNG=@LDLIBPNG@
-LIBPNGCPPFLAGS=@LIBPNGCPPFLAGS@
-LIBPNGDEP=@LIBPNGDEP@
-
-LIBPNGDIR=../../libs/libpng
-LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR)
-
-LDFREETYPE2 = @LDFREETYPE2@
-FTFLAGS = @FREETYPE2CPPFLAGS@
-FREETYPE2DEP = @FREETYPE2DEP@
-
-FREETYPE2DIR = ../../libs/freetype2
-FREETYPE2SRCDIR = $(srcdir)/$(FREETYPE2DIR)
-
-TECKITFLAGS = @TECKITCPPFLAGS@
-LDTECKIT = @LDTECKIT@
-TECKITDEP = @TECKITDEP@
-
-TECKITDIR=../../libs/teckit
-TECKITSRCDIR=$(srcdir)/$(TECKITDIR)
-
-ICUFLAGS = @ICUCPPFLAGS@
-LDICU = @LDICU@
-ICUDEP = @ICUDEP@
-
-ICUDIR=../../libs/icu-xetex
-ICUSRCDIR=$(srcdir)/$(ICUDIR)
-
-ICUCFLAGS = @ICUCPPFLAGS@ -DLE_USE_CMEMORY
-
-ZLIBCPPFLAGS = @ZLIBCPPFLAGS@
-LDZLIB = @LDZLIB@
-
-ZLIBDIR = ../../libs/zlib
-ZLIBSRCDIR = $(srcdir)/$(ZLIBDIR)
-
-FONTCONFIGCPPFLAGS = @FONTCONFIGCPPFLAGS@
-FONTCONFIGLDFLAGS = @FONTCONFIGLDFLAGS@
-
-xetexlibs = $(LDICU) $(LDTECKIT) $(LDFREETYPE2) $(LDGRAPHITE) $(LDZLIB)
-
-# Font-related headers
-XeTeXFontHdrs = \
- $(srcdir)/xetexdir/FontTableCache.h \
- $(srcdir)/xetexdir/XeTeXFontInst.h \
- $(srcdir)/xetexdir/XeTeXFontInst_FT2.h \
- $(srcdir)/xetexdir/XeTeXFontInst_Mac.h \
- $(srcdir)/xetexdir/XeTeXFontMgr.h \
- $(srcdir)/xetexdir/XeTeXFontMgr_FC.h \
- $(srcdir)/xetexdir/XeTeXFontMgr_Mac.h \
- $(srcdir)/xetexdir/XeTeXLayoutInterface.h \
- $(srcdir)/xetexdir/XeTeXOTLayoutEngine.h
-
-# Image-related headers
-XeTeXImageHdrs = \
- $(srcdir)/xetexdir/bmpimage.h \
- $(srcdir)/xetexdir/jpegimage.h \
- $(srcdir)/xetexdir/pdfimage.h \
- $(srcdir)/xetexdir/pngimage.h
-
-# Extract xetex version
-xetexdir/xetex.version: $(srcdir)/xetexdir/xetex.ch
- test -d xetexdir || mkdir xetexdir
- grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >xetexdir/xetex.version
-
-# Extract etex version
-xetexdir/etex.version: $(srcdir)/etexdir/etex.ch
- test -d xetexdir || mkdir xetexdir
- grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
- | sed "s/^.*'-//;s/'.*$$//" >xetexdir/etex.version
-
-# The C sources.
-xetex_c = xetexini.c xetex0.c xetex1.c xetex2.c
-xetex_o = xetexini.o xetex0.o xetex1.o xetex2.o xetexextra.o
-xetex_add_o = trans.o XeTeX_ext.o xetex_pool.o $(xetex_platform_o) $(xetex_o-with_synctex)
-
-# these compilations require the path to TECkit headers;
-# just setting it in XCFLAGS doesn't seem to work when we're called
-# recursively from "make world" etc
-xetexini.o: xetexini.c $(srcdir)/xetexdir/XeTeX_ext.h
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-xetex0.o: xetex0.c $(srcdir)/xetexdir/XeTeX_ext.h
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-xetex1.o: xetex1.c $(srcdir)/xetexdir/XeTeX_ext.h
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-xetex2.o: xetex2.c $(srcdir)/xetexdir/XeTeX_ext.h
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-xetexextra.o: xetexextra.c $(srcdir)/xetexdir/XeTeX_ext.h
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-xetex_pool.o: xetex_pool.c $(srcdir)/xetexdir/XeTeX_ext.h
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-# image support
-mfileio.o: $(srcdir)/xetexdir/mfileio.c $(srcdir)/xetexdir/mfileio.h
- $(compile) $(ALL_CFLAGS) $(FTFLAGS) -c $< -o $@
-
-numbers.o: $(srcdir)/xetexdir/numbers.c $(srcdir)/xetexdir/numbers.h
- $(compile) $(ALL_CFLAGS) $(FTFLAGS) -c $< -o $@
-
-bmpimage.o: $(srcdir)/xetexdir/bmpimage.c $(srcdir)/xetexdir/bmpimage.h
- $(compile) $(ALL_CFLAGS) $(FTFLAGS) -c $< -o $@
-
-jpegimage.o: $(srcdir)/xetexdir/jpegimage.c $(srcdir)/xetexdir/jpegimage.h
- $(compile) $(ALL_CFLAGS) $(FTFLAGS) -c $< -o $@
-
-pngimage.o: $(srcdir)/xetexdir/pngimage.c $(srcdir)/xetexdir/pngimage.h
- $(compile) $(ALL_CFLAGS) $(FTFLAGS) $(LIBPNGCPPFLAGS) $(ZLIBCPPFLAGS) -c $< -o $@
-
-pdfimage.o: $(srcdir)/xetexdir/pdfimage.cpp $(srcdir)/xetexdir/pdfimage.h
- $(CXX) $(ALL_CFLAGS) $(FTFLAGS) $(LIBXPDFCPPFLAGS) -c $< -o $@
-
-XeTeX_pic.o: $(srcdir)/xetexdir/XeTeX_pic.c $(srcdir)/xetexdir/XeTeX_ext.h $(XeTeXImageHdrs)
- $(compile) $(TECKITFLAGS) $(FTFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-# Layout library
-xetex_ot_layout_o = \
- XeTeXFontMgr.o \
- XeTeXLayoutInterface.o XeTeXOTLayoutEngine.o \
- XeTeXFontInst.o cmaps.o FontTableCache.o \
- XeTeXOTMath.o \
- $(xetex_graphite_layout_o) \
- $(xetex_platform_layout_o)
-
-XeTeXLayoutInterface.o: $(srcdir)/xetexdir/XeTeXLayoutInterface.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(GRAPHITEFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) $(XETEX_GRAPHITE) -c $< -o $@
-XeTeXOTLayoutEngine.o: $(srcdir)/xetexdir/XeTeXOTLayoutEngine.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-XeTeXFontMgr.o: $(srcdir)/xetexdir/XeTeXFontMgr.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-XeTeXFontMgr_FC.o: $(srcdir)/xetexdir/XeTeXFontMgr_FC.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-XeTeXFontMgr_Mac.o: $(srcdir)/xetexdir/XeTeXFontMgr_Mac.mm $(XeTeXFontHdrs)
- $(CXX) -ObjC++ $(ICUCFLAGS) $(FTFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-cmaps.o: $(srcdir)/xetexdir/cmaps.cpp
- $(CXX) $(ICUCFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-FontTableCache.o: $(srcdir)/xetexdir/FontTableCache.cpp
- $(CXX) $(ICUCFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-XeTeXFontInst.o: $(srcdir)/xetexdir/XeTeXFontInst.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-XeTeXFontInst_Mac.o: $(srcdir)/xetexdir/XeTeXFontInst_Mac.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-XeTeXFontInst_FT2.o: $(srcdir)/xetexdir/XeTeXFontInst_FT2.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-XeTeXOTMath.o: $(srcdir)/xetexdir/XeTeXOTMath.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-XeTeXGrLayout.o: $(srcdir)/xetexdir/XeTeXGrLayout.cpp $(srcdir)/xetexdir/XeTeXGrLayout.h \
- $(XeTeXFontHdrs) $(GRAPHITESRCDIR)/include/graphite/Font.h
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(GRAPHITEFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-# special rules for files that need the TECkit headers as well
-XeTeX_ext.o: $(srcdir)/xetexdir/XeTeX_ext.c xetexd.h
- $(compile) $(ICUCFLAGS) $(FTFLAGS) $(TECKITFLAGS) $(LIBPNGCPPFLAGS) $(LIBXPDFCPPFLAGS) $(ZLIBCPPFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) $(XETEX_GRAPHITE) -c $< -o $@
-XeTeX_mac.o: $(srcdir)/xetexdir/XeTeX_mac.c xetexd.h
- $(compile) $(ICUCFLAGS) $(TECKITFLAGS) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-trans.o: $(srcdir)/xetexdir/trans.c
- $(compile) $(ALL_CFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-# sync
-synctex-xe.o: synctex-xe.c
- $(compile) $(ALL_CFLAGS) $(TECKITFLAGS) $(FTFLAGS) $(XETEX_DEFINES) -c $< -o $@
-
-# Making xetex.
-xetex: $(xetex_o) $(xetex_add_o) $(xetex_images_o) $(xetex_ot_layout_o) \
- $(GRAPHITEDEP) $(TECKITDEP) $(FREETYPE2DEP) $(ICUDEP) $(EXTRADEPS)
- @CXXHACKLINK@ $(xetex_o) $(xetex_add_o) $(xetex_images_o) $(xetex_ot_layout_o) \
- $(FONTCONFIGLDFLAGS) $(socketlibs) $(xetexlibs) $(EXTRALIBS) \
- @CXXHACKLDLIBS@ @CXXLDEXTRA@ @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
-
-# C file dependencies
-$(xetex_c) xetexcoerce.h xetexd.h: xetex.p $(web2c_texmf)
- $(web2c) xetex
- $(xetexd.h-with_synctex)
-
-xetexextra.c: xetexd.h lib/texmfmp.c xetexdir/xetexextra.h
- sed s/TEX-OR-MF-OR-MP/xetex/ $(srcdir)/lib/texmfmp.c >$@
-xetexdir/xetexextra.h: xetexdir/xetexextra.in xetexdir/xetex.version xetexdir/etex.version
- test -d xetexdir || mkdir xetexdir
- sed -e s/XETEX-VERSION/`cat xetexdir/xetex.version`/ \
- -e s/ETEX-VERSION/`cat xetexdir/etex.version`/ \
- $(srcdir)/xetexdir/xetexextra.in >$@
-
-xetex_pool.c: xetex.pool
- perl $(srcdir)/xetexdir/pool2c.pl $< $@
-
-# Tangling
-xetex.p xetex.pool: ./otangle xetex.web
- ./otangle xetex.web
-
-# Generation of the web file.
-# Sources for xetex.web:
-xetex_web_srcs = $(srcdir)/tex.web \
- $(srcdir)/etexdir/etex.ch \
- $(srcdir)/etexdir/tex.ch0 \
- $(srcdir)/tex.ch \
- $(srcdir)/etexdir/tex.ch1 \
- $(srcdir)/etexdir/tex.ech \
- $(xetex_ch_srcs-with_synctex) \
- $(srcdir)/xetexdir/xetex.ch \
- $(srcdir)/xetexdir/xetex-latex3.ch \
- $(xetex_post_ch_srcs-with_synctex)
-xetex.web: tie xetexdir/xetex.mk $(xetex_web_srcs)
- $(TIE) -m xetex.web $(xetex_web_srcs)
-
-################## FIXME: the rest of this isn't properly updated for xetex yet...
-################## e.g., we don't have real xetex tests to run!
-
-# Tests...
-#check: @XETEX@ xetex-check
-#xetex-check: etrip xetex.fmt
-# Test truncation (but don't bother showing the warning msg).
-# ./xetex --progname=xetex --output-comment="`cat $(srcdir)/PROJECTS`" \
-# $(srcdir)/tests/hello 2>/dev/null \
-# && ./dvitype hello.dvi | grep olaf@infovore.xs4all.nl >/dev/null
-# \openout should show up in \write's.
-# ./xetex --progname=xetex $(srcdir)/tests/openout && grep xfoo openout.log
-# one.two.tex -> one.two.log
-# ./xetex --progname=xetex $(srcdir)/tests/one.two && ls -l one.two.log
-# uno.dos -> uno.log
-# ./xetex --progname=xetex $(srcdir)/tests/uno.dos && ls -l uno.log
-# ./xetex --progname=xetex $(srcdir)/tests/just.texi && ls -l just.log
-# -./xetex --progname=xetex $(srcdir)/tests/batch.tex
-# ./xetex --progname=xetex --shell $(srcdir)/tests/write18 | grep echo
-# ./xetex --mltex --progname=xeinitex $(srcdir)/tests/mltextst
-# -./xetex --progname=xetex </dev/null
-# -PATH=`pwd`:$(kpathsea_dir):$(kpathsea_srcdir):$$PATH \
-# WEB2C=$(kpathsea_srcdir) TMPDIR=.. \
-# ./xetex --progname=xetex '\nonstopmode\font\foo=nonesuch\end'
-
-# Cleaning up.
-clean:: xetex-clean
-xetex-clean: # etrip-clean
- $(LIBTOOL) --mode=clean $(RM) xetex
- rm -f $(xetex_o) $(xetex_c) xetexextra.c xetex_pool.c xetexcoerce.h xetexd.h
- rm -f xetexdir/xetexextra.h xetexdir/xetex.version
- rm -f xetex.p xetex.pool xetex.web
- rm -f xetex.fmt xetex.log
- rm -f hello.dvi hello.log xfoo.out openout.log one.two.log uno.log
- rm -f just.log batch.log write18.log mltextst.log texput.log
- rm -f missfont.log
- rm -rf tfm
-
-# Dumps
-all_xefmts = xetex.fmt $(xefmts)
-
-dumps: @XETEX@ xefmts
-xefmts: $(all_xefmts)
-
-xefmtdir = $(web2cdir)/xetex
-$(xefmtdir)::
- $(SHELL) $(top_srcdir)/../mkinstalldirs ${DESTDIR}$(xefmtdir)
-
-xetex.fmt: xetex
- $(dumpenv) $(MAKE) progname=xetex files="xetex.ini unicode-letters.tex plain.tex cmr10.tfm" prereq-check
- $(dumpenv) ./xetex --progname=xetex --jobname=xetex --ini \*\\input xetex.ini \\dump </dev/null
-
-xelatex.fmt: xetex
- $(dumpenv) $(MAKE) progname=xelatex files="xelatex.ini unicode-letters.tex latex.ltx" prereq-check
- $(dumpenv) ./xetex --progname=xelatex --jobname=xelatex --ini \*\\input xelatex.ini </dev/null
-
-#
-# Installation.
-install-xetex: install-xetex-exec
-install-programs: @XETEX@ install-xetex-programs
-install-xetex-programs: xetex $(bindir)
- for p in xetex; do $(INSTALL_LIBTOOL_PROG) $$p ${DESTDIR}$(bindir); done
-
-# end of xetex.mk
diff --git a/Build/source/texk/web2c/xetexdir/xetexextra.c b/Build/source/texk/web2c/xetexdir/xetexextra.c
new file mode 100644
index 00000000000..401c90ed865
--- /dev/null
+++ b/Build/source/texk/web2c/xetexdir/xetexextra.c
@@ -0,0 +1,11 @@
+/* xetexextra.c: Hand-coded routines for XeTeX.
+
+ This file is public domain. */
+
+#define EXTERN /* Instantiate data from xetexd.h here. */
+
+/* This file defines TeX and XeTeX. */
+#include <xetexd.h>
+
+/* Hand-coded routines for TeX or Metafont in C. */
+#include <lib/texmfmp.c>
diff --git a/Build/source/texk/web2c/xetexdir/xetexextra.in b/Build/source/texk/web2c/xetexdir/xetexextra.h
index 1a3ef9a7c8c..6adccef578e 100644
--- a/Build/source/texk/web2c/xetexdir/xetexextra.in
+++ b/Build/source/texk/web2c/xetexdir/xetexextra.h
@@ -1,8 +1,7 @@
/****************************************************************************\
- xetexextra.in: banner etc. for XeTeX.
+ xetexextra.h: banner etc. for XeTeX.
- This is included by XeTeX, from ../xetexextra.c
- (generated from ../lib/texmfmp.c).
+ This is included by XeTeX, from xetexextra.c.
Part of the XeTeX typesetting system
copyright (c) 1994-2008 by SIL International
@@ -54,7 +53,10 @@ 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 XeTeX, Version 3.1415926-ETEX-VERSION-XETEX-VERSION"
+#include <xetexdir/etex_version.h> /* for ETEX_VERSION */
+#include <xetexdir/xetex_version.h> /* for XETEX_VERSION */
+
+#define BANNER "This is XeTeX, Version 3.1415926-" ETEX_VERSION "-" XETEX_VERSION
#define COPYRIGHT_HOLDER "SIL International and Jonathan Kew"
#define AUTHOR "Jonathan Kew"
#define PROGRAM_HELP XETEXHELP