diff options
Diffstat (limited to 'Build/source/texk/web2c')
| -rw-r--r-- | Build/source/texk/web2c/ChangeLog | 15 | ||||
| -rw-r--r-- | Build/source/texk/web2c/Makefile.in | 83 | ||||
| -rw-r--r-- | Build/source/texk/web2c/alephdir/aleph.mk | 29 | ||||
| -rw-r--r-- | Build/source/texk/web2c/etexdir/etex.mk | 31 | ||||
| -rw-r--r-- | Build/source/texk/web2c/luatexdir/luatex.mk | 19 | ||||
| -rw-r--r-- | Build/source/texk/web2c/omegadir/omega.mk | 31 | ||||
| -rw-r--r-- | Build/source/texk/web2c/pdftexdir/pdftex.mk | 29 | ||||
| -rw-r--r-- | Build/source/texk/web2c/xetexdir/xetex.mk | 25 |
8 files changed, 57 insertions, 205 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 813d8a593fd..23317f1aeaf 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,18 @@ +2008-05-28 Karl Berry <karl@tug.org> + + * Makefile.in (basic_engines): split off tex/mf[n]/mpost. + (install-programs): handle basic_engines here. + (install-tex, install-mf, install-mpost; -exec, -data, -dumps): + remove all these. Never try to make the dumps. + * luatexdir/luatex.mk, + * omegadir/omega.mk, + * xetexdir/xetex.mk, + * alephdir/aleph.mk, + * pdftexdir/pdftex.mk, + * etex/etex.mk: omit installation of pool files and dumps, + with consequent simplifications. For etex.mk, also omit + installation of the binary. + 2008-05-25 Karl Berry <karl@tug.org> * cpascal.h (loadpoolstrings): declare. diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 3e97d278405..a8ac7643eab 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -9,9 +9,8 @@ version = @WEB2CVERSION@ .NOTPARALLEL: # These lines define the memory dumps that fmts/bases/mems will make and -# install-fmts/install-bases/install-mems will install. plain.* is -# created automatically (as a link). See the Formats node in -# doc/web2c.texi for details on the fmts. +# install-fmts/install-bases/install-mems will install. +# See the Formats node in doc/web2c.texi for more details. fmts = olatex.fmt # amstex.fmt eplain.fmt texinfo.fmt efmts = latex.fmt pdffmts = pdfolatex.fmt @@ -19,7 +18,7 @@ pdfefmts = pdflatex.fmt afmts = lamed.fmt ofmts = lambda.fmt eofmts = elambda.fmt -bases = # I do not recommend building cmmf.base. +bases = # no good reason to build cmmf.base. mems = # mfplain.mem is probably not generally useful. # The name of the file that defines your local devices for Metafont. @@ -599,9 +598,14 @@ programs = bibtex ctangle ctie cweave dvicopy dvitomp dvitype gftodvi gftopk \ pktogf pktype pltotf pooltype synctex tangle tftopl tie $(ttf2afm) \ vftovp vptovf weave +# basic_engines are the binaries we build and install directly here in +# the webdir/ directory. # include $(metapost) from metapost.mk even though it also includes # dvitomp. Hopefully that doesn't hurt. -engines = $(tex) $(etex) $(mf) $(mfn) $(metapost) \ +basic_engines = $(tex) $(mf) $(mfn) $(metapost) + +# engines includes the ones built in subdirectories. +engines = $(basic_engines) $(etex) \ $(omega) $(aleph) \ $(pdftex) $(pdfetex) \ $(xetex) $(luatex) @@ -765,10 +769,6 @@ tex.fmt: tex $(dumpenv) $(MAKE) progname=tex files="plain.tex cmr10.tfm" prereq-check $(dumpenv) ./tex --progname=tex --jobname=tex --ini \\input plain \\dump </dev/null -#latex.fmt: tex -# $(dumpenv) $(MAKE) progname=latex files="latex.ltx" prereq-check -# $(dumpenv) ./tex --progname=latex --jobname=latex --ini \\input latex.ltx </dev/null - olatex.fmt: tex $(dumpenv) $(MAKE) progname=olatex files="latex.ltx" prereq-check $(dumpenv) ./tex --progname=olatex --jobname=olatex --ini \\input latex.ltx </dev/null @@ -777,10 +777,6 @@ mltex.fmt: tex $(dumpenv) $(MAKE) progname=mltex files="plain.tex cmr10.tfm" prereq-check $(dumpenv) ./tex --mltex --progname=mltex --jobname=mltex --ini \\input plain \\dump </dev/null -#mllatex.fmt: tex -# $(dumpenv) $(MAKE) progname=mllatex files="latex.ltx" prereq-check -# $(dumpenv) ./tex --mltex --progname=mllatex --jobname=mllatex --ini \\input latex.ltx </dev/null - mf.base: mf $(dumpenv) $(MAKE) progname=mf files="plain.mf cmr10.mf $(localmodes).mf" prereq-check $(dumpenv) ./mf --progname=mf --jobname=mf --ini \\input plain input $(localmodes) dump </dev/null @@ -819,9 +815,7 @@ eplain.fmt: tex.fmt # install: install-exec install-data -install-exec:: install-programs @FMU@ install-links -install-data:: install-tex-data install-mf-data install-mpost-data -install-dumps: install-tex-dumps install-mf-dumps install-mpost-dumps +install-exec:: install-programs # Installation directories. $(bindir):: @@ -841,59 +835,18 @@ $(memdir):: $(web2cdir):: $(SHELL) $(top_srcdir)/../mkinstalldirs $(web2cdir) -# Installing the programs. -install-programs: $(programs) $(bindir) +# Installing the binaries. Each of the *dir/*.mk files (except etex) +# add to this target via a dependency-only rule, to install their +# respective engines. +install-programs: $(programs) $(basic_engines) $(bindir) for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done -# Installation of the main engines. -install-tex: install-tex-exec install-tex-data -install-mf: install-mf-exec install-mf-data -install-mpost: install-mpost-exec install-mpost-data - -install-tex-exec: @FMU@ install-tex-links -install-mf-exec: @FMU@ install-mf-links -install-mpost-exec: @FMU@ install-mpost-links - -install-tex-data: @FMU@ install-tex-dumps -install-mf-data: @FMU@ install-mf-dumps -install-mpost-data: @FMU@ install-mpost-dumps - -install-tex-dumps: install-tex-fmts -install-mf-dumps: install-mf-bases -install-mpost-dumps: install-mpost-mems - -# Actual binaries. -install-programs: install-tex-programs -install-tex-programs: tex $(bindir) - tex="tex"; \ - for p in $$tex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done -install-programs: install-mf-programs -install-mf-programs: mf $(mfn) $(bindir) - mf="mf $(mfn)"; \ - for p in $$mf; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done -install-programs: install-mpost-programs -install-mpost-programs: mpost $(bindir) - mpost="mpost"; \ - for p in $$mpost; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done - -# The links to {mf,mp,tex} for each format and for {ini,vir}{mf,mp,tex}, -# plus the equivalents for e-TeX, Omega, and pdf[ex]TeX. -install-links: install-tex-links -install-tex-links: install-tex-programs - #cd $(bindir) && (rm -f initex virtex; \ - # $(LN) tex initex; $(LN) tex virtex) - -install-links: install-mf-links -install-mf-links: install-mf-programs - #cd $(bindir) && (rm -f inimf virmf; \ - # $(LN) mf inimf; $(LN) mf virmf) - -install-links: install-mpost-links -install-mpost-links: install-mpost-programs - #cd $(bindir) && (rm -f inimpost virmpost; \ - # $(LN) mpost inimpost; $(LN) mpost virmpost) +# We do not attempt to install any of the per-format symlinks, leaving +# that to a separate run of texlinks. # Always do plain.*, so examples from the TeXbook (etc.) will work. +# This target is not called, since it depends on the whole texmf tree, +# but we leave it for posterity. install-fmts: install-tex-fmts install-tex-fmts: fmts $(fmtdir) fmts="$(all_fmts)"; \ diff --git a/Build/source/texk/web2c/alephdir/aleph.mk b/Build/source/texk/web2c/alephdir/aleph.mk index 6ace4bd3781..71e5e875681 100644 --- a/Build/source/texk/web2c/alephdir/aleph.mk +++ b/Build/source/texk/web2c/alephdir/aleph.mk @@ -157,32 +157,9 @@ lamed.fmt: aleph # # Installation. -install-aleph: install-aleph-exec install-aleph-data -install-aleph-exec: install-aleph-programs install-aleph-links -install-aleph-data: install-aleph-pool @FMU@ install-aleph-dumps -install-aleph-dumps: install-aleph-fmts - -# The actual binary executables and pool files. -install-programs: @ALEPH@ install-aleph-programs -install-aleph-programs: aleph $(bindir) +install-aleph: install-aleph-exec +install-programs: @ALEPH@ install-aleph-exec +install-aleph-exec: aleph $(bindir) for p in aleph; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done -install-links: @ALEPH@ install-aleph-links -install-aleph-links: install-aleph-programs - #cd $(bindir) && (rm -f inialeph viraleph; \ - # $(LN) aleph inialeph; $(LN) aleph viraleph) - -install-fmts: @ALEPH@ install-aleph-fmts -install-aleph-fmts: afmts $(afmtdir) - afmts="$(all_afmts)"; \ - for f in $$afmts; do $(INSTALL_DATA) $$f $(afmtdir)/$$f; done - afmts="$(afmts)"; \ - for f in $$afmts; do base=`basename $$f .fmt`; \ - (cd $(bindir) && (rm -f $$base; $(LN) aleph $$base)); done - -# Auxiliary files. -install-data:: @ALEPH@ install-aleph-data -install-aleph-pool: aleph.pool $(texpooldir) - $(INSTALL_DATA) aleph.pool $(texpooldir)/aleph.pool - # end of aleph.mk diff --git a/Build/source/texk/web2c/etexdir/etex.mk b/Build/source/texk/web2c/etexdir/etex.mk index 99e78c12cb9..4e2024a0fb1 100644 --- a/Build/source/texk/web2c/etexdir/etex.mk +++ b/Build/source/texk/web2c/etexdir/etex.mk @@ -187,29 +187,14 @@ latex.fmt: etex # $(dumpenv) $(MAKE) progname=olatex files="latex.ltx" prereq-check # $(dumpenv) ./etex --progname=olatex --progname=olatex --ini \\input latex.ltx </dev/null -# Install -install-etex: install-etex-exec install-etex-data -install-etex-exec: install-etex-programs install-etex-links -install-etex-data: @FMU@ install-etex-dumps -install-etex-dumps: install-etex-fmts - -install-programs: @ETEX@ install-etex-programs -install-etex-programs: etex $(bindir) +# +# Installation -- nothing by default, that is, we omit the +# install-programs target. We want to make etex a symlink to pdftex, +# via texlinks. Leave this unused install-etex* targets just to show +# that the real binary does get built and can be used if desired. + +install-etex: install-etex-exec +install-etex-exec: etex $(bindir) for p in etex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done -install-links: @ETEX@ install-etex-links -install-etex-links: install-etex-programs - #cd $(bindir) && (rm -f einitex evirtex; \ - # $(LN) etex einitex; $(LN) etex evirtex) - -install-fmts: @ETEX@ install-etex-fmts -install-etex-fmts: efmts $(efmtdir) - efmts="$(all_efmts)"; \ - for f in $$efmts; do $(INSTALL_DATA) $$f $(efmtdir)/$$f; done - efmts="$(efmts)"; \ - for f in $$efmts; do base=`basename $$f .fmt`; \ - (cd $(bindir) && (rm -f $$base; $(LN) etex $$base)); done - -install-data:: @ETEX@ install-etex-data - # end of etex.mk diff --git a/Build/source/texk/web2c/luatexdir/luatex.mk b/Build/source/texk/web2c/luatexdir/luatex.mk index 86c593f6185..19cf9d4e223 100644 --- a/Build/source/texk/web2c/luatexdir/luatex.mk +++ b/Build/source/texk/web2c/luatexdir/luatex.mk @@ -119,26 +119,11 @@ luatex.fmt: luatex # # Installation. install-luatex: install-luatex-exec -install-luatex-exec: install-luatex-links -# The actual binary executables and pool files. -install-programs: @PETEX@ install-luatex-programs -install-luatex-programs: $(luatex) $(bindir) +install-programs: @LTEX@ install-luatex-exec +install-luatex-exec: $(luatex) $(bindir) for p in luatex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done -install-links: @PETEX@ install-luatex-links -install-luatex-links: install-luatex-programs - #cd $(bindir) && (rm -f luainitex luavirtex; \ - # $(LN) luatex luainitex; $(LN) luatex luavirtex) - -install-fmts: @PETEX@ install-luatex-fmts -install-luatex-fmts: luafmts $(luafmtdir) - luafmts="$(all_luafmts)"; \ - for f in $$luafmts; do $(INSTALL_DATA) $$f $(luafmtdir)/$$f; done - luafmts="$(luafmts)"; \ - for f in $$luafmts; do base=`basename $$f .fmt`; \ - (cd $(bindir) && (rm -f $$base; $(LN) luatex $$base)); done - # # luatex binaries archive luatexbin: diff --git a/Build/source/texk/web2c/omegadir/omega.mk b/Build/source/texk/web2c/omegadir/omega.mk index e44d86264cd..a76da6b729b 100644 --- a/Build/source/texk/web2c/omegadir/omega.mk +++ b/Build/source/texk/web2c/omegadir/omega.mk @@ -207,38 +207,17 @@ otps/outocp: cd otps && $(MAKE) $(common_makeargs) outocp omegafonts/omfonts: cd omegafonts && $(MAKE) $(common_makeargs) omfonts + # # Installation. -install-omega: install-omega-exec install-omega-data -install-omega-exec: install-omega-links -install-omega-data: install-omega-pool @FMU@ install-omega-dumps -install-omega-dumps: install-omega-fmts - -# The actual binary executables and pool files. -install-programs: @OMEGA@ install-omega-programs -install-omega-programs: $(omega_programs) $(bindir) +install-omega: install-omega-exec +install-programs: @OMEGA@ install-omega-exec +install-omega-exec: $(omega_programs) $(bindir) install-omega-links for p in omega; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done cd otps && $(MAKE) $(install_makeargs) install-programs cd omegafonts && $(MAKE) $(install_makeargs) install-programs -install-links: @OMEGA@ install-omega-links -install-omega-links: install-omega-programs +install-omega-links: cd omegafonts && $(MAKE) $(install_makeargs) install-links - #cd $(bindir) && (rm -f iniomega viromega; \ - # $(LN) omega iniomega; $(LN) omega viromega) - -# Always do plain.*, so examples from the TeXbook (etc.) will work. -install-fmts: @OMEGA@ install-omega-fmts -install-omega-fmts: ofmts $(ofmtdir) - ofmts="$(all_ofmts)"; \ - for f in $$ofmts; do $(INSTALL_DATA) $$f $(ofmtdir)/$$f; done - ofmts="$(ofmts)"; \ - for f in $$ofmts; do base=`basename $$f .fmt`; \ - (cd $(bindir) && (rm -f $$base; $(LN) omega $$base)); done - -# Auxiliary files. -install-data:: @OMEGA@ install-omega-data -install-omega-pool: omega.pool $(texpooldir) - $(INSTALL_DATA) omega.pool $(texpooldir)/omega.pool # end of omega.mk diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.mk b/Build/source/texk/web2c/pdftexdir/pdftex.mk index 7ff89824594..287cd06b63f 100644 --- a/Build/source/texk/web2c/pdftexdir/pdftex.mk +++ b/Build/source/texk/web2c/pdftexdir/pdftex.mk @@ -109,34 +109,11 @@ pdflatex.fmt: pdftex # # Installation. -install-pdftex: install-pdftex-exec install-pdftex-data -install-pdftex-exec: install-pdftex-links -install-pdftex-data: install-pdftex-pool @FMU@ install-pdftex-dumps -install-pdftex-dumps: install-pdftex-fmts - -# The actual binary executables and pool files. -install-programs: @PETEX@ install-pdftex-programs -install-pdftex-programs: $(pdftex) $(bindir) +install-pdftex: install-pdftex-exec +install-programs: @PETEX@ install-pdftex-exec +install-pdftex-exec: $(pdftex) $(bindir) for p in pdftex; do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done -install-links: @PETEX@ install-pdftex-links -install-pdftex-links: install-pdftex-programs - #cd $(bindir) && (rm -f pdfeinitex pdfevirtex; \ - # $(LN) pdftex pdfeinitex; $(LN) pdftex pdfevirtex) - -install-fmts: @PETEX@ install-pdftex-fmts -install-pdftex-fmts: pdfefmts $(pdfefmtdir) - pdfefmts="$(all_pdfefmts)"; \ - for f in $$pdfefmts; do $(INSTALL_DATA) $$f $(pdfefmtdir)/$$f; done - pdfefmts="$(pdfefmts)"; \ - for f in $$pdfefmts; do base=`basename $$f .fmt`; \ - (cd $(bindir) && (rm -f $$base; $(LN) pdftex $$base)); done - -# Auxiliary files. -install-data:: @PETEX@ install-pdftex-data -install-pdftex-pool: pdftex.pool $(texpooldir) - $(INSTALL_DATA) pdftex.pool $(texpooldir)/pdftex.pool - # # ttf2afm ttf2afm = ttf2afm diff --git a/Build/source/texk/web2c/xetexdir/xetex.mk b/Build/source/texk/web2c/xetexdir/xetex.mk index 55a18d09261..53ddc9cefea 100644 --- a/Build/source/texk/web2c/xetexdir/xetex.mk +++ b/Build/source/texk/web2c/xetexdir/xetex.mk @@ -319,30 +319,11 @@ 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 - -# Install -install-xetex: install-xetex-exec install-xetex-data -install-xetex-exec: install-xetex-programs install-xetex-links -install-xetex-data: @FMU@ install-xetex-dumps -install-xetex-dumps: install-xetex-fmts - +# +# 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 -install-links: @XETEX@ install-xetex-links -install-xetex-links: install-xetex-programs - #cd $(bindir) && (rm -f xeinitex xevirtex; \ - # $(LN) xetex xeinitex; $(LN) xetex xevirtex) - -install-fmts: @XETEX@ install-xetex-fmts -install-xetex-fmts: xefmts $(xefmtdir) - xefmts="$(all_xefmts)"; \ - for f in $$xefmts; do $(INSTALL_DATA) $$f ${DESTDIR}$(xefmtdir)/$$f; done - xefmts="$(xefmts)"; \ - for f in $$xefmts; do base=`basename $$f .fmt`; \ - (cd ${DESTDIR}$(bindir) && (rm -f $$base; $(LN) xetex $$base)); done - -install-data:: @XETEX@ install-xetex-data - # end of xetex.mk |