diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-11-07 16:20:12 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-11-07 16:20:12 +0000 |
commit | 7a5384a896a4eb618fcfb16188793a09db053bdd (patch) | |
tree | a6bb3b3f485b3106f68f06c72afeb2ea2ba533e5 /Build/source/texk/web2c/xetexdir/am/xetex.am | |
parent | e2d328d170969e328e39b9613ab2bb406b19a078 (diff) |
Start merging XeTeX change files
git-svn-id: svn://tug.org/texlive/trunk@28202 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir/am/xetex.am')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/am/xetex.am | 64 |
1 files changed, 50 insertions, 14 deletions
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am index 7243a75b0f0..7c428e7cb45 100644 --- a/Build/source/texk/web2c/xetexdir/am/xetex.am +++ b/Build/source/texk/web2c/xetexdir/am/xetex.am @@ -13,6 +13,8 @@ EXTRA_PROGRAMS += xetex # Force Automake to use CXXLD for linking nodist_EXTRA_xetex_SOURCES = dummy.cxx +xe_tangle = WEBINPUTS=.:$(srcdir)/xetexdir $(SHELL) ./tangle-sh $@ $(OTANGLE) + libxetex = libxetex.a xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir @@ -78,21 +80,38 @@ xetex-pool.c: xetex.pool xetexd.h $(makecpool_stamp) ## Tangling XeTeX xetex.p xetex.pool: xetex-tangle - @$(o_tangle) xetex -xetex-tangle: ./otangle$(EXEEXT) xetex.web tangle-sh - @$(o_tangle) xetex + @$(xe_tangle) xetex xetex +xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex.ch tangle-sh + @$(xe_tangle) xetex xetex ## Extract xetex version xetexdir/xetex_version.h: xetexdir/xetex.ch $(MKDIR_P) xetexdir - grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.ch \ + grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \ | sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@ -## Generate xetex.web -xetex.web: tie$(EXEEXT) $(xetex_web_srcs) - $(tie) -m xetex.web $(xetex_web_srcs) - -xetex_web_srcs = \ +## Generate xetex.ch +xetex.ch: tie$(EXEEXT) $(xetex_ch_srcs) + $(tie) -c xetex.ch $(xetex_ch_srcs) +xetex_ch_srcs = \ + xetexdir/xetex.web \ + xetexdir/tex.ch0 \ + tex.ch \ + $(xetex_ch_synctex) \ + xetexdir/xetex.ch \ + xetexdir/xetex-latex3.ch \ + xetexdir/xetex-hz.ch \ + $(xetex_post_ch_synctex) \ + tex-binpool.ch + +## Merging in XeTeX change files - begin +Xold.p Xold.pool: Xold-tangle + @$(xe_tangle) Xold +Xold-tangle: otangle$(EXEEXT) Xold.web tangle-sh + @$(xe_tangle) Xold +Xold.web: tie$(EXEEXT) $(Xold_web_srcs) + $(tie) -m Xold.web $(Xold_web_srcs) +Xold_web_srcs = \ tex.web \ etexdir/etex.ch \ etexdir/tex.ch0 \ @@ -101,14 +120,31 @@ xetex_web_srcs = \ etexdir/tex.ech \ tex-binpool.ch \ $(xetex_ch_synctex) \ - xetexdir/xetex.ch \ - xetexdir/xetex-latex3.ch \ - xetexdir/xetex-hz.ch \ + xetex-orig.ch \ + xetex-latex3.ch \ + xetex-hz.ch \ $(xetex_post_ch_synctex) +# +Xnew.web: tie$(EXEEXT) xetexdir/xetex.web xetex.ch + $(tie) -m Xnew.web xetexdir/xetex.web xetex.ch +# +Xweb.diff: Xold.web Xnew.web + diff -u Xold.web Xnew.web >Xweb.diff; : +Xp.diff: Xold.p xetex.p + diff -u Xold.p xetex.p >Xp.diff; : +Xpool.diff: Xold.pool xetex.pool + diff -u Xold.pool xetex.pool >Xpool.diff; : +X.diff: Xweb.diff Xp.diff Xpool.diff + cat Xweb.diff Xp.diff Xpool.diff >X.diff +# +EXTRA_DIST += $(Xold_web_srcs) +DISTCLEANFILES += X* +## Merging in XeTeX change files - end + ## -EXTRA_DIST += $(xetex_web_srcs) xetexdir/xetex.defines +EXTRA_DIST += $(xetex_web_srcs) $(xetex_ch_srcs) xetexdir/xetex.defines -DISTCLEANFILES += $(nodist_xetex_SOURCES) xetex.web xetex-web2c \ +DISTCLEANFILES += $(nodist_xetex_SOURCES) xetex.web xetex.ch xetex-web2c \ xetex.p xetex.pool xetex-tangle EXTRA_DIST += \ |