From 21b4be81ded3ffd6a9911d002709d718654741a2 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 21 Apr 2009 12:47:39 +0000 Subject: new build system: better texk/web2c/ dependencies, rename mpost->oldmpost and newmpost->mpost git-svn-id: svn://tug.org/texlive/trunk@12772 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/WARNING | 5 +- Build/source/texk/web2c/Makefile.am | 5 +- Build/source/texk/web2c/Makefile.in | 753 +- Build/source/texk/web2c/luatexdir/am/luatex.am | 2 +- Build/source/texk/web2c/luatexdir/mp/avl.c | 792 - Build/source/texk/web2c/luatexdir/mp/avl.h | 118 - Build/source/texk/web2c/luatexdir/mp/lmplib.c | 1238 - Build/source/texk/web2c/luatexdir/mp/memio.w | 405 - Build/source/texk/web2c/luatexdir/mp/mp.w | 26390 ---------------------- Build/source/texk/web2c/luatexdir/mp/psout.w | 5703 ----- Build/source/texk/web2c/luatexdir/mp/tfmin.w | 242 - Build/source/texk/web2c/mpdir/am/mp.am | 30 +- Build/source/texk/web2c/mplibdir/am/libmplib.am | 54 + Build/source/texk/web2c/mplibdir/am/mplib.am | 67 +- 14 files changed, 517 insertions(+), 35287 deletions(-) delete mode 100644 Build/source/texk/web2c/luatexdir/mp/avl.c delete mode 100644 Build/source/texk/web2c/luatexdir/mp/avl.h delete mode 100644 Build/source/texk/web2c/luatexdir/mp/lmplib.c delete mode 100644 Build/source/texk/web2c/luatexdir/mp/memio.w delete mode 100644 Build/source/texk/web2c/luatexdir/mp/mp.w delete mode 100644 Build/source/texk/web2c/luatexdir/mp/psout.w delete mode 100644 Build/source/texk/web2c/luatexdir/mp/tfmin.w create mode 100644 Build/source/texk/web2c/mplibdir/am/libmplib.am (limited to 'Build/source') diff --git a/Build/source/WARNING b/Build/source/WARNING index 8d9b67abe6a..68237e932ec 100644 --- a/Build/source/WARNING +++ b/Build/source/WARNING @@ -7,11 +7,10 @@ At the moment the `Build' script should succeed, but might as well fail. Please inform me of any failures! -The new build system is nearly complete, except for the directories +The new build system is nearly complete, except for the directory - texk/web2c/xetexdir utils/xindy and a few features not yet available. -Peter Breitenlohner 2009-04-08 14:00 UTC +Peter Breitenlohner 2009-04-21 10:00 UTC diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am index d3cd2bbaa24..a95cb43876d 100644 --- a/Build/source/texk/web2c/Makefile.am +++ b/Build/source/texk/web2c/Makefile.am @@ -117,9 +117,12 @@ include $(srcdir)/am/texmf.am ## old MetaPost include $(srcdir)/mpdir/am/mp.am -## new MetaPost, also used for by luaTeX +## MetaPost include $(srcdir)/mplibdir/am/mplib.am +## libmplib, used by MetaPost and luaTeX +include $(srcdir)/mplibdir/am/libmplib.am + ## e-TeX include $(srcdir)/etexdir/am/etex.am diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index f702a9ff6d2..3bca8b333e3 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -34,7 +34,7 @@ build_triplet = @build@ host_triplet = @host@ @OMFONTS_TRUE@am__append_1 = omegafonts EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \ - mf-nowin$(EXEEXT) mpost$(EXEEXT) newmpost$(EXEEXT) \ + mf-nowin$(EXEEXT) oldmpost$(EXEEXT) mpost$(EXEEXT) \ etex$(EXEEXT) pdftex$(EXEEXT) luatex$(EXEEXT) \ luatangle$(EXEEXT) xetex$(EXEEXT) $(am__EXEEXT_4) \ aleph$(EXEEXT) @@ -66,6 +66,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_check_SCRIPTS) \ $(srcdir)/luatexdir/am/luasocket.am \ $(srcdir)/luatexdir/am/luatangle.am \ $(srcdir)/luatexdir/am/luatex.am $(srcdir)/mpdir/am/mp.am \ + $(srcdir)/mplibdir/am/libmplib.am \ $(srcdir)/mplibdir/am/mplib.am \ $(srcdir)/omegaware/am/omegaware.am \ $(srcdir)/pdftexdir/am/libpdftex.am \ @@ -84,7 +85,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_check_SCRIPTS) \ @TEX_TRUE@am__append_3 = tex @MF_TRUE@am__append_4 = mf @MFN_TRUE@@MF_TRUE@am__append_5 = mf-nowin -@MP_TRUE@am__append_6 = mpost newmpost +@MP_TRUE@am__append_6 = oldmpost mpost @ETEX_TRUE@am__append_7 = etex @PDFTEX_TRUE@am__append_8 = pdftex @MINGW32_TRUE@am__append_9 = \ @@ -149,6 +150,10 @@ DIST_COMMON = README $(am__configure_deps) $(dist_check_SCRIPTS) \ @PDFTEX_SYNCTEX_TRUE@am__append_36 = \ @PDFTEX_SYNCTEX_TRUE@ synctex-pdf.c +@XETEX_SYNCTEX_TRUE@am__append_37 = -I$(srcdir)/synctexdir +@XETEX_SYNCTEX_TRUE@am__append_38 = \ +@XETEX_SYNCTEX_TRUE@ synctex-xe.c + subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-asm.m4 \ @@ -316,22 +321,25 @@ nodist_libmf_a_OBJECTS = $(am__objects_1) libmf_a-mf-pool.$(OBJEXT) libmf_a_OBJECTS = $(nodist_libmf_a_OBJECTS) libmplib_a_AR = $(AR) $(ARFLAGS) libmplib_a_LIBADD = -am__objects_2 = libmplib_a-avl.$(OBJEXT) -am_libmplib_a_OBJECTS = $(am__objects_2) -am__objects_3 = libmplib_a-mp.$(OBJEXT) libmplib_a-psout.$(OBJEXT) \ - libmplib_a-svgout.$(OBJEXT) libmplib_a-memio.$(OBJEXT) \ - libmplib_a-tfmin.$(OBJEXT) -nodist_libmplib_a_OBJECTS = $(am__objects_3) +am_libmplib_a_OBJECTS = libmplib_a-avl.$(OBJEXT) +am__objects_2 = libmplib_a-mp.$(OBJEXT) +am__objects_3 = libmplib_a-psout.$(OBJEXT) +am__objects_4 = libmplib_a-svgout.$(OBJEXT) +nodist_libmplib_a_OBJECTS = libmplib_a-memio.$(OBJEXT) \ + libmplib_a-tfmin.$(OBJEXT) $(am__objects_2) $(am__objects_3) \ + $(am__objects_4) libmplib_a_OBJECTS = $(am_libmplib_a_OBJECTS) \ $(nodist_libmplib_a_OBJECTS) -libmpost_a_AR = $(AR) $(ARFLAGS) -libmpost_a_LIBADD = -am_libmpost_a_OBJECTS = libmpost_a-avl.$(OBJEXT) \ - libmpost_a-avlstuff.$(OBJEXT) libmpost_a-mapfile.$(OBJEXT) \ - libmpost_a-turningnumber.$(OBJEXT) libmpost_a-utils.$(OBJEXT) \ - libmpost_a-writeenc.$(OBJEXT) libmpost_a-writefont.$(OBJEXT) \ - libmpost_a-writet1.$(OBJEXT) -libmpost_a_OBJECTS = $(am_libmpost_a_OBJECTS) +liboldmpost_a_AR = $(AR) $(ARFLAGS) +liboldmpost_a_LIBADD = +am_liboldmpost_a_OBJECTS = liboldmpost_a-avl.$(OBJEXT) \ + liboldmpost_a-avlstuff.$(OBJEXT) \ + liboldmpost_a-mapfile.$(OBJEXT) \ + liboldmpost_a-turningnumber.$(OBJEXT) \ + liboldmpost_a-utils.$(OBJEXT) liboldmpost_a-writeenc.$(OBJEXT) \ + liboldmpost_a-writefont.$(OBJEXT) \ + liboldmpost_a-writet1.$(OBJEXT) +liboldmpost_a_OBJECTS = $(am_liboldmpost_a_OBJECTS) libpdftex_a_AR = $(AR) $(ARFLAGS) libpdftex_a_LIBADD = am__libpdftex_a_SOURCES_DIST = pdftexdir/avl.c pdftexdir/avl.h \ @@ -346,7 +354,7 @@ am__libpdftex_a_SOURCES_DIST = pdftexdir/avl.c pdftexdir/avl.h \ pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \ pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \ pdftexdir/regex/regex.c pdftexdir/regex/regex.h -@MINGW32_TRUE@am__objects_4 = libpdftex_a-regex.$(OBJEXT) +@MINGW32_TRUE@am__objects_5 = libpdftex_a-regex.$(OBJEXT) am_libpdftex_a_OBJECTS = libpdftex_a-avl.$(OBJEXT) \ libpdftex_a-avlstuff.$(OBJEXT) libpdftex_a-epdf.$(OBJEXT) \ libpdftex_a-mapfile.$(OBJEXT) libpdftex_a-pdftoepdf.$(OBJEXT) \ @@ -358,7 +366,7 @@ am_libpdftex_a_OBJECTS = libpdftex_a-avl.$(OBJEXT) \ libpdftex_a-writejpg.$(OBJEXT) libpdftex_a-writepng.$(OBJEXT) \ libpdftex_a-writet1.$(OBJEXT) libpdftex_a-writet3.$(OBJEXT) \ libpdftex_a-writettf.$(OBJEXT) libpdftex_a-writezip.$(OBJEXT) \ - $(am__objects_4) + $(am__objects_5) libpdftex_a_OBJECTS = $(am_libpdftex_a_OBJECTS) libxetex_a_AR = $(AR) $(ARFLAGS) libxetex_a_LIBADD = @@ -383,10 +391,10 @@ am__libxetex_a_SOURCES_DIST = xetexdir/MathTable.h \ xetexdir/numbers.c xetexdir/numbers.h xetexdir/pdfimage.cpp \ xetexdir/pdfimage.h xetexdir/pngimage.c xetexdir/pngimage.h \ xetexdir/XeTeXGrLayout.cpp xetexdir/XeTeXGrLayout.h -@XETEX_MACOSX_TRUE@am__objects_5 = \ +@XETEX_MACOSX_TRUE@am__objects_6 = \ @XETEX_MACOSX_TRUE@ libxetex_a-XeTeXFontInst_Mac.$(OBJEXT) \ @XETEX_MACOSX_TRUE@ libxetex_a-XeTeX_mac.$(OBJEXT) -@XETEX_MACOSX_FALSE@am__objects_6 = \ +@XETEX_MACOSX_FALSE@am__objects_7 = \ @XETEX_MACOSX_FALSE@ libxetex_a-XeTeXFontMgr_FC.$(OBJEXT) \ @XETEX_MACOSX_FALSE@ libxetex_a-XeTeX_pic.$(OBJEXT) \ @XETEX_MACOSX_FALSE@ libxetex_a-bmpimage.$(OBJEXT) \ @@ -395,7 +403,7 @@ am__libxetex_a_SOURCES_DIST = xetexdir/MathTable.h \ @XETEX_MACOSX_FALSE@ libxetex_a-numbers.$(OBJEXT) \ @XETEX_MACOSX_FALSE@ libxetex_a-pdfimage.$(OBJEXT) \ @XETEX_MACOSX_FALSE@ libxetex_a-pngimage.$(OBJEXT) -@XETEX_GRAPHITE_TRUE@am__objects_7 = \ +@XETEX_GRAPHITE_TRUE@am__objects_8 = \ @XETEX_GRAPHITE_TRUE@ libxetex_a-XeTeXGrLayout.$(OBJEXT) am_libxetex_a_OBJECTS = libxetex_a-FontTableCache.$(OBJEXT) \ libxetex_a-XeTeXFontInst.$(OBJEXT) \ @@ -405,8 +413,8 @@ am_libxetex_a_OBJECTS = libxetex_a-FontTableCache.$(OBJEXT) \ libxetex_a-XeTeXOTLayoutEngine.$(OBJEXT) \ libxetex_a-XeTeXOTMath.$(OBJEXT) \ libxetex_a-XeTeX_ext.$(OBJEXT) libxetex_a-cmaps.$(OBJEXT) \ - libxetex_a-trans.$(OBJEXT) $(am__objects_5) $(am__objects_6) \ - $(am__objects_7) + libxetex_a-trans.$(OBJEXT) $(am__objects_6) $(am__objects_7) \ + $(am__objects_8) libxetex_a_OBJECTS = $(am_libxetex_a_OBJECTS) libxetexmm_a_AR = $(AR) $(ARFLAGS) libxetexmm_a_LIBADD = @@ -434,7 +442,7 @@ am__EXEEXT_4 = $(am__EXEEXT_2) $(am__EXEEXT_3) @TEX_TRUE@am__EXEEXT_6 = tex$(EXEEXT) @MF_TRUE@am__EXEEXT_7 = mf$(EXEEXT) @MFN_TRUE@@MF_TRUE@am__EXEEXT_8 = mf-nowin$(EXEEXT) -@MP_TRUE@am__EXEEXT_9 = mpost$(EXEEXT) newmpost$(EXEEXT) +@MP_TRUE@am__EXEEXT_9 = oldmpost$(EXEEXT) mpost$(EXEEXT) @ETEX_TRUE@am__EXEEXT_10 = etex$(EXEEXT) @PDFTEX_TRUE@am__EXEEXT_11 = pdftex$(EXEEXT) @LUATEX_TRUE@am__EXEEXT_12 = luatex$(EXEEXT) luatangle$(EXEEXT) @@ -447,15 +455,15 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) am_aleph_OBJECTS = aleph-aleph.$(OBJEXT) aleph-alephbis.$(OBJEXT) -am__objects_8 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT) \ +am__objects_9 = aleph-alephini.$(OBJEXT) aleph-aleph0.$(OBJEXT) \ aleph-aleph1.$(OBJEXT) aleph-aleph2.$(OBJEXT) \ aleph-aleph3.$(OBJEXT) -nodist_aleph_OBJECTS = $(am__objects_8) aleph-aleph-pool.$(OBJEXT) \ +nodist_aleph_OBJECTS = $(am__objects_9) aleph-aleph-pool.$(OBJEXT) \ aleph-alephextra.$(OBJEXT) aleph_OBJECTS = $(am_aleph_OBJECTS) $(nodist_aleph_OBJECTS) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(proglib) $(am__DEPENDENCIES_1) -aleph_DEPENDENCIES = $(am__DEPENDENCIES_2) +aleph_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) nodist_bibtex_OBJECTS = bibtex.$(OBJEXT) bibtex_OBJECTS = $(nodist_bibtex_OBJECTS) bibtex_LDADD = $(LDADD) @@ -491,14 +499,15 @@ dvitype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) am__dist_etex_SOURCES_DIST = synctexdir/synctex.h \ synctexdir/synctex-common.h synctexdir/synctex-etex.h dist_etex_OBJECTS = -am__objects_9 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT) \ +am__objects_10 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT) \ etex-etex1.$(OBJEXT) etex-etex2.$(OBJEXT) -@ETEX_SYNCTEX_TRUE@am__objects_10 = etex-synctex-e.$(OBJEXT) -nodist_etex_OBJECTS = $(am__objects_9) etex-etex-pool.$(OBJEXT) \ - etex-etexextra.$(OBJEXT) $(am__objects_10) +@ETEX_SYNCTEX_TRUE@am__objects_11 = etex-synctex-e.$(OBJEXT) +nodist_etex_OBJECTS = $(am__objects_10) etex-etex-pool.$(OBJEXT) \ + etex-etexextra.$(OBJEXT) $(am__objects_11) etex_OBJECTS = $(dist_etex_OBJECTS) $(nodist_etex_OBJECTS) @ETEX_SYNCTEX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) -etex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) +etex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_3) am_gftodvi_OBJECTS = nodist_gftodvi_OBJECTS = gftodvi.$(OBJEXT) gftodvi_OBJECTS = $(am_gftodvi_OBJECTS) $(nodist_gftodvi_OBJECTS) @@ -516,8 +525,8 @@ nodist_luatangle_OBJECTS = luatangle.$(OBJEXT) luatangle_OBJECTS = $(nodist_luatangle_OBJECTS) luatangle_LDADD = $(LDADD) luatangle_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) -am__objects_11 = luatex-luatexini.$(OBJEXT) luatex-luatex0.$(OBJEXT) -nodist_luatex_OBJECTS = $(am__objects_11) luatex-luatex-pool.$(OBJEXT) \ +am__objects_12 = luatex-luatexini.$(OBJEXT) luatex-luatex0.$(OBJEXT) +nodist_luatex_OBJECTS = $(am__objects_12) luatex-luatex-pool.$(OBJEXT) \ luatex-luatexextra.$(OBJEXT) luatex_OBJECTS = $(nodist_luatex_OBJECTS) am__DEPENDENCIES_4 = libluatex.a libff.a libluamisc.a libzzip.a \ @@ -542,15 +551,9 @@ nodist_mft_OBJECTS = mft.$(OBJEXT) mft_OBJECTS = $(nodist_mft_OBJECTS) mft_LDADD = $(LDADD) mft_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) -am__objects_12 = mpost-mpini.$(OBJEXT) mpost-mp0.$(OBJEXT) \ - mpost-mp1.$(OBJEXT) mpost-mp2.$(OBJEXT) -nodist_mpost_OBJECTS = $(am__objects_12) mpost-mp-pool.$(OBJEXT) \ - mpost-mpextra.$(OBJEXT) +am__objects_13 = mpost-mpxout.$(OBJEXT) +nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_13) mpost_OBJECTS = $(nodist_mpost_OBJECTS) -mpost_DEPENDENCIES = libmpost.a $(am__DEPENDENCIES_2) -am__objects_13 = newmpost-mpost.$(OBJEXT) newmpost-mpxout.$(OBJEXT) -nodist_newmpost_OBJECTS = $(am__objects_13) -newmpost_OBJECTS = $(nodist_newmpost_OBJECTS) nodist_odvicopy_OBJECTS = odvicopy.$(OBJEXT) odvicopy_OBJECTS = $(nodist_odvicopy_OBJECTS) odvicopy_LDADD = $(LDADD) @@ -563,6 +566,12 @@ nodist_ofm2opl_OBJECTS = ofm2opl.$(OBJEXT) ofm2opl_OBJECTS = $(nodist_ofm2opl_OBJECTS) ofm2opl_LDADD = $(LDADD) ofm2opl_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) +am__objects_14 = oldmpost-mpini.$(OBJEXT) oldmpost-mp0.$(OBJEXT) \ + oldmpost-mp1.$(OBJEXT) oldmpost-mp2.$(OBJEXT) +nodist_oldmpost_OBJECTS = $(am__objects_14) oldmpost-mp-pool.$(OBJEXT) \ + oldmpost-mpextra.$(OBJEXT) +oldmpost_OBJECTS = $(nodist_oldmpost_OBJECTS) +oldmpost_DEPENDENCIES = liboldmpost.a $(am__DEPENDENCIES_2) nodist_opl2ofm_OBJECTS = opl2ofm.$(OBJEXT) opl2ofm_OBJECTS = $(nodist_opl2ofm_OBJECTS) opl2ofm_LDADD = $(LDADD) @@ -586,12 +595,12 @@ patgen_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) am__dist_pdftex_SOURCES_DIST = synctexdir/synctex.h \ synctexdir/synctex-common.h synctexdir/synctex-pdftex.h dist_pdftex_OBJECTS = -am__objects_14 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT) \ +am__objects_15 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT) \ pdftex-pdftex1.$(OBJEXT) pdftex-pdftex2.$(OBJEXT) \ pdftex-pdftex3.$(OBJEXT) -@PDFTEX_SYNCTEX_TRUE@am__objects_15 = pdftex-synctex-pdf.$(OBJEXT) -nodist_pdftex_OBJECTS = $(am__objects_14) pdftex-pdftex-pool.$(OBJEXT) \ - pdftex-pdftexextra.$(OBJEXT) $(am__objects_15) +@PDFTEX_SYNCTEX_TRUE@am__objects_16 = pdftex-synctex-pdf.$(OBJEXT) +nodist_pdftex_OBJECTS = $(am__objects_15) pdftex-pdftex-pool.$(OBJEXT) \ + pdftex-pdftexextra.$(OBJEXT) $(am__objects_16) pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS) am__DEPENDENCIES_6 = libpdftex.a $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @@ -628,14 +637,15 @@ tangleboot_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) am__dist_tex_SOURCES_DIST = synctexdir/synctex.h \ synctexdir/synctex-common.h synctexdir/synctex-tex.h dist_tex_OBJECTS = -am__objects_16 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT) \ +am__objects_17 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT) \ tex-tex1.$(OBJEXT) tex-tex2.$(OBJEXT) -@TEX_SYNCTEX_TRUE@am__objects_17 = tex-synctex.$(OBJEXT) -nodist_tex_OBJECTS = $(am__objects_16) tex-tex-pool.$(OBJEXT) \ - tex-texextra.$(OBJEXT) $(am__objects_17) +@TEX_SYNCTEX_TRUE@am__objects_18 = tex-synctex.$(OBJEXT) +nodist_tex_OBJECTS = $(am__objects_17) tex-tex-pool.$(OBJEXT) \ + tex-texextra.$(OBJEXT) $(am__objects_18) tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS) @TEX_SYNCTEX_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) -tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_7) +tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_7) nodist_tftopl_OBJECTS = tftopl.$(OBJEXT) tftopl_OBJECTS = $(nodist_tftopl_OBJECTS) tftopl_LDADD = $(LDADD) @@ -660,11 +670,15 @@ nodist_weave_OBJECTS = weave.$(OBJEXT) weave_OBJECTS = $(nodist_weave_OBJECTS) weave_LDADD = $(LDADD) weave_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1) -am__objects_18 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT) \ +am__dist_xetex_SOURCES_DIST = synctexdir/synctex.h \ + synctexdir/synctex-common.h synctexdir/synctex-xetex.h +dist_xetex_OBJECTS = +am__objects_19 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT) \ xetex-xetex1.$(OBJEXT) xetex-xetex2.$(OBJEXT) -nodist_xetex_OBJECTS = $(am__objects_18) xetex-xetex_pool.$(OBJEXT) \ - xetex-xetexextra.$(OBJEXT) -xetex_OBJECTS = $(nodist_xetex_OBJECTS) +@XETEX_SYNCTEX_TRUE@am__objects_20 = xetex-synctex-xe.$(OBJEXT) +nodist_xetex_OBJECTS = $(am__objects_19) xetex-xetex_pool.$(OBJEXT) \ + xetex-xetexextra.$(OBJEXT) $(am__objects_20) +xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS) @XETEX_MACOSX_FALSE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) \ @XETEX_MACOSX_FALSE@ $(am__DEPENDENCIES_1) \ @XETEX_MACOSX_FALSE@ $(am__DEPENDENCIES_1) @@ -701,7 +715,7 @@ SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \ $(libluasocket_a_SOURCES) $(libluatex_a_SOURCES) \ $(EXTRA_libluatex_a_SOURCES) $(libmd5_a_SOURCES) \ $(nodist_libmf_a_SOURCES) $(libmplib_a_SOURCES) \ - $(nodist_libmplib_a_SOURCES) $(libmpost_a_SOURCES) \ + $(nodist_libmplib_a_SOURCES) $(liboldmpost_a_SOURCES) \ $(libpdftex_a_SOURCES) $(EXTRA_libpdftex_a_SOURCES) \ $(libxetex_a_SOURCES) $(libxetexmm_a_SOURCES) \ $(libzzip_a_SOURCES) $(aleph_SOURCES) $(nodist_aleph_SOURCES) \ @@ -715,9 +729,9 @@ SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \ $(nodist_luatex_SOURCES) $(nodist_EXTRA_luatex_SOURCES) \ $(md5main_SOURCES) $(nodist_mf_SOURCES) \ $(nodist_mf_nowin_SOURCES) $(nodist_mft_SOURCES) \ - $(nodist_mpost_SOURCES) $(nodist_newmpost_SOURCES) \ - $(nodist_odvicopy_SOURCES) $(nodist_odvitype_SOURCES) \ - $(nodist_ofm2opl_SOURCES) $(nodist_opl2ofm_SOURCES) \ + $(nodist_mpost_SOURCES) $(nodist_odvicopy_SOURCES) \ + $(nodist_odvitype_SOURCES) $(nodist_ofm2opl_SOURCES) \ + $(nodist_oldmpost_SOURCES) $(nodist_opl2ofm_SOURCES) \ $(nodist_otangle_SOURCES) $(nodist_ovf2ovp_SOURCES) \ $(nodist_ovp2ovf_SOURCES) $(nodist_patgen_SOURCES) \ $(dist_pdftex_SOURCES) $(nodist_pdftex_SOURCES) \ @@ -730,13 +744,13 @@ SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \ $(nodist_tftopl_SOURCES) $(nodist_tie_SOURCES) \ $(ttf2afm_SOURCES) $(EXTRA_ttf2afm_SOURCES) \ $(nodist_vftovp_SOURCES) $(nodist_vptovf_SOURCES) \ - $(nodist_weave_SOURCES) $(nodist_xetex_SOURCES) \ - $(nodist_EXTRA_xetex_SOURCES) + $(nodist_weave_SOURCES) $(dist_xetex_SOURCES) \ + $(nodist_xetex_SOURCES) $(nodist_EXTRA_xetex_SOURCES) DIST_SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \ $(libluamisc_a_SOURCES) $(EXTRA_libluamisc_a_SOURCES) \ $(libluasocket_a_SOURCES) $(libluatex_a_SOURCES) \ $(EXTRA_libluatex_a_SOURCES) $(libmd5_a_SOURCES) \ - $(libmplib_a_SOURCES) $(libmpost_a_SOURCES) \ + $(libmplib_a_SOURCES) $(liboldmpost_a_SOURCES) \ $(am__libpdftex_a_SOURCES_DIST) $(EXTRA_libpdftex_a_SOURCES) \ $(am__libxetex_a_SOURCES_DIST) $(libxetexmm_a_SOURCES) \ $(libzzip_a_SOURCES) $(aleph_SOURCES) \ @@ -744,7 +758,7 @@ DIST_SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \ $(md5main_SOURCES) $(am__dist_pdftex_SOURCES_DIST) \ $(pdftosrc_SOURCES) $(synctex_SOURCES) \ $(am__dist_tex_SOURCES_DIST) $(ttf2afm_SOURCES) \ - $(EXTRA_ttf2afm_SOURCES) + $(EXTRA_ttf2afm_SOURCES) $(am__dist_xetex_SOURCES_DIST) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -956,9 +970,9 @@ dist_check_SCRIPTS = tangle.test luatexdir/luatangle.test \ omegaware/otangle.test libmd5/md5.test TESTS = tangle.test tiedir/tie.test $(am__append_11) $(am__append_27) \ libmd5/md5.test -EXTRA_LIBRARIES = libmf.a libmpost.a libmplib.a libpdftex.a liblua51.a \ - libzzip.a libluasocket.a libluamisc.a libff.a libluatex.a \ - libxetex.a libxetexmm.a libmd5.a +EXTRA_LIBRARIES = libmf.a liboldmpost.a libmplib.a libpdftex.a \ + liblua51.a libzzip.a libluasocket.a libluamisc.a libff.a \ + libluatex.a libxetex.a libxetexmm.a libmd5.a EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \ tangle.ch tangleboot.p cwebdir ctangleboot.c cwebboot.c \ $(web_programs:=.web) $(web_programs:=.ch) ctiedir tiedir \ @@ -967,7 +981,7 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \ tmf-pool.h mf.web mf-binpool.ch mf.ch mftalk.h lib/texmfmp.c \ tmf-pool.h mp.web mp.ch lib/texmfmp.c mpdir/mp.defines \ mpdir/mplib.h metapost.mk mpdir/Makefile.in.orig \ - mpdir/mpostlib.mk $(newmpost_web) $(libmplib_web) \ + mpdir/mpostlib.mk $(mpost_web) $(libmplib_web) \ mplibdir/lmplib.c $(etex_web_srcs) $(etex_ch_srcs) \ etexdir/etexextra.in lib/texmfmp.c tmf-pool.h \ etexdir/ChangeLog etexdir/INSTALL etexdir/README \ @@ -1123,8 +1137,8 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \ synctexdir/synctex-e-rec.ch0 synctexdir/synctex-e-rec.ch1 \ synctexdir/synctex-pdf-rec.ch2 synctexdir/synctex-xe-mem.ch2 \ synctexdir/synctex-xe-rec.ch2 synctexdir/synctex-xe-rec.ch3 \ - synctexdir/synctex-xetex.h synctexdir/synctex.mk fmtutil.in \ - Makefile.in.orig configure.in.orig + synctexdir/synctex.mk fmtutil.in Makefile.in.orig \ + configure.in.orig DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \ tangle-web2c stamp-tangle tangleboot.c tangleboot.h ctangle.c \ cweb.c stamp-ctangle cftest.p $(web_programs:=.c) \ @@ -1133,10 +1147,11 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \ tie.outm $(nodist_tex_SOURCES) tex-final.ch tex-web2c tex.p \ tex.pool tex-tangle $(nodist_libmf_a_SOURCES) mfextra.c \ mf-final.ch mf-web2c mf.p mf.pool mf-tangle \ - $(nodist_mpost_SOURCES) mp-web2c mp.p mp.pool mp-tangle \ - $(newmpost_c_h) mpost-ctangle $(libmplib_c_h) mplib-ctangle \ - $(nodist_etex_SOURCES) etex.web etex.ch etex-web2c etex.p \ - etex.pool etex-tangle etexdir/etex.version \ + $(nodist_oldmpost_SOURCES) mp-web2c mp.p mp.pool mp-tangle \ + $(nodist_mpost_SOURCES) mpxout-ctangle \ + $(nodist_libmplib_a_SOURCES) mp-ctangle psout-ctangle \ + svgout-ctangle $(nodist_etex_SOURCES) etex.web etex.ch \ + etex-web2c etex.p etex.pool etex-tangle etexdir/etex.version \ $(nodist_pdftex_SOURCES) pdftex.ch pdftex-web2c pdftex.p \ pdftex.pool pdftex-tangle pdftexdir/pdftex.version \ $(nodist_luatex_SOURCES) luatex-web2c luatex.p luatex.pool \ @@ -1194,7 +1209,7 @@ nodist_ctie_SOURCES = ctie.c nodist_cweave_SOURCES = cweave.c cweb.c nodist_tie_SOURCES = tie.c tex_CPPFLAGS = $(am__append_29) -tex_LDADD = $(LDADD) $(socketlibs) $(am__append_30) +tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_30) tex_c_h = texini.c tex0.c tex1.c tex2.c texcoerce.h texd.h nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_31) tex_ch_srcs = \ @@ -1214,12 +1229,12 @@ mf_x_libs = $(X_LIBS) $(x_tool_libs) $(X_PRE_LIBS) $(x_ext_lib) $(wlibs) $(X_EXT mf_c_h = mfini.c mf0.c mf1.c mfcoerce.h mfd.h nodist_libmf_a_SOURCES = $(mf_c_h) mf-pool.c libmf_a_CPPFLAGS = -DMETA_FONT -mpost_CPPFLAGS = -I$(srcdir)/mpdir -mpost_LDADD = libmpost.a $(LDADD) -mpost_c_h = mpini.c mp0.c mp1.c mp2.c mpcoerce.h mpd.h -nodist_mpost_SOURCES = $(mpost_c_h) mp-pool.c mpextra.c -libmpost_a_CPPFLAGS = -I$(srcdir)/mpdir -libmpost_a_SOURCES = \ +oldmpost_CPPFLAGS = -I$(srcdir)/mpdir +oldmpost_LDADD = liboldmpost.a $(LDADD) +oldmpost_c_h = mpini.c mp0.c mp1.c mp2.c mpcoerce.h mpd.h +nodist_oldmpost_SOURCES = $(oldmpost_c_h) mp-pool.c mpextra.c +liboldmpost_a_CPPFLAGS = -I$(srcdir)/mpdir +liboldmpost_a_SOURCES = \ mpdir/avl.c \ mpdir/avl.h \ mpdir/avlstuff.c \ @@ -1232,22 +1247,24 @@ libmpost_a_SOURCES = \ mpdir/writefont.c \ mpdir/writet1.c -newmpost_c_h = mpost.c mpxout.c mpxout.h -newmpost_web = mplibdir/mpost.w mplibdir/mpxout.w -newmpost_CPPFLAGS = -I$(srcdir)/mplibdir -newmpost_DEPENDENCIES = libmplib.a -newmpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm -nodist_newmpost_SOURCES = $(newmpost_c_h) -libmplib_c_h = mp.c mplib.h mpmp.h mppsout.h psout.c mplibps.h \ - mplibsvg.h mpsvgout.h svgout.c memio.c tfmin.c -libmplib_true_c = mplibdir/avl.h mplibdir/avl.c -libmplib_web = $(libmplib_true_c) mplibdir/mp.w mplibdir/psout.w \ - mplibdir/svgout.w mplibdir/memio.w mplibdir/tfmin.w +mp_ctangle = CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) +mpost_CPPFLAGS = -I$(srcdir)/mplibdir +mpost_DEPENDENCIES = libmplib.a +mpost_LDADD = libmplib.a $(KPATHSEA_LIBS) -lm +nodist_mpost_SOURCES = mpost.c $(mpxout_c_h) +mpxout_c_h = mpxout.c mpxout.h +mpost_web = mplibdir/mpost.w mplibdir/mpxout.w libmplib_a_CPPFLAGS = -I$(srcdir)/mplibdir -nodist_libmplib_a_SOURCES = $(libmplib_c_h) -libmplib_a_SOURCES = $(libmplib_true_c) +libmplib_a_SOURCES = mplibdir/avl.h mplibdir/avl.c +nodist_libmplib_a_SOURCES = memio.c tfmin.c $(mp_c_h) $(psout_c_h) \ + $(svgout_c_h) +mp_c_h = mp.c mplib.h mpmp.h +psout_c_h = mppsout.h psout.c mplibps.h +svgout_c_h = mplibsvg.h mpsvgout.h svgout.c +libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \ + mplibdir/memio.w mplibdir/tfmin.w etex_CPPFLAGS = $(am__append_32) -etex_LDADD = $(LDADD) $(socketlibs) $(am__append_33) +etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_33) etex_c_h = etexini.c etex0.c etex1.c etex2.c etexcoerce.h etexd.h nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexextra.c \ etexdir/etexextra.h $(am__append_34) @@ -1321,7 +1338,8 @@ luatex_ldadd = libluatex.a libff.a libluamisc.a libzzip.a \ $(XPDF_LIBS) $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a luatex_LDADD = $(luatex_ldadd) $(LDADD) $(socketlibs) luatex_DEPENDENCIES = $(proglib) libluatex.a $(LIBPNG_DEPEND) \ - $(ZLIB_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libmd5.a + $(ZLIB_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT_DEPEND) libmd5.a \ + libmplib.a luatex_c_h = luatexini.c luatex0.c luatexcoerce.h luatexd.h nodist_luatex_SOURCES = $(luatex_c_h) luatex-pool.c luatexextra.c luatexdir/luatexextra.h luatex_sources = luatexdir/luatex.web luatexdir/luatex.ch @@ -1714,11 +1732,12 @@ xetex_dependencies = $(proglib) $(ICU_DEPEND) $(TECKIT_DEPEND) \ $(am__append_18) $(am__append_21) $(FREETYPE2_DEPEND) \ $(ZLIB_DEPEND) @XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime -xetex_CPPFLAGS = $(xetex_cppflags) +xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_37) xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs) xetex_DEPENDENCIES = $(xetex_dependencies) $(libxetex) xetex_c_h = xetexini.c xetex0.c xetex1.c xetex2.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 xetexextra.c \ + xetexdir/xetexextra.h $(am__append_38) xetex_web_srcs = \ tex.web \ etexdir/etex.ch \ @@ -1768,7 +1787,7 @@ nodist_ovf2ovp_SOURCES = ovf2ovp.c ovf2ovp.h ovf2ovp_sources = omegaware/ovf2ovp.web omegaware/ovf2ovp.ch nodist_ovp2ovf_SOURCES = ovp2ovf.c ovp2ovf.h ovp2ovf_sources = omegaware/ovp2ovf.web omegaware/ovp2ovf.ch -aleph_LDADD = $(LDADD) $(socketlibs) +aleph_LDADD = $(LDADD) $(ipc_socketlibs) aleph_CPPFLAGS = -I$(srcdir)/alephdir $(AM_CPPFLAGS) aleph_c_h = alephini.c aleph0.c aleph1.c aleph2.c aleph3.c alephcoerce.h alephd.h nodist_aleph_SOURCES = $(aleph_c_h) aleph-pool.c alephextra.c @@ -1877,6 +1896,25 @@ synctex_DEPENDENCIES = $(ZLIB_DEPEND) @PDFTEX_SYNCTEX_FALSE@synctex_convert_pdftex = && echo "warning: SyncTeX for pdfTeX is NOT enabled" @PDFTEX_SYNCTEX_TRUE@synctex_convert_pdftex = && $(SHELL) $(srcdir)/synctexdir/synctex-convert.sh pdftex +@XETEX_SYNCTEX_TRUE@xetex_ch_synctex = \ +@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \ +@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch0 \ +@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch1 \ +@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xe-mem.ch2 \ +@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \ +@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch0 \ +@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xe-rec.ch2 + +@XETEX_SYNCTEX_TRUE@xetex_post_ch_synctex = \ +@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xe-rec.ch3 + +@XETEX_SYNCTEX_TRUE@dist_xetex_SOURCES = \ +@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \ +@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \ +@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xetex.h + +@XETEX_SYNCTEX_FALSE@synctex_convert_xetex = && echo "warning: SyncTeX for e-TeX is NOT enabled" +@XETEX_SYNCTEX_TRUE@synctex_convert_xetex = && $(SHELL) $(srcdir)/synctexdir/synctex-convert.sh xetex libmd5_a_CPPFLAGS = -I$(srcdir)/libmd5 libmd5_a_SOURCES = libmd5/md5.c libmd5/md5.h md5main_CPPFLAGS = -I$(srcdir)/libmd5 @@ -1889,7 +1927,7 @@ all: c-auto.h ff-config.h .SUFFIXES: .c .cc .cpp .cxx .lo .o .obj am--refresh: @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mpdir/am/mp.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luatangle.am $(srcdir)/luatexdir/am/liblua51.am $(srcdir)/luatexdir/am/libzzip.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mpdir/am/mp.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luatangle.am $(srcdir)/luatexdir/am/liblua51.am $(srcdir)/luatexdir/am/libzzip.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1978,10 +2016,10 @@ libmplib.a: $(libmplib_a_OBJECTS) $(libmplib_a_DEPENDENCIES) -rm -f libmplib.a $(libmplib_a_AR) libmplib.a $(libmplib_a_OBJECTS) $(libmplib_a_LIBADD) $(RANLIB) libmplib.a -libmpost.a: $(libmpost_a_OBJECTS) $(libmpost_a_DEPENDENCIES) - -rm -f libmpost.a - $(libmpost_a_AR) libmpost.a $(libmpost_a_OBJECTS) $(libmpost_a_LIBADD) - $(RANLIB) libmpost.a +liboldmpost.a: $(liboldmpost_a_OBJECTS) $(liboldmpost_a_DEPENDENCIES) + -rm -f liboldmpost.a + $(liboldmpost_a_AR) liboldmpost.a $(liboldmpost_a_OBJECTS) $(liboldmpost_a_LIBADD) + $(RANLIB) liboldmpost.a libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) -rm -f libpdftex.a $(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD) @@ -2100,9 +2138,6 @@ mft$(EXEEXT): $(mft_OBJECTS) $(mft_DEPENDENCIES) mpost$(EXEEXT): $(mpost_OBJECTS) $(mpost_DEPENDENCIES) @rm -f mpost$(EXEEXT) $(LINK) $(mpost_OBJECTS) $(mpost_LDADD) $(LIBS) -newmpost$(EXEEXT): $(newmpost_OBJECTS) $(newmpost_DEPENDENCIES) - @rm -f newmpost$(EXEEXT) - $(LINK) $(newmpost_OBJECTS) $(newmpost_LDADD) $(LIBS) odvicopy$(EXEEXT): $(odvicopy_OBJECTS) $(odvicopy_DEPENDENCIES) @rm -f odvicopy$(EXEEXT) $(LINK) $(odvicopy_OBJECTS) $(odvicopy_LDADD) $(LIBS) @@ -2112,6 +2147,9 @@ odvitype$(EXEEXT): $(odvitype_OBJECTS) $(odvitype_DEPENDENCIES) ofm2opl$(EXEEXT): $(ofm2opl_OBJECTS) $(ofm2opl_DEPENDENCIES) @rm -f ofm2opl$(EXEEXT) $(LINK) $(ofm2opl_OBJECTS) $(ofm2opl_LDADD) $(LIBS) +oldmpost$(EXEEXT): $(oldmpost_OBJECTS) $(oldmpost_DEPENDENCIES) + @rm -f oldmpost$(EXEEXT) + $(LINK) $(oldmpost_OBJECTS) $(oldmpost_LDADD) $(LIBS) opl2ofm$(EXEEXT): $(opl2ofm_OBJECTS) $(opl2ofm_DEPENDENCIES) @rm -f opl2ofm$(EXEEXT) $(LINK) $(opl2ofm_OBJECTS) $(opl2ofm_LDADD) $(LIBS) @@ -2413,14 +2451,14 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmplib_a-psout.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmplib_a-svgout.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmplib_a-tfmin.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpost_a-avl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpost_a-avlstuff.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpost_a-mapfile.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpost_a-turningnumber.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpost_a-utils.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpost_a-writeenc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpost_a-writefont.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmpost_a-writet1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboldmpost_a-avl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboldmpost_a-avlstuff.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboldmpost_a-mapfile.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboldmpost_a-turningnumber.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboldmpost_a-utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboldmpost_a-writeenc.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboldmpost_a-writefont.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liboldmpost_a-writet1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpdftex_a-avl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpdftex_a-avlstuff.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpdftex_a-epdf.Po@am__quote@ @@ -2489,17 +2527,17 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mf-mfextra.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mf_nowin-mfextra.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mft.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpost-mp-pool.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpost-mp0.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpost-mp1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpost-mp2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpost-mpextra.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpost-mpini.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newmpost-mpost.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/newmpost-mpxout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpost-mpost.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpost-mpxout.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/odvicopy.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/odvitype.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ofm2opl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oldmpost-mp-pool.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oldmpost-mp0.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oldmpost-mp1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oldmpost-mp2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oldmpost-mpextra.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oldmpost-mpini.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opl2ofm.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/otangle.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ovf2ovp.Po@am__quote@ @@ -2539,6 +2577,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vptovf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/weave.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-dummy.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-synctex-xe.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-xetex0.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-xetex1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xetex-xetex2.Po@am__quote@ @@ -5269,6 +5308,34 @@ libmplib_a-avl.obj: mplibdir/avl.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-avl.obj `if test -f 'mplibdir/avl.c'; then $(CYGPATH_W) 'mplibdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/mplibdir/avl.c'; fi` +libmplib_a-memio.o: memio.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-memio.o -MD -MP -MF $(DEPDIR)/libmplib_a-memio.Tpo -c -o libmplib_a-memio.o `test -f 'memio.c' || echo '$(srcdir)/'`memio.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmplib_a-memio.Tpo $(DEPDIR)/libmplib_a-memio.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='memio.c' object='libmplib_a-memio.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-memio.o `test -f 'memio.c' || echo '$(srcdir)/'`memio.c + +libmplib_a-memio.obj: memio.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-memio.obj -MD -MP -MF $(DEPDIR)/libmplib_a-memio.Tpo -c -o libmplib_a-memio.obj `if test -f 'memio.c'; then $(CYGPATH_W) 'memio.c'; else $(CYGPATH_W) '$(srcdir)/memio.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmplib_a-memio.Tpo $(DEPDIR)/libmplib_a-memio.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='memio.c' object='libmplib_a-memio.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-memio.obj `if test -f 'memio.c'; then $(CYGPATH_W) 'memio.c'; else $(CYGPATH_W) '$(srcdir)/memio.c'; fi` + +libmplib_a-tfmin.o: tfmin.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-tfmin.o -MD -MP -MF $(DEPDIR)/libmplib_a-tfmin.Tpo -c -o libmplib_a-tfmin.o `test -f 'tfmin.c' || echo '$(srcdir)/'`tfmin.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmplib_a-tfmin.Tpo $(DEPDIR)/libmplib_a-tfmin.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tfmin.c' object='libmplib_a-tfmin.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-tfmin.o `test -f 'tfmin.c' || echo '$(srcdir)/'`tfmin.c + +libmplib_a-tfmin.obj: tfmin.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-tfmin.obj -MD -MP -MF $(DEPDIR)/libmplib_a-tfmin.Tpo -c -o libmplib_a-tfmin.obj `if test -f 'tfmin.c'; then $(CYGPATH_W) 'tfmin.c'; else $(CYGPATH_W) '$(srcdir)/tfmin.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmplib_a-tfmin.Tpo $(DEPDIR)/libmplib_a-tfmin.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tfmin.c' object='libmplib_a-tfmin.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-tfmin.obj `if test -f 'tfmin.c'; then $(CYGPATH_W) 'tfmin.c'; else $(CYGPATH_W) '$(srcdir)/tfmin.c'; fi` + libmplib_a-mp.o: mp.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-mp.o -MD -MP -MF $(DEPDIR)/libmplib_a-mp.Tpo -c -o libmplib_a-mp.o `test -f 'mp.c' || echo '$(srcdir)/'`mp.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmplib_a-mp.Tpo $(DEPDIR)/libmplib_a-mp.Po @@ -5311,145 +5378,117 @@ libmplib_a-svgout.obj: svgout.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-svgout.obj `if test -f 'svgout.c'; then $(CYGPATH_W) 'svgout.c'; else $(CYGPATH_W) '$(srcdir)/svgout.c'; fi` -libmplib_a-memio.o: memio.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-memio.o -MD -MP -MF $(DEPDIR)/libmplib_a-memio.Tpo -c -o libmplib_a-memio.o `test -f 'memio.c' || echo '$(srcdir)/'`memio.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmplib_a-memio.Tpo $(DEPDIR)/libmplib_a-memio.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='memio.c' object='libmplib_a-memio.o' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-avl.o: mpdir/avl.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-avl.o -MD -MP -MF $(DEPDIR)/liboldmpost_a-avl.Tpo -c -o liboldmpost_a-avl.o `test -f 'mpdir/avl.c' || echo '$(srcdir)/'`mpdir/avl.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-avl.Tpo $(DEPDIR)/liboldmpost_a-avl.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/avl.c' object='liboldmpost_a-avl.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-memio.o `test -f 'memio.c' || echo '$(srcdir)/'`memio.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-avl.o `test -f 'mpdir/avl.c' || echo '$(srcdir)/'`mpdir/avl.c -libmplib_a-memio.obj: memio.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-memio.obj -MD -MP -MF $(DEPDIR)/libmplib_a-memio.Tpo -c -o libmplib_a-memio.obj `if test -f 'memio.c'; then $(CYGPATH_W) 'memio.c'; else $(CYGPATH_W) '$(srcdir)/memio.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmplib_a-memio.Tpo $(DEPDIR)/libmplib_a-memio.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='memio.c' object='libmplib_a-memio.obj' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-avl.obj: mpdir/avl.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-avl.obj -MD -MP -MF $(DEPDIR)/liboldmpost_a-avl.Tpo -c -o liboldmpost_a-avl.obj `if test -f 'mpdir/avl.c'; then $(CYGPATH_W) 'mpdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/avl.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-avl.Tpo $(DEPDIR)/liboldmpost_a-avl.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/avl.c' object='liboldmpost_a-avl.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-memio.obj `if test -f 'memio.c'; then $(CYGPATH_W) 'memio.c'; else $(CYGPATH_W) '$(srcdir)/memio.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-avl.obj `if test -f 'mpdir/avl.c'; then $(CYGPATH_W) 'mpdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/avl.c'; fi` -libmplib_a-tfmin.o: tfmin.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-tfmin.o -MD -MP -MF $(DEPDIR)/libmplib_a-tfmin.Tpo -c -o libmplib_a-tfmin.o `test -f 'tfmin.c' || echo '$(srcdir)/'`tfmin.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmplib_a-tfmin.Tpo $(DEPDIR)/libmplib_a-tfmin.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tfmin.c' object='libmplib_a-tfmin.o' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-avlstuff.o: mpdir/avlstuff.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-avlstuff.o -MD -MP -MF $(DEPDIR)/liboldmpost_a-avlstuff.Tpo -c -o liboldmpost_a-avlstuff.o `test -f 'mpdir/avlstuff.c' || echo '$(srcdir)/'`mpdir/avlstuff.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-avlstuff.Tpo $(DEPDIR)/liboldmpost_a-avlstuff.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/avlstuff.c' object='liboldmpost_a-avlstuff.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-tfmin.o `test -f 'tfmin.c' || echo '$(srcdir)/'`tfmin.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-avlstuff.o `test -f 'mpdir/avlstuff.c' || echo '$(srcdir)/'`mpdir/avlstuff.c -libmplib_a-tfmin.obj: tfmin.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmplib_a-tfmin.obj -MD -MP -MF $(DEPDIR)/libmplib_a-tfmin.Tpo -c -o libmplib_a-tfmin.obj `if test -f 'tfmin.c'; then $(CYGPATH_W) 'tfmin.c'; else $(CYGPATH_W) '$(srcdir)/tfmin.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmplib_a-tfmin.Tpo $(DEPDIR)/libmplib_a-tfmin.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tfmin.c' object='libmplib_a-tfmin.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmplib_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmplib_a-tfmin.obj `if test -f 'tfmin.c'; then $(CYGPATH_W) 'tfmin.c'; else $(CYGPATH_W) '$(srcdir)/tfmin.c'; fi` - -libmpost_a-avl.o: mpdir/avl.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-avl.o -MD -MP -MF $(DEPDIR)/libmpost_a-avl.Tpo -c -o libmpost_a-avl.o `test -f 'mpdir/avl.c' || echo '$(srcdir)/'`mpdir/avl.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-avl.Tpo $(DEPDIR)/libmpost_a-avl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/avl.c' object='libmpost_a-avl.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-avl.o `test -f 'mpdir/avl.c' || echo '$(srcdir)/'`mpdir/avl.c - -libmpost_a-avl.obj: mpdir/avl.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-avl.obj -MD -MP -MF $(DEPDIR)/libmpost_a-avl.Tpo -c -o libmpost_a-avl.obj `if test -f 'mpdir/avl.c'; then $(CYGPATH_W) 'mpdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/avl.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-avl.Tpo $(DEPDIR)/libmpost_a-avl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/avl.c' object='libmpost_a-avl.obj' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-avlstuff.obj: mpdir/avlstuff.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-avlstuff.obj -MD -MP -MF $(DEPDIR)/liboldmpost_a-avlstuff.Tpo -c -o liboldmpost_a-avlstuff.obj `if test -f 'mpdir/avlstuff.c'; then $(CYGPATH_W) 'mpdir/avlstuff.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/avlstuff.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-avlstuff.Tpo $(DEPDIR)/liboldmpost_a-avlstuff.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/avlstuff.c' object='liboldmpost_a-avlstuff.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-avl.obj `if test -f 'mpdir/avl.c'; then $(CYGPATH_W) 'mpdir/avl.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/avl.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-avlstuff.obj `if test -f 'mpdir/avlstuff.c'; then $(CYGPATH_W) 'mpdir/avlstuff.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/avlstuff.c'; fi` -libmpost_a-avlstuff.o: mpdir/avlstuff.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-avlstuff.o -MD -MP -MF $(DEPDIR)/libmpost_a-avlstuff.Tpo -c -o libmpost_a-avlstuff.o `test -f 'mpdir/avlstuff.c' || echo '$(srcdir)/'`mpdir/avlstuff.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-avlstuff.Tpo $(DEPDIR)/libmpost_a-avlstuff.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/avlstuff.c' object='libmpost_a-avlstuff.o' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-mapfile.o: mpdir/mapfile.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-mapfile.o -MD -MP -MF $(DEPDIR)/liboldmpost_a-mapfile.Tpo -c -o liboldmpost_a-mapfile.o `test -f 'mpdir/mapfile.c' || echo '$(srcdir)/'`mpdir/mapfile.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-mapfile.Tpo $(DEPDIR)/liboldmpost_a-mapfile.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/mapfile.c' object='liboldmpost_a-mapfile.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-avlstuff.o `test -f 'mpdir/avlstuff.c' || echo '$(srcdir)/'`mpdir/avlstuff.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-mapfile.o `test -f 'mpdir/mapfile.c' || echo '$(srcdir)/'`mpdir/mapfile.c -libmpost_a-avlstuff.obj: mpdir/avlstuff.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-avlstuff.obj -MD -MP -MF $(DEPDIR)/libmpost_a-avlstuff.Tpo -c -o libmpost_a-avlstuff.obj `if test -f 'mpdir/avlstuff.c'; then $(CYGPATH_W) 'mpdir/avlstuff.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/avlstuff.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-avlstuff.Tpo $(DEPDIR)/libmpost_a-avlstuff.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/avlstuff.c' object='libmpost_a-avlstuff.obj' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-mapfile.obj: mpdir/mapfile.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-mapfile.obj -MD -MP -MF $(DEPDIR)/liboldmpost_a-mapfile.Tpo -c -o liboldmpost_a-mapfile.obj `if test -f 'mpdir/mapfile.c'; then $(CYGPATH_W) 'mpdir/mapfile.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/mapfile.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-mapfile.Tpo $(DEPDIR)/liboldmpost_a-mapfile.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/mapfile.c' object='liboldmpost_a-mapfile.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-avlstuff.obj `if test -f 'mpdir/avlstuff.c'; then $(CYGPATH_W) 'mpdir/avlstuff.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/avlstuff.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-mapfile.obj `if test -f 'mpdir/mapfile.c'; then $(CYGPATH_W) 'mpdir/mapfile.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/mapfile.c'; fi` -libmpost_a-mapfile.o: mpdir/mapfile.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-mapfile.o -MD -MP -MF $(DEPDIR)/libmpost_a-mapfile.Tpo -c -o libmpost_a-mapfile.o `test -f 'mpdir/mapfile.c' || echo '$(srcdir)/'`mpdir/mapfile.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-mapfile.Tpo $(DEPDIR)/libmpost_a-mapfile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/mapfile.c' object='libmpost_a-mapfile.o' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-turningnumber.o: mpdir/turningnumber.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-turningnumber.o -MD -MP -MF $(DEPDIR)/liboldmpost_a-turningnumber.Tpo -c -o liboldmpost_a-turningnumber.o `test -f 'mpdir/turningnumber.c' || echo '$(srcdir)/'`mpdir/turningnumber.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-turningnumber.Tpo $(DEPDIR)/liboldmpost_a-turningnumber.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/turningnumber.c' object='liboldmpost_a-turningnumber.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-mapfile.o `test -f 'mpdir/mapfile.c' || echo '$(srcdir)/'`mpdir/mapfile.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-turningnumber.o `test -f 'mpdir/turningnumber.c' || echo '$(srcdir)/'`mpdir/turningnumber.c -libmpost_a-mapfile.obj: mpdir/mapfile.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-mapfile.obj -MD -MP -MF $(DEPDIR)/libmpost_a-mapfile.Tpo -c -o libmpost_a-mapfile.obj `if test -f 'mpdir/mapfile.c'; then $(CYGPATH_W) 'mpdir/mapfile.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/mapfile.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-mapfile.Tpo $(DEPDIR)/libmpost_a-mapfile.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/mapfile.c' object='libmpost_a-mapfile.obj' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-turningnumber.obj: mpdir/turningnumber.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-turningnumber.obj -MD -MP -MF $(DEPDIR)/liboldmpost_a-turningnumber.Tpo -c -o liboldmpost_a-turningnumber.obj `if test -f 'mpdir/turningnumber.c'; then $(CYGPATH_W) 'mpdir/turningnumber.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/turningnumber.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-turningnumber.Tpo $(DEPDIR)/liboldmpost_a-turningnumber.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/turningnumber.c' object='liboldmpost_a-turningnumber.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-mapfile.obj `if test -f 'mpdir/mapfile.c'; then $(CYGPATH_W) 'mpdir/mapfile.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/mapfile.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-turningnumber.obj `if test -f 'mpdir/turningnumber.c'; then $(CYGPATH_W) 'mpdir/turningnumber.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/turningnumber.c'; fi` -libmpost_a-turningnumber.o: mpdir/turningnumber.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-turningnumber.o -MD -MP -MF $(DEPDIR)/libmpost_a-turningnumber.Tpo -c -o libmpost_a-turningnumber.o `test -f 'mpdir/turningnumber.c' || echo '$(srcdir)/'`mpdir/turningnumber.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-turningnumber.Tpo $(DEPDIR)/libmpost_a-turningnumber.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/turningnumber.c' object='libmpost_a-turningnumber.o' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-utils.o: mpdir/utils.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-utils.o -MD -MP -MF $(DEPDIR)/liboldmpost_a-utils.Tpo -c -o liboldmpost_a-utils.o `test -f 'mpdir/utils.c' || echo '$(srcdir)/'`mpdir/utils.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-utils.Tpo $(DEPDIR)/liboldmpost_a-utils.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/utils.c' object='liboldmpost_a-utils.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-turningnumber.o `test -f 'mpdir/turningnumber.c' || echo '$(srcdir)/'`mpdir/turningnumber.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-utils.o `test -f 'mpdir/utils.c' || echo '$(srcdir)/'`mpdir/utils.c -libmpost_a-turningnumber.obj: mpdir/turningnumber.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-turningnumber.obj -MD -MP -MF $(DEPDIR)/libmpost_a-turningnumber.Tpo -c -o libmpost_a-turningnumber.obj `if test -f 'mpdir/turningnumber.c'; then $(CYGPATH_W) 'mpdir/turningnumber.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/turningnumber.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-turningnumber.Tpo $(DEPDIR)/libmpost_a-turningnumber.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/turningnumber.c' object='libmpost_a-turningnumber.obj' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-utils.obj: mpdir/utils.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-utils.obj -MD -MP -MF $(DEPDIR)/liboldmpost_a-utils.Tpo -c -o liboldmpost_a-utils.obj `if test -f 'mpdir/utils.c'; then $(CYGPATH_W) 'mpdir/utils.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/utils.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-utils.Tpo $(DEPDIR)/liboldmpost_a-utils.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/utils.c' object='liboldmpost_a-utils.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-turningnumber.obj `if test -f 'mpdir/turningnumber.c'; then $(CYGPATH_W) 'mpdir/turningnumber.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/turningnumber.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-utils.obj `if test -f 'mpdir/utils.c'; then $(CYGPATH_W) 'mpdir/utils.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/utils.c'; fi` -libmpost_a-utils.o: mpdir/utils.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-utils.o -MD -MP -MF $(DEPDIR)/libmpost_a-utils.Tpo -c -o libmpost_a-utils.o `test -f 'mpdir/utils.c' || echo '$(srcdir)/'`mpdir/utils.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-utils.Tpo $(DEPDIR)/libmpost_a-utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/utils.c' object='libmpost_a-utils.o' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-writeenc.o: mpdir/writeenc.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-writeenc.o -MD -MP -MF $(DEPDIR)/liboldmpost_a-writeenc.Tpo -c -o liboldmpost_a-writeenc.o `test -f 'mpdir/writeenc.c' || echo '$(srcdir)/'`mpdir/writeenc.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-writeenc.Tpo $(DEPDIR)/liboldmpost_a-writeenc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/writeenc.c' object='liboldmpost_a-writeenc.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-utils.o `test -f 'mpdir/utils.c' || echo '$(srcdir)/'`mpdir/utils.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-writeenc.o `test -f 'mpdir/writeenc.c' || echo '$(srcdir)/'`mpdir/writeenc.c -libmpost_a-utils.obj: mpdir/utils.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-utils.obj -MD -MP -MF $(DEPDIR)/libmpost_a-utils.Tpo -c -o libmpost_a-utils.obj `if test -f 'mpdir/utils.c'; then $(CYGPATH_W) 'mpdir/utils.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/utils.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-utils.Tpo $(DEPDIR)/libmpost_a-utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/utils.c' object='libmpost_a-utils.obj' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-writeenc.obj: mpdir/writeenc.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-writeenc.obj -MD -MP -MF $(DEPDIR)/liboldmpost_a-writeenc.Tpo -c -o liboldmpost_a-writeenc.obj `if test -f 'mpdir/writeenc.c'; then $(CYGPATH_W) 'mpdir/writeenc.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/writeenc.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-writeenc.Tpo $(DEPDIR)/liboldmpost_a-writeenc.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/writeenc.c' object='liboldmpost_a-writeenc.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-utils.obj `if test -f 'mpdir/utils.c'; then $(CYGPATH_W) 'mpdir/utils.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/utils.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-writeenc.obj `if test -f 'mpdir/writeenc.c'; then $(CYGPATH_W) 'mpdir/writeenc.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/writeenc.c'; fi` -libmpost_a-writeenc.o: mpdir/writeenc.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-writeenc.o -MD -MP -MF $(DEPDIR)/libmpost_a-writeenc.Tpo -c -o libmpost_a-writeenc.o `test -f 'mpdir/writeenc.c' || echo '$(srcdir)/'`mpdir/writeenc.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-writeenc.Tpo $(DEPDIR)/libmpost_a-writeenc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/writeenc.c' object='libmpost_a-writeenc.o' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-writefont.o: mpdir/writefont.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-writefont.o -MD -MP -MF $(DEPDIR)/liboldmpost_a-writefont.Tpo -c -o liboldmpost_a-writefont.o `test -f 'mpdir/writefont.c' || echo '$(srcdir)/'`mpdir/writefont.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-writefont.Tpo $(DEPDIR)/liboldmpost_a-writefont.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/writefont.c' object='liboldmpost_a-writefont.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-writeenc.o `test -f 'mpdir/writeenc.c' || echo '$(srcdir)/'`mpdir/writeenc.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-writefont.o `test -f 'mpdir/writefont.c' || echo '$(srcdir)/'`mpdir/writefont.c -libmpost_a-writeenc.obj: mpdir/writeenc.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-writeenc.obj -MD -MP -MF $(DEPDIR)/libmpost_a-writeenc.Tpo -c -o libmpost_a-writeenc.obj `if test -f 'mpdir/writeenc.c'; then $(CYGPATH_W) 'mpdir/writeenc.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/writeenc.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-writeenc.Tpo $(DEPDIR)/libmpost_a-writeenc.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/writeenc.c' object='libmpost_a-writeenc.obj' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-writefont.obj: mpdir/writefont.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-writefont.obj -MD -MP -MF $(DEPDIR)/liboldmpost_a-writefont.Tpo -c -o liboldmpost_a-writefont.obj `if test -f 'mpdir/writefont.c'; then $(CYGPATH_W) 'mpdir/writefont.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/writefont.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-writefont.Tpo $(DEPDIR)/liboldmpost_a-writefont.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/writefont.c' object='liboldmpost_a-writefont.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-writeenc.obj `if test -f 'mpdir/writeenc.c'; then $(CYGPATH_W) 'mpdir/writeenc.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/writeenc.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-writefont.obj `if test -f 'mpdir/writefont.c'; then $(CYGPATH_W) 'mpdir/writefont.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/writefont.c'; fi` -libmpost_a-writefont.o: mpdir/writefont.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-writefont.o -MD -MP -MF $(DEPDIR)/libmpost_a-writefont.Tpo -c -o libmpost_a-writefont.o `test -f 'mpdir/writefont.c' || echo '$(srcdir)/'`mpdir/writefont.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-writefont.Tpo $(DEPDIR)/libmpost_a-writefont.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/writefont.c' object='libmpost_a-writefont.o' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-writet1.o: mpdir/writet1.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-writet1.o -MD -MP -MF $(DEPDIR)/liboldmpost_a-writet1.Tpo -c -o liboldmpost_a-writet1.o `test -f 'mpdir/writet1.c' || echo '$(srcdir)/'`mpdir/writet1.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-writet1.Tpo $(DEPDIR)/liboldmpost_a-writet1.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/writet1.c' object='liboldmpost_a-writet1.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-writefont.o `test -f 'mpdir/writefont.c' || echo '$(srcdir)/'`mpdir/writefont.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-writet1.o `test -f 'mpdir/writet1.c' || echo '$(srcdir)/'`mpdir/writet1.c -libmpost_a-writefont.obj: mpdir/writefont.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-writefont.obj -MD -MP -MF $(DEPDIR)/libmpost_a-writefont.Tpo -c -o libmpost_a-writefont.obj `if test -f 'mpdir/writefont.c'; then $(CYGPATH_W) 'mpdir/writefont.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/writefont.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-writefont.Tpo $(DEPDIR)/libmpost_a-writefont.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/writefont.c' object='libmpost_a-writefont.obj' libtool=no @AMDEPBACKSLASH@ +liboldmpost_a-writet1.obj: mpdir/writet1.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboldmpost_a-writet1.obj -MD -MP -MF $(DEPDIR)/liboldmpost_a-writet1.Tpo -c -o liboldmpost_a-writet1.obj `if test -f 'mpdir/writet1.c'; then $(CYGPATH_W) 'mpdir/writet1.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/writet1.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/liboldmpost_a-writet1.Tpo $(DEPDIR)/liboldmpost_a-writet1.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/writet1.c' object='liboldmpost_a-writet1.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-writefont.obj `if test -f 'mpdir/writefont.c'; then $(CYGPATH_W) 'mpdir/writefont.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/writefont.c'; fi` - -libmpost_a-writet1.o: mpdir/writet1.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-writet1.o -MD -MP -MF $(DEPDIR)/libmpost_a-writet1.Tpo -c -o libmpost_a-writet1.o `test -f 'mpdir/writet1.c' || echo '$(srcdir)/'`mpdir/writet1.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-writet1.Tpo $(DEPDIR)/libmpost_a-writet1.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/writet1.c' object='libmpost_a-writet1.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-writet1.o `test -f 'mpdir/writet1.c' || echo '$(srcdir)/'`mpdir/writet1.c - -libmpost_a-writet1.obj: mpdir/writet1.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmpost_a-writet1.obj -MD -MP -MF $(DEPDIR)/libmpost_a-writet1.Tpo -c -o libmpost_a-writet1.obj `if test -f 'mpdir/writet1.c'; then $(CYGPATH_W) 'mpdir/writet1.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/writet1.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmpost_a-writet1.Tpo $(DEPDIR)/libmpost_a-writet1.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpdir/writet1.c' object='libmpost_a-writet1.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmpost_a-writet1.obj `if test -f 'mpdir/writet1.c'; then $(CYGPATH_W) 'mpdir/writet1.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/writet1.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboldmpost_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboldmpost_a-writet1.obj `if test -f 'mpdir/writet1.c'; then $(CYGPATH_W) 'mpdir/writet1.c'; else $(CYGPATH_W) '$(srcdir)/mpdir/writet1.c'; fi` libpdftex_a-avl.o: pdftexdir/avl.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libpdftex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libpdftex_a-avl.o -MD -MP -MF $(DEPDIR)/libpdftex_a-avl.Tpo -c -o libpdftex_a-avl.o `test -f 'pdftexdir/avl.c' || echo '$(srcdir)/'`pdftexdir/avl.c @@ -6389,117 +6428,117 @@ mf_nowin-mfextra.obj: mfextra.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mf_nowin_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mf_nowin-mfextra.obj `if test -f 'mfextra.c'; then $(CYGPATH_W) 'mfextra.c'; else $(CYGPATH_W) '$(srcdir)/mfextra.c'; fi` -mpost-mpini.o: mpini.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mpini.o -MD -MP -MF $(DEPDIR)/mpost-mpini.Tpo -c -o mpost-mpini.o `test -f 'mpini.c' || echo '$(srcdir)/'`mpini.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mpini.Tpo $(DEPDIR)/mpost-mpini.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpini.c' object='mpost-mpini.o' libtool=no @AMDEPBACKSLASH@ +mpost-mpost.o: mpost.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mpost.o -MD -MP -MF $(DEPDIR)/mpost-mpost.Tpo -c -o mpost-mpost.o `test -f 'mpost.c' || echo '$(srcdir)/'`mpost.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mpost.Tpo $(DEPDIR)/mpost-mpost.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpost.c' object='mpost-mpost.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mpini.o `test -f 'mpini.c' || echo '$(srcdir)/'`mpini.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mpost.o `test -f 'mpost.c' || echo '$(srcdir)/'`mpost.c -mpost-mpini.obj: mpini.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mpini.obj -MD -MP -MF $(DEPDIR)/mpost-mpini.Tpo -c -o mpost-mpini.obj `if test -f 'mpini.c'; then $(CYGPATH_W) 'mpini.c'; else $(CYGPATH_W) '$(srcdir)/mpini.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mpini.Tpo $(DEPDIR)/mpost-mpini.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpini.c' object='mpost-mpini.obj' libtool=no @AMDEPBACKSLASH@ +mpost-mpost.obj: mpost.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mpost.obj -MD -MP -MF $(DEPDIR)/mpost-mpost.Tpo -c -o mpost-mpost.obj `if test -f 'mpost.c'; then $(CYGPATH_W) 'mpost.c'; else $(CYGPATH_W) '$(srcdir)/mpost.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mpost.Tpo $(DEPDIR)/mpost-mpost.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpost.c' object='mpost-mpost.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mpini.obj `if test -f 'mpini.c'; then $(CYGPATH_W) 'mpini.c'; else $(CYGPATH_W) '$(srcdir)/mpini.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mpost.obj `if test -f 'mpost.c'; then $(CYGPATH_W) 'mpost.c'; else $(CYGPATH_W) '$(srcdir)/mpost.c'; fi` -mpost-mp0.o: mp0.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mp0.o -MD -MP -MF $(DEPDIR)/mpost-mp0.Tpo -c -o mpost-mp0.o `test -f 'mp0.c' || echo '$(srcdir)/'`mp0.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mp0.Tpo $(DEPDIR)/mpost-mp0.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp0.c' object='mpost-mp0.o' libtool=no @AMDEPBACKSLASH@ +mpost-mpxout.o: mpxout.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mpxout.o -MD -MP -MF $(DEPDIR)/mpost-mpxout.Tpo -c -o mpost-mpxout.o `test -f 'mpxout.c' || echo '$(srcdir)/'`mpxout.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mpxout.Tpo $(DEPDIR)/mpost-mpxout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpxout.c' object='mpost-mpxout.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mp0.o `test -f 'mp0.c' || echo '$(srcdir)/'`mp0.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mpxout.o `test -f 'mpxout.c' || echo '$(srcdir)/'`mpxout.c -mpost-mp0.obj: mp0.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mp0.obj -MD -MP -MF $(DEPDIR)/mpost-mp0.Tpo -c -o mpost-mp0.obj `if test -f 'mp0.c'; then $(CYGPATH_W) 'mp0.c'; else $(CYGPATH_W) '$(srcdir)/mp0.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mp0.Tpo $(DEPDIR)/mpost-mp0.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp0.c' object='mpost-mp0.obj' libtool=no @AMDEPBACKSLASH@ +mpost-mpxout.obj: mpxout.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mpxout.obj -MD -MP -MF $(DEPDIR)/mpost-mpxout.Tpo -c -o mpost-mpxout.obj `if test -f 'mpxout.c'; then $(CYGPATH_W) 'mpxout.c'; else $(CYGPATH_W) '$(srcdir)/mpxout.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mpxout.Tpo $(DEPDIR)/mpost-mpxout.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpxout.c' object='mpost-mpxout.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mp0.obj `if test -f 'mp0.c'; then $(CYGPATH_W) 'mp0.c'; else $(CYGPATH_W) '$(srcdir)/mp0.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mpxout.obj `if test -f 'mpxout.c'; then $(CYGPATH_W) 'mpxout.c'; else $(CYGPATH_W) '$(srcdir)/mpxout.c'; fi` -mpost-mp1.o: mp1.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mp1.o -MD -MP -MF $(DEPDIR)/mpost-mp1.Tpo -c -o mpost-mp1.o `test -f 'mp1.c' || echo '$(srcdir)/'`mp1.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mp1.Tpo $(DEPDIR)/mpost-mp1.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp1.c' object='mpost-mp1.o' libtool=no @AMDEPBACKSLASH@ +oldmpost-mpini.o: mpini.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT oldmpost-mpini.o -MD -MP -MF $(DEPDIR)/oldmpost-mpini.Tpo -c -o oldmpost-mpini.o `test -f 'mpini.c' || echo '$(srcdir)/'`mpini.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/oldmpost-mpini.Tpo $(DEPDIR)/oldmpost-mpini.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpini.c' object='oldmpost-mpini.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mp1.o `test -f 'mp1.c' || echo '$(srcdir)/'`mp1.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o oldmpost-mpini.o `test -f 'mpini.c' || echo '$(srcdir)/'`mpini.c -mpost-mp1.obj: mp1.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mp1.obj -MD -MP -MF $(DEPDIR)/mpost-mp1.Tpo -c -o mpost-mp1.obj `if test -f 'mp1.c'; then $(CYGPATH_W) 'mp1.c'; else $(CYGPATH_W) '$(srcdir)/mp1.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mp1.Tpo $(DEPDIR)/mpost-mp1.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp1.c' object='mpost-mp1.obj' libtool=no @AMDEPBACKSLASH@ +oldmpost-mpini.obj: mpini.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT oldmpost-mpini.obj -MD -MP -MF $(DEPDIR)/oldmpost-mpini.Tpo -c -o oldmpost-mpini.obj `if test -f 'mpini.c'; then $(CYGPATH_W) 'mpini.c'; else $(CYGPATH_W) '$(srcdir)/mpini.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/oldmpost-mpini.Tpo $(DEPDIR)/oldmpost-mpini.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpini.c' object='oldmpost-mpini.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mp1.obj `if test -f 'mp1.c'; then $(CYGPATH_W) 'mp1.c'; else $(CYGPATH_W) '$(srcdir)/mp1.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o oldmpost-mpini.obj `if test -f 'mpini.c'; then $(CYGPATH_W) 'mpini.c'; else $(CYGPATH_W) '$(srcdir)/mpini.c'; fi` -mpost-mp2.o: mp2.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mp2.o -MD -MP -MF $(DEPDIR)/mpost-mp2.Tpo -c -o mpost-mp2.o `test -f 'mp2.c' || echo '$(srcdir)/'`mp2.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mp2.Tpo $(DEPDIR)/mpost-mp2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp2.c' object='mpost-mp2.o' libtool=no @AMDEPBACKSLASH@ +oldmpost-mp0.o: mp0.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT oldmpost-mp0.o -MD -MP -MF $(DEPDIR)/oldmpost-mp0.Tpo -c -o oldmpost-mp0.o `test -f 'mp0.c' || echo '$(srcdir)/'`mp0.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/oldmpost-mp0.Tpo $(DEPDIR)/oldmpost-mp0.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp0.c' object='oldmpost-mp0.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mp2.o `test -f 'mp2.c' || echo '$(srcdir)/'`mp2.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o oldmpost-mp0.o `test -f 'mp0.c' || echo '$(srcdir)/'`mp0.c -mpost-mp2.obj: mp2.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mp2.obj -MD -MP -MF $(DEPDIR)/mpost-mp2.Tpo -c -o mpost-mp2.obj `if test -f 'mp2.c'; then $(CYGPATH_W) 'mp2.c'; else $(CYGPATH_W) '$(srcdir)/mp2.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mp2.Tpo $(DEPDIR)/mpost-mp2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp2.c' object='mpost-mp2.obj' libtool=no @AMDEPBACKSLASH@ +oldmpost-mp0.obj: mp0.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT oldmpost-mp0.obj -MD -MP -MF $(DEPDIR)/oldmpost-mp0.Tpo -c -o oldmpost-mp0.obj `if test -f 'mp0.c'; then $(CYGPATH_W) 'mp0.c'; else $(CYGPATH_W) '$(srcdir)/mp0.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/oldmpost-mp0.Tpo $(DEPDIR)/oldmpost-mp0.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp0.c' object='oldmpost-mp0.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mp2.obj `if test -f 'mp2.c'; then $(CYGPATH_W) 'mp2.c'; else $(CYGPATH_W) '$(srcdir)/mp2.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o oldmpost-mp0.obj `if test -f 'mp0.c'; then $(CYGPATH_W) 'mp0.c'; else $(CYGPATH_W) '$(srcdir)/mp0.c'; fi` -mpost-mp-pool.o: mp-pool.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mp-pool.o -MD -MP -MF $(DEPDIR)/mpost-mp-pool.Tpo -c -o mpost-mp-pool.o `test -f 'mp-pool.c' || echo '$(srcdir)/'`mp-pool.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mp-pool.Tpo $(DEPDIR)/mpost-mp-pool.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp-pool.c' object='mpost-mp-pool.o' libtool=no @AMDEPBACKSLASH@ +oldmpost-mp1.o: mp1.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT oldmpost-mp1.o -MD -MP -MF $(DEPDIR)/oldmpost-mp1.Tpo -c -o oldmpost-mp1.o `test -f 'mp1.c' || echo '$(srcdir)/'`mp1.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/oldmpost-mp1.Tpo $(DEPDIR)/oldmpost-mp1.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp1.c' object='oldmpost-mp1.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mp-pool.o `test -f 'mp-pool.c' || echo '$(srcdir)/'`mp-pool.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o oldmpost-mp1.o `test -f 'mp1.c' || echo '$(srcdir)/'`mp1.c -mpost-mp-pool.obj: mp-pool.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mp-pool.obj -MD -MP -MF $(DEPDIR)/mpost-mp-pool.Tpo -c -o mpost-mp-pool.obj `if test -f 'mp-pool.c'; then $(CYGPATH_W) 'mp-pool.c'; else $(CYGPATH_W) '$(srcdir)/mp-pool.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mp-pool.Tpo $(DEPDIR)/mpost-mp-pool.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp-pool.c' object='mpost-mp-pool.obj' libtool=no @AMDEPBACKSLASH@ +oldmpost-mp1.obj: mp1.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT oldmpost-mp1.obj -MD -MP -MF $(DEPDIR)/oldmpost-mp1.Tpo -c -o oldmpost-mp1.obj `if test -f 'mp1.c'; then $(CYGPATH_W) 'mp1.c'; else $(CYGPATH_W) '$(srcdir)/mp1.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/oldmpost-mp1.Tpo $(DEPDIR)/oldmpost-mp1.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp1.c' object='oldmpost-mp1.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mp-pool.obj `if test -f 'mp-pool.c'; then $(CYGPATH_W) 'mp-pool.c'; else $(CYGPATH_W) '$(srcdir)/mp-pool.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o oldmpost-mp1.obj `if test -f 'mp1.c'; then $(CYGPATH_W) 'mp1.c'; else $(CYGPATH_W) '$(srcdir)/mp1.c'; fi` -mpost-mpextra.o: mpextra.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mpextra.o -MD -MP -MF $(DEPDIR)/mpost-mpextra.Tpo -c -o mpost-mpextra.o `test -f 'mpextra.c' || echo '$(srcdir)/'`mpextra.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mpextra.Tpo $(DEPDIR)/mpost-mpextra.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpextra.c' object='mpost-mpextra.o' libtool=no @AMDEPBACKSLASH@ +oldmpost-mp2.o: mp2.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT oldmpost-mp2.o -MD -MP -MF $(DEPDIR)/oldmpost-mp2.Tpo -c -o oldmpost-mp2.o `test -f 'mp2.c' || echo '$(srcdir)/'`mp2.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/oldmpost-mp2.Tpo $(DEPDIR)/oldmpost-mp2.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp2.c' object='oldmpost-mp2.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mpextra.o `test -f 'mpextra.c' || echo '$(srcdir)/'`mpextra.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o oldmpost-mp2.o `test -f 'mp2.c' || echo '$(srcdir)/'`mp2.c -mpost-mpextra.obj: mpextra.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpost-mpextra.obj -MD -MP -MF $(DEPDIR)/mpost-mpextra.Tpo -c -o mpost-mpextra.obj `if test -f 'mpextra.c'; then $(CYGPATH_W) 'mpextra.c'; else $(CYGPATH_W) '$(srcdir)/mpextra.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/mpost-mpextra.Tpo $(DEPDIR)/mpost-mpextra.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpextra.c' object='mpost-mpextra.obj' libtool=no @AMDEPBACKSLASH@ +oldmpost-mp2.obj: mp2.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT oldmpost-mp2.obj -MD -MP -MF $(DEPDIR)/oldmpost-mp2.Tpo -c -o oldmpost-mp2.obj `if test -f 'mp2.c'; then $(CYGPATH_W) 'mp2.c'; else $(CYGPATH_W) '$(srcdir)/mp2.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/oldmpost-mp2.Tpo $(DEPDIR)/oldmpost-mp2.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp2.c' object='oldmpost-mp2.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpost-mpextra.obj `if test -f 'mpextra.c'; then $(CYGPATH_W) 'mpextra.c'; else $(CYGPATH_W) '$(srcdir)/mpextra.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o oldmpost-mp2.obj `if test -f 'mp2.c'; then $(CYGPATH_W) 'mp2.c'; else $(CYGPATH_W) '$(srcdir)/mp2.c'; fi` -newmpost-mpost.o: mpost.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT newmpost-mpost.o -MD -MP -MF $(DEPDIR)/newmpost-mpost.Tpo -c -o newmpost-mpost.o `test -f 'mpost.c' || echo '$(srcdir)/'`mpost.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/newmpost-mpost.Tpo $(DEPDIR)/newmpost-mpost.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpost.c' object='newmpost-mpost.o' libtool=no @AMDEPBACKSLASH@ +oldmpost-mp-pool.o: mp-pool.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT oldmpost-mp-pool.o -MD -MP -MF $(DEPDIR)/oldmpost-mp-pool.Tpo -c -o oldmpost-mp-pool.o `test -f 'mp-pool.c' || echo '$(srcdir)/'`mp-pool.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/oldmpost-mp-pool.Tpo $(DEPDIR)/oldmpost-mp-pool.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp-pool.c' object='oldmpost-mp-pool.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o newmpost-mpost.o `test -f 'mpost.c' || echo '$(srcdir)/'`mpost.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o oldmpost-mp-pool.o `test -f 'mp-pool.c' || echo '$(srcdir)/'`mp-pool.c -newmpost-mpost.obj: mpost.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT newmpost-mpost.obj -MD -MP -MF $(DEPDIR)/newmpost-mpost.Tpo -c -o newmpost-mpost.obj `if test -f 'mpost.c'; then $(CYGPATH_W) 'mpost.c'; else $(CYGPATH_W) '$(srcdir)/mpost.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/newmpost-mpost.Tpo $(DEPDIR)/newmpost-mpost.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpost.c' object='newmpost-mpost.obj' libtool=no @AMDEPBACKSLASH@ +oldmpost-mp-pool.obj: mp-pool.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT oldmpost-mp-pool.obj -MD -MP -MF $(DEPDIR)/oldmpost-mp-pool.Tpo -c -o oldmpost-mp-pool.obj `if test -f 'mp-pool.c'; then $(CYGPATH_W) 'mp-pool.c'; else $(CYGPATH_W) '$(srcdir)/mp-pool.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/oldmpost-mp-pool.Tpo $(DEPDIR)/oldmpost-mp-pool.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp-pool.c' object='oldmpost-mp-pool.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o newmpost-mpost.obj `if test -f 'mpost.c'; then $(CYGPATH_W) 'mpost.c'; else $(CYGPATH_W) '$(srcdir)/mpost.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o oldmpost-mp-pool.obj `if test -f 'mp-pool.c'; then $(CYGPATH_W) 'mp-pool.c'; else $(CYGPATH_W) '$(srcdir)/mp-pool.c'; fi` -newmpost-mpxout.o: mpxout.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT newmpost-mpxout.o -MD -MP -MF $(DEPDIR)/newmpost-mpxout.Tpo -c -o newmpost-mpxout.o `test -f 'mpxout.c' || echo '$(srcdir)/'`mpxout.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/newmpost-mpxout.Tpo $(DEPDIR)/newmpost-mpxout.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpxout.c' object='newmpost-mpxout.o' libtool=no @AMDEPBACKSLASH@ +oldmpost-mpextra.o: mpextra.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT oldmpost-mpextra.o -MD -MP -MF $(DEPDIR)/oldmpost-mpextra.Tpo -c -o oldmpost-mpextra.o `test -f 'mpextra.c' || echo '$(srcdir)/'`mpextra.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/oldmpost-mpextra.Tpo $(DEPDIR)/oldmpost-mpextra.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpextra.c' object='oldmpost-mpextra.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o newmpost-mpxout.o `test -f 'mpxout.c' || echo '$(srcdir)/'`mpxout.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o oldmpost-mpextra.o `test -f 'mpextra.c' || echo '$(srcdir)/'`mpextra.c -newmpost-mpxout.obj: mpxout.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT newmpost-mpxout.obj -MD -MP -MF $(DEPDIR)/newmpost-mpxout.Tpo -c -o newmpost-mpxout.obj `if test -f 'mpxout.c'; then $(CYGPATH_W) 'mpxout.c'; else $(CYGPATH_W) '$(srcdir)/mpxout.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/newmpost-mpxout.Tpo $(DEPDIR)/newmpost-mpxout.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpxout.c' object='newmpost-mpxout.obj' libtool=no @AMDEPBACKSLASH@ +oldmpost-mpextra.obj: mpextra.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT oldmpost-mpextra.obj -MD -MP -MF $(DEPDIR)/oldmpost-mpextra.Tpo -c -o oldmpost-mpextra.obj `if test -f 'mpextra.c'; then $(CYGPATH_W) 'mpextra.c'; else $(CYGPATH_W) '$(srcdir)/mpextra.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/oldmpost-mpextra.Tpo $(DEPDIR)/oldmpost-mpextra.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mpextra.c' object='oldmpost-mpextra.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(newmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o newmpost-mpxout.obj `if test -f 'mpxout.c'; then $(CYGPATH_W) 'mpxout.c'; else $(CYGPATH_W) '$(srcdir)/mpxout.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(oldmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o oldmpost-mpextra.obj `if test -f 'mpextra.c'; then $(CYGPATH_W) 'mpextra.c'; else $(CYGPATH_W) '$(srcdir)/mpextra.c'; fi` pdftex-pdftexini.o: pdftexini.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pdftex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pdftex-pdftexini.o -MD -MP -MF $(DEPDIR)/pdftex-pdftexini.Tpo -c -o pdftex-pdftexini.o `test -f 'pdftexini.c' || echo '$(srcdir)/'`pdftexini.c @@ -6851,6 +6890,20 @@ xetex-xetexextra.obj: xetexextra.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xetex-xetexextra.obj `if test -f 'xetexextra.c'; then $(CYGPATH_W) 'xetexextra.c'; else $(CYGPATH_W) '$(srcdir)/xetexextra.c'; fi` +xetex-synctex-xe.o: synctex-xe.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xetex-synctex-xe.o -MD -MP -MF $(DEPDIR)/xetex-synctex-xe.Tpo -c -o xetex-synctex-xe.o `test -f 'synctex-xe.c' || echo '$(srcdir)/'`synctex-xe.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xetex-synctex-xe.Tpo $(DEPDIR)/xetex-synctex-xe.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='synctex-xe.c' object='xetex-synctex-xe.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xetex-synctex-xe.o `test -f 'synctex-xe.c' || echo '$(srcdir)/'`synctex-xe.c + +xetex-synctex-xe.obj: synctex-xe.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xetex-synctex-xe.obj -MD -MP -MF $(DEPDIR)/xetex-synctex-xe.Tpo -c -o xetex-synctex-xe.obj `if test -f 'synctex-xe.c'; then $(CYGPATH_W) 'synctex-xe.c'; else $(CYGPATH_W) '$(srcdir)/synctex-xe.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xetex-synctex-xe.Tpo $(DEPDIR)/xetex-synctex-xe.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='synctex-xe.c' object='xetex-synctex-xe.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xetex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xetex-synctex-xe.obj `if test -f 'synctex-xe.c'; then $(CYGPATH_W) 'synctex-xe.c'; else $(CYGPATH_W) '$(srcdir)/synctex-xe.c'; fi` + .cc.o: @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @@ -8024,11 +8077,11 @@ mf-final.ch: $(TIE) mf.web mf.ch mf-binpool.ch $(tie) -c $@ mf.web mf.ch mf-binpool.ch mf-pool.c: mf.pool $(makecpool) tmf-pool.h $(makecpool) mf.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@ -$(mpost_c_h): mp-web2c +$(oldmpost_c_h): mp-web2c mp-web2c: mp.p $(web2c_texmf) mpdir/mp.defines web2c/cvtmf1.sed web2c/cvtmf2.sed $(web2c) mp echo timestamp >$@ - touch $(mpost_c_h) + touch $(oldmpost_c_h) mpextra.c: lib/texmfmp.c mpd.h sed s/TEX-OR-MF-OR-MP/mp/ $(srcdir)/lib/texmfmp.c >$@ mp.p mp.pool: mp-tangle @@ -8039,48 +8092,76 @@ mp-tangle: tangle$(EXEEXT) mp.web mp.ch mp-pool.c: mp.pool $(makecpool) mpdir/mplib.h $(makecpool) mp.pool $(srcdir)/mpdir/mplib.h >$@ || rm -f $@ -$(libmpost_a_OBJECTS): mpd.h +$(liboldmpost_a_OBJECTS): mpd.h + +mpost.c: ctangle$(EXEEXT) mplibdir/mpost.w + $(mp_ctangle) mpost.w + +$(mpxout_c_h): mpxout-ctangle +mpxout-ctangle: ctangle$(EXEEXT) mplibdir/mpxout.w + $(mp_ctangle) mpxout.w + echo timestamp >$@ + touch $(mpxout_c_h) + +$(mpost_OBJECTS): $(nodist_mpost_SOURCES) libmplib.a -$(newmpost_c_h): mpost-ctangle libmplib.a -mpost-ctangle: ctangle$(EXEEXT) $(newmpost_web) - CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) mpost.w - CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) mpxout.w +memio.c: ctangle$(EXEEXT) mplibdir/memio.w + $(mp_ctangle) memio.w + +tfmin.c: ctangle$(EXEEXT) mplibdir/tfmin.w + $(mp_ctangle) tfmin.w + +$(mp_c_h): mp-ctangle +mp-ctangle: ctangle$(EXEEXT) mplibdir/mp.w + $(mp_ctangle) mp.w + echo timestamp >$@ + touch $(mp_c_h) + +$(psout_c_h): psout-ctangle +psout-ctangle: ctangle$(EXEEXT) mplibdir/psout.w + $(mp_ctangle) psout.w echo timestamp >$@ - touch $(newmpost_c_h) - -$(libmplib_c_h): mplib-ctangle $(libmplib_true_c) -mplib-ctangle: ctangle$(EXEEXT) $(libmplib_web) - CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) mp.w - CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) psout.w - CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) svgout.w - CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) tfmin.w - CWEBINPUTS=$(srcdir)/mplibdir $(ctangle) memio.w + touch $(psout_c_h) + +$(svgout_c_h): svgout-ctangle +svgout-ctangle: ctangle$(EXEEXT) mplibdir/svgout.w + $(mp_ctangle) svgout.w echo timestamp >$@ - touch $(libmplib_c_h) + touch $(svgout_c_h) + +$(libmplib_a_OBJECTS): $(nodist_libmplib_a_SOURCES) + $(etex_c_h): etex-web2c etex-web2c: etex.p $(web2c_texmf) $(web2c) etex : $(synctex_convert_etex) echo timestamp >$@ touch $(etex_c_h) + +etex-pool.c: etex.pool $(makecpool) tmf-pool.h + $(makecpool) etex.pool $(srcdir)/tmf-pool.h >$@ || 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 >$@ + etex.p etex.pool: etex-tangle etex-tangle: tangle$(EXEEXT) etex.web etex.ch $(tangle) etex etex echo timestamp >$@ touch etex.p etex.pool -etex-pool.c: etex.pool $(makecpool) tmf-pool.h - $(makecpool) etex.pool $(srcdir)/tmf-pool.h >$@ || rm -f $@ + etexdir/etex.version: etexdir/etex.ch $(mkdir_p) etexdir grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \ | sed "s/^.*'-//;s/'.*$$//" >etexdir/etex.version -etexdir/etexextra.h: etexdir/etexextra.in etexdir/etex.version - sed s/ETEX-VERSION/`cat etexdir/etex.version`/ \ - $(srcdir)/etexdir/etexextra.in >$@ + etex.web: $(TIE) $(etex_web_srcs) $(tie) -m etex.web $(etex_web_srcs) + etex.ch: $(TIE) etex.web $(etex_ch_srcs) $(tie) -c etex.ch etex.web $(etex_ch_srcs) $(pdftex_c_h): pdftex-web2c @@ -8249,15 +8330,16 @@ aleph-web2c: aleph.p $(web2c_texmf) alephdir/aleph.defines $(web2c) aleph echo timestamp >$@ touch $(aleph_c_h) +aleph-pool.c: aleph.pool $(makecpool) alephdir/aleph-pool.h + $(makecpool) aleph.pool $(srcdir)/alephdir/aleph-pool.h >$@ || rm -f $@ alephextra.c: lib/texmfmp.c alephdir/alephextra.h alephd.h sed s/TEX-OR-MF-OR-MP/aleph/ $(srcdir)/lib/texmfmp.c >$@ + aleph.p aleph.pool: aleph-tangle aleph-tangle: otangle$(EXEEXT) aleph.web aleph.ch $(otangle) aleph aleph echo timestamp >$@ touch aleph.p aleph.pool -aleph-pool.c: aleph.pool $(makecpool) alephdir/aleph-pool.h - $(makecpool) aleph.pool $(srcdir)/alephdir/aleph-pool.h >$@ || rm -f $@ aleph.web: $(TIE) $(aleph_web_srcs) $(tie) -m aleph.web $(aleph_web_srcs) aleph.ch: $(TIE) aleph.web $(aleph_ch_srcs) @@ -8271,6 +8353,9 @@ synctex-e.c: etexd.h synctexdir/synctex.c $(dist_etex_SOURCES) synctex-pdf.c: pdftexd.h synctexdir/synctex.c $(dist_pdftex_SOURCES) sed s/TEX-OR-MF-OR-MP/pdftex/ $(srcdir)/synctexdir/synctex.c >$@ + +synctex-xe.c: xetexd.h synctexdir/synctex.c $(dist_xetex_SOURCES) + sed s/TEX-OR-MF-OR-MP/xetex/ $(srcdir)/synctexdir/synctex.c >$@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index c607dd8e570..bdfa8ebca40 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -25,7 +25,7 @@ luatex_LDADD = $(luatex_ldadd) $(LDADD) $(socketlibs) luatex_DEPENDENCIES = $(proglib) libluatex.a luatex_DEPENDENCIES += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND) -luatex_DEPENDENCIES += $(OBSDCOMPAT_DEPEND) libmd5.a +luatex_DEPENDENCIES += $(OBSDCOMPAT_DEPEND) libmd5.a libmplib.a $(luatex_OBJECTS): libluatex.a libmplib.a diff --git a/Build/source/texk/web2c/luatexdir/mp/avl.c b/Build/source/texk/web2c/luatexdir/mp/avl.c deleted file mode 100644 index 703c4b2e72d..00000000000 --- a/Build/source/texk/web2c/luatexdir/mp/avl.c +++ /dev/null @@ -1,792 +0,0 @@ -/* Produced by texiweb from libavl.w on 2003/01/06 at 18:07. */ - -/* libavl - library for manipulation of binary trees. - Copyright (C) 1998-2002 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - 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., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. - - The author may be contacted at on the Internet, or - write to Ben Pfaff, Stanford University, Computer Science Dept., 353 - Serra Mall, Stanford CA 94305, USA. -*/ - -#include -#include -#include -#include -#include "avl.h" - -/* Creates and returns a new table - with comparison function |compare| using parameter |param| - and memory allocator |allocator|. - Returns |NULL| if memory allocation failed. */ -struct avl_table *avl_create (avl_comparison_func * compare, void *param, - struct libavl_allocator *allocator) -{ - struct avl_table *tree; - - assert (compare != NULL); - - if (allocator == NULL) - allocator = &avl_allocator_default; - - tree = allocator->libavl_malloc (allocator, sizeof *tree); - if (tree == NULL) - return NULL; - - tree->avl_root = NULL; - tree->avl_compare = compare; - tree->avl_param = param; - tree->avl_alloc = allocator; - tree->avl_count = 0; - tree->avl_generation = 0; - - return tree; -} - -/* Search |tree| for an item matching |item|, and return it if found. - Otherwise return |NULL|. */ -void *avl_find (const struct avl_table *tree, const void *item) -{ - const struct avl_node *p; - - assert (tree != NULL && item != NULL); - for (p = tree->avl_root; p != NULL;) { - int cmp = tree->avl_compare (item, p->avl_data, tree->avl_param); - - if (cmp < 0) - p = p->avl_link[0]; - else if (cmp > 0) - p = p->avl_link[1]; - else /* |cmp == 0| */ - return p->avl_data; - } - - return NULL; -} - -/* Inserts |item| into |tree| and returns a pointer to |item|'s address. - If a duplicate item is found in the tree, - returns a pointer to the duplicate without inserting |item|. - Returns |NULL| in case of memory allocation failure. */ -void **avl_probe (struct avl_table *tree, void *item) -{ - struct avl_node *y, *z; /* Top node to update balance factor, and parent. */ - struct avl_node *p, *q; /* Iterator, and parent. */ - struct avl_node *n; /* Newly inserted node. */ - struct avl_node *w; /* New root of rebalanced subtree. */ - int dir; /* Direction to descend. */ - - unsigned char da[AVL_MAX_HEIGHT]; /* Cached comparison results. */ - int k = 0; /* Number of cached results. */ - - assert (tree != NULL && item != NULL); - - z = (struct avl_node *) &tree->avl_root; - y = tree->avl_root; - dir = 0; - for (q = z, p = y; p != NULL; q = p, p = p->avl_link[dir]) { - int cmp = tree->avl_compare (item, p->avl_data, tree->avl_param); - if (cmp == 0) - return &p->avl_data; - - if (p->avl_balance != 0) - z = q, y = p, k = 0; - da[k++] = dir = cmp > 0; - } - - n = q->avl_link[dir] = - tree->avl_alloc->libavl_malloc (tree->avl_alloc, sizeof *n); - if (n == NULL) - return NULL; - - tree->avl_count++; - n->avl_data = item; - n->avl_link[0] = n->avl_link[1] = NULL; - n->avl_balance = 0; - if (y == NULL) - return &n->avl_data; - - for (p = y, k = 0; p != n; p = p->avl_link[da[k]], k++) - if (da[k] == 0) - p->avl_balance--; - else - p->avl_balance++; - - if (y->avl_balance == -2) { - struct avl_node *x = y->avl_link[0]; - if (x->avl_balance == -1) { - w = x; - y->avl_link[0] = x->avl_link[1]; - x->avl_link[1] = y; - x->avl_balance = y->avl_balance = 0; - } else { - assert (x->avl_balance == +1); - w = x->avl_link[1]; - x->avl_link[1] = w->avl_link[0]; - w->avl_link[0] = x; - y->avl_link[0] = w->avl_link[1]; - w->avl_link[1] = y; - if (w->avl_balance == -1) - x->avl_balance = 0, y->avl_balance = +1; - else if (w->avl_balance == 0) - x->avl_balance = y->avl_balance = 0; - else /* |w->avl_balance == +1| */ - x->avl_balance = -1, y->avl_balance = 0; - w->avl_balance = 0; - } - } else if (y->avl_balance == +2) { - struct avl_node *x = y->avl_link[1]; - if (x->avl_balance == +1) { - w = x; - y->avl_link[1] = x->avl_link[0]; - x->avl_link[0] = y; - x->avl_balance = y->avl_balance = 0; - } else { - assert (x->avl_balance == -1); - w = x->avl_link[0]; - x->avl_link[0] = w->avl_link[1]; - w->avl_link[1] = x; - y->avl_link[1] = w->avl_link[0]; - w->avl_link[0] = y; - if (w->avl_balance == +1) - x->avl_balance = 0, y->avl_balance = -1; - else if (w->avl_balance == 0) - x->avl_balance = y->avl_balance = 0; - else /* |w->avl_balance == -1| */ - x->avl_balance = +1, y->avl_balance = 0; - w->avl_balance = 0; - } - } else - return &n->avl_data; - z->avl_link[y != z->avl_link[0]] = w; - - tree->avl_generation++; - return &n->avl_data; -} - -/* Inserts |item| into |table|. - Returns |NULL| if |item| was successfully inserted - or if a memory allocation error occurred. - Otherwise, returns the duplicate item. */ -void *avl_insert (struct avl_table *table, void *item) -{ - void **p = avl_probe (table, item); - return p == NULL || *p == item ? NULL : *p; -} - -/* Inserts |item| into |table|, replacing any duplicate item. - Returns |NULL| if |item| was inserted without replacing a duplicate, - or if a memory allocation error occurred. - Otherwise, returns the item that was replaced. */ -void *avl_replace (struct avl_table *table, void *item) -{ - void **p = avl_probe (table, item); - if (p == NULL || *p == item) - return NULL; - else { - void *r = *p; - *p = item; - return r; - } -} - -/* Deletes from |tree| and returns an item matching |item|. - Returns a null pointer if no matching item found. */ -void *avl_delete (struct avl_table *tree, const void *item) -{ - /* Stack of nodes. */ - struct avl_node *pa[AVL_MAX_HEIGHT]; /* Nodes. */ - unsigned char da[AVL_MAX_HEIGHT]; /* |avl_link[]| indexes. */ - int k; /* Stack pointer. */ - - struct avl_node *p; /* Traverses tree to find node to delete. */ - int cmp; /* Result of comparison between |item| and |p|. */ - - assert (tree != NULL && item != NULL); - - k = 0; - p = (struct avl_node *) &tree->avl_root; - for (cmp = -1; cmp != 0; - cmp = tree->avl_compare (item, p->avl_data, tree->avl_param)) { - int dir = cmp > 0; - - pa[k] = p; - da[k++] = dir; - - p = p->avl_link[dir]; - if (p == NULL) - return NULL; - } - item = p->avl_data; - - if (p->avl_link[1] == NULL) - pa[k - 1]->avl_link[da[k - 1]] = p->avl_link[0]; - else { - struct avl_node *r = p->avl_link[1]; - if (r->avl_link[0] == NULL) { - r->avl_link[0] = p->avl_link[0]; - r->avl_balance = p->avl_balance; - pa[k - 1]->avl_link[da[k - 1]] = r; - da[k] = 1; - pa[k++] = r; - } else { - struct avl_node *s; - int j = k++; - - for (;;) { - da[k] = 0; - pa[k++] = r; - s = r->avl_link[0]; - if (s->avl_link[0] == NULL) - break; - - r = s; - } - - s->avl_link[0] = p->avl_link[0]; - r->avl_link[0] = s->avl_link[1]; - s->avl_link[1] = p->avl_link[1]; - s->avl_balance = p->avl_balance; - - pa[j - 1]->avl_link[da[j - 1]] = s; - da[j] = 1; - pa[j] = s; - } - } - - tree->avl_alloc->libavl_free (tree->avl_alloc, p); - - assert (k > 0); - while (--k > 0) { - struct avl_node *y = pa[k]; - - if (da[k] == 0) { - y->avl_balance++; - if (y->avl_balance == +1) - break; - else if (y->avl_balance == +2) { - struct avl_node *x = y->avl_link[1]; - if (x->avl_balance == -1) { - struct avl_node *w; - assert (x->avl_balance == -1); - w = x->avl_link[0]; - x->avl_link[0] = w->avl_link[1]; - w->avl_link[1] = x; - y->avl_link[1] = w->avl_link[0]; - w->avl_link[0] = y; - if (w->avl_balance == +1) - x->avl_balance = 0, y->avl_balance = -1; - else if (w->avl_balance == 0) - x->avl_balance = y->avl_balance = 0; - else /* |w->avl_balance == -1| */ - x->avl_balance = +1, y->avl_balance = 0; - w->avl_balance = 0; - pa[k - 1]->avl_link[da[k - 1]] = w; - } else { - y->avl_link[1] = x->avl_link[0]; - x->avl_link[0] = y; - pa[k - 1]->avl_link[da[k - 1]] = x; - if (x->avl_balance == 0) { - x->avl_balance = -1; - y->avl_balance = +1; - break; - } else - x->avl_balance = y->avl_balance = 0; - } - } - } else { - y->avl_balance--; - if (y->avl_balance == -1) - break; - else if (y->avl_balance == -2) { - struct avl_node *x = y->avl_link[0]; - if (x->avl_balance == +1) { - struct avl_node *w; - assert (x->avl_balance == +1); - w = x->avl_link[1]; - x->avl_link[1] = w->avl_link[0]; - w->avl_link[0] = x; - y->avl_link[0] = w->avl_link[1]; - w->avl_link[1] = y; - if (w->avl_balance == -1) - x->avl_balance = 0, y->avl_balance = +1; - else if (w->avl_balance == 0) - x->avl_balance = y->avl_balance = 0; - else /* |w->avl_balance == +1| */ - x->avl_balance = -1, y->avl_balance = 0; - w->avl_balance = 0; - pa[k - 1]->avl_link[da[k - 1]] = w; - } else { - y->avl_link[0] = x->avl_link[1]; - x->avl_link[1] = y; - pa[k - 1]->avl_link[da[k - 1]] = x; - if (x->avl_balance == 0) { - x->avl_balance = +1; - y->avl_balance = -1; - break; - } else - x->avl_balance = y->avl_balance = 0; - } - } - } - } - - tree->avl_count--; - tree->avl_generation++; - return (void *) item; -} - -/* Refreshes the stack of parent pointers in |trav| - and updates its generation number. */ -static void trav_refresh (struct avl_traverser *trav) -{ - assert (trav != NULL); - - trav->avl_generation = trav->avl_table->avl_generation; - - if (trav->avl_node != NULL) { - avl_comparison_func *cmp = trav->avl_table->avl_compare; - void *param = trav->avl_table->avl_param; - struct avl_node *node = trav->avl_node; - struct avl_node *i; - - trav->avl_height = 0; - for (i = trav->avl_table->avl_root; i != node;) { - assert (trav->avl_height < AVL_MAX_HEIGHT); - assert (i != NULL); - - trav->avl_stack[trav->avl_height++] = i; - i = i->avl_link[cmp (node->avl_data, i->avl_data, param) > 0]; - } - } -} - -/* Initializes |trav| for use with |tree| - and selects the null node. */ -void avl_t_init (struct avl_traverser *trav, struct avl_table *tree) -{ - trav->avl_table = tree; - trav->avl_node = NULL; - trav->avl_height = 0; - trav->avl_generation = tree->avl_generation; -} - -/* Initializes |trav| for |tree| - and selects and returns a pointer to its least-valued item. - Returns |NULL| if |tree| contains no nodes. */ -void *avl_t_first (struct avl_traverser *trav, struct avl_table *tree) -{ - struct avl_node *x; - - assert (tree != NULL && trav != NULL); - - trav->avl_table = tree; - trav->avl_height = 0; - trav->avl_generation = tree->avl_generation; - - x = tree->avl_root; - if (x != NULL) - while (x->avl_link[0] != NULL) { - assert (trav->avl_height < AVL_MAX_HEIGHT); - trav->avl_stack[trav->avl_height++] = x; - x = x->avl_link[0]; - } - trav->avl_node = x; - - return x != NULL ? x->avl_data : NULL; -} - -/* Initializes |trav| for |tree| - and selects and returns a pointer to its greatest-valued item. - Returns |NULL| if |tree| contains no nodes. */ -void *avl_t_last (struct avl_traverser *trav, struct avl_table *tree) -{ - struct avl_node *x; - - assert (tree != NULL && trav != NULL); - - trav->avl_table = tree; - trav->avl_height = 0; - trav->avl_generation = tree->avl_generation; - - x = tree->avl_root; - if (x != NULL) - while (x->avl_link[1] != NULL) { - assert (trav->avl_height < AVL_MAX_HEIGHT); - trav->avl_stack[trav->avl_height++] = x; - x = x->avl_link[1]; - } - trav->avl_node = x; - - return x != NULL ? x->avl_data : NULL; -} - -/* Searches for |item| in |tree|. - If found, initializes |trav| to the item found and returns the item - as well. - If there is no matching item, initializes |trav| to the null item - and returns |NULL|. */ -void *avl_t_find (struct avl_traverser *trav, struct avl_table *tree, - void *item) -{ - struct avl_node *p, *q; - - assert (trav != NULL && tree != NULL && item != NULL); - trav->avl_table = tree; - trav->avl_height = 0; - trav->avl_generation = tree->avl_generation; - for (p = tree->avl_root; p != NULL; p = q) { - int cmp = tree->avl_compare (item, p->avl_data, tree->avl_param); - - if (cmp < 0) - q = p->avl_link[0]; - else if (cmp > 0) - q = p->avl_link[1]; - else { /* |cmp == 0| */ - - trav->avl_node = p; - return p->avl_data; - } - - assert (trav->avl_height < AVL_MAX_HEIGHT); - trav->avl_stack[trav->avl_height++] = p; - } - - trav->avl_height = 0; - trav->avl_node = NULL; - return NULL; -} - -/* Attempts to insert |item| into |tree|. - If |item| is inserted successfully, it is returned and |trav| is - initialized to its location. - If a duplicate is found, it is returned and |trav| is initialized to - its location. No replacement of the item occurs. - If a memory allocation failure occurs, |NULL| is returned and |trav| - is initialized to the null item. */ -void *avl_t_insert (struct avl_traverser *trav, struct avl_table *tree, - void *item) -{ - void **p; - - assert (trav != NULL && tree != NULL && item != NULL); - - p = avl_probe (tree, item); - if (p != NULL) { - trav->avl_table = tree; - trav->avl_node = ((struct avl_node *) - ((char *) p - offsetof (struct avl_node, avl_data))); - trav->avl_generation = tree->avl_generation - 1; - return *p; - } else { - avl_t_init (trav, tree); - return NULL; - } -} - -/* Initializes |trav| to have the same current node as |src|. */ -void *avl_t_copy (struct avl_traverser *trav, const struct avl_traverser *src) -{ - assert (trav != NULL && src != NULL); - - if (trav != src) { - trav->avl_table = src->avl_table; - trav->avl_node = src->avl_node; - trav->avl_generation = src->avl_generation; - if (trav->avl_generation == trav->avl_table->avl_generation) { - trav->avl_height = src->avl_height; - memcpy (trav->avl_stack, (const void *) src->avl_stack, - sizeof *trav->avl_stack * trav->avl_height); - } - } - - return trav->avl_node != NULL ? trav->avl_node->avl_data : NULL; -} - -/* Returns the next data item in inorder - within the tree being traversed with |trav|, - or if there are no more data items returns |NULL|. */ -void *avl_t_next (struct avl_traverser *trav) -{ - struct avl_node *x; - - assert (trav != NULL); - - if (trav->avl_generation != trav->avl_table->avl_generation) - trav_refresh (trav); - - x = trav->avl_node; - if (x == NULL) { - return avl_t_first (trav, trav->avl_table); - } else if (x->avl_link[1] != NULL) { - assert (trav->avl_height < AVL_MAX_HEIGHT); - trav->avl_stack[trav->avl_height++] = x; - x = x->avl_link[1]; - - while (x->avl_link[0] != NULL) { - assert (trav->avl_height < AVL_MAX_HEIGHT); - trav->avl_stack[trav->avl_height++] = x; - x = x->avl_link[0]; - } - } else { - struct avl_node *y; - - do { - if (trav->avl_height == 0) { - trav->avl_node = NULL; - return NULL; - } - - y = x; - x = trav->avl_stack[--trav->avl_height]; - } - while (y == x->avl_link[1]); - } - trav->avl_node = x; - - return x->avl_data; -} - -/* Returns the previous data item in inorder - within the tree being traversed with |trav|, - or if there are no more data items returns |NULL|. */ -void *avl_t_prev (struct avl_traverser *trav) -{ - struct avl_node *x; - - assert (trav != NULL); - - if (trav->avl_generation != trav->avl_table->avl_generation) - trav_refresh (trav); - - x = trav->avl_node; - if (x == NULL) { - return avl_t_last (trav, trav->avl_table); - } else if (x->avl_link[0] != NULL) { - assert (trav->avl_height < AVL_MAX_HEIGHT); - trav->avl_stack[trav->avl_height++] = x; - x = x->avl_link[0]; - - while (x->avl_link[1] != NULL) { - assert (trav->avl_height < AVL_MAX_HEIGHT); - trav->avl_stack[trav->avl_height++] = x; - x = x->avl_link[1]; - } - } else { - struct avl_node *y; - - do { - if (trav->avl_height == 0) { - trav->avl_node = NULL; - return NULL; - } - - y = x; - x = trav->avl_stack[--trav->avl_height]; - } - while (y == x->avl_link[0]); - } - trav->avl_node = x; - - return x->avl_data; -} - -/* Returns |trav|'s current item. */ -void *avl_t_cur (struct avl_traverser *trav) -{ - assert (trav != NULL); - - return trav->avl_node != NULL ? trav->avl_node->avl_data : NULL; -} - -/* Replaces the current item in |trav| by |new| and returns the item replaced. - |trav| must not have the null item selected. - The new item must not upset the ordering of the tree. */ -void *avl_t_replace (struct avl_traverser *trav, void *new) -{ - void *old; - - assert (trav != NULL && trav->avl_node != NULL && new != NULL); - old = trav->avl_node->avl_data; - trav->avl_node->avl_data = new; - return old; -} - -static void -copy_error_recovery (struct avl_node **stack, int height, - struct avl_table *new, avl_item_func * destroy) -{ - assert (stack != NULL && height >= 0 && new != NULL); - - for (; height > 2; height -= 2) - stack[height - 1]->avl_link[1] = NULL; - avl_destroy (new, destroy); -} - -/* Copies |org| to a newly created tree, which is returned. - If |copy != NULL|, each data item in |org| is first passed to |copy|, - and the return values are inserted into the tree, - with |NULL| return values taken as indications of failure. - On failure, destroys the partially created new tree, - applying |destroy|, if non-null, to each item in the new tree so far, - and returns |NULL|. - If |allocator != NULL|, it is used for allocation in the new tree. - Otherwise, the same allocator used for |org| is used. */ -struct avl_table *avl_copy (const struct avl_table *org, avl_copy_func * copy, - avl_item_func * destroy, - struct libavl_allocator *allocator) -{ - struct avl_node *stack[2 * (AVL_MAX_HEIGHT + 1)]; - int height = 0; - - struct avl_table *new; - const struct avl_node *x; - struct avl_node *y; - - assert (org != NULL); - new = avl_create (org->avl_compare, org->avl_param, - allocator != NULL ? allocator : org->avl_alloc); - if (new == NULL) - return NULL; - new->avl_count = org->avl_count; - if (new->avl_count == 0) - return new; - - x = (const struct avl_node *) &org->avl_root; - y = (struct avl_node *) &new->avl_root; - for (;;) { - while (x->avl_link[0] != NULL) { - assert (height < 2 * (AVL_MAX_HEIGHT + 1)); - - y->avl_link[0] = - new->avl_alloc->libavl_malloc (new->avl_alloc, - sizeof *y->avl_link[0]); - if (y->avl_link[0] == NULL) { - if (y != (struct avl_node *) &new->avl_root) { - y->avl_data = NULL; - y->avl_link[1] = NULL; - } - - copy_error_recovery (stack, height, new, destroy); - return NULL; - } - - stack[height++] = (struct avl_node *) x; - stack[height++] = y; - x = x->avl_link[0]; - y = y->avl_link[0]; - } - y->avl_link[0] = NULL; - - for (;;) { - y->avl_balance = x->avl_balance; - if (copy == NULL) - y->avl_data = x->avl_data; - else { - y->avl_data = copy (x->avl_data, org->avl_param); - if (y->avl_data == NULL) { - y->avl_link[1] = NULL; - copy_error_recovery (stack, height, new, destroy); - return NULL; - } - } - - if (x->avl_link[1] != NULL) { - y->avl_link[1] = - new->avl_alloc->libavl_malloc (new->avl_alloc, - sizeof *y->avl_link[1]); - if (y->avl_link[1] == NULL) { - copy_error_recovery (stack, height, new, destroy); - return NULL; - } - - x = x->avl_link[1]; - y = y->avl_link[1]; - break; - } else - y->avl_link[1] = NULL; - - if (height <= 2) - return new; - - y = stack[--height]; - x = stack[--height]; - } - } -} - -/* Frees storage allocated for |tree|. - If |destroy != NULL|, applies it to each data item in inorder. */ -void avl_destroy (struct avl_table *tree, avl_item_func * destroy) -{ - struct avl_node *p, *q; - - assert (tree != NULL); - - for (p = tree->avl_root; p != NULL; p = q) - if (p->avl_link[0] == NULL) { - q = p->avl_link[1]; - if (destroy != NULL && p->avl_data != NULL) - destroy (p->avl_data, tree->avl_param); - tree->avl_alloc->libavl_free (tree->avl_alloc, p); - } else { - q = p->avl_link[0]; - p->avl_link[0] = q->avl_link[1]; - q->avl_link[1] = p; - } - - tree->avl_alloc->libavl_free (tree->avl_alloc, tree); -} - -/* Allocates |size| bytes of space using |malloc()|. - Returns a null pointer if allocation fails. */ -void *avl_malloc (struct libavl_allocator *allocator, size_t size) -{ - assert (allocator != NULL && size > 0); - return malloc (size); -} - -/* Frees |block|. */ -void avl_free (struct libavl_allocator *allocator, void *block) -{ - assert (allocator != NULL && block != NULL); - free (block); -} - -/* Default memory allocator that uses |malloc()| and |free()|. */ -struct libavl_allocator avl_allocator_default = { - avl_malloc, - avl_free -}; - -#undef NDEBUG -#include - -/* Asserts that |avl_insert()| succeeds at inserting |item| into |table|. */ -void - (avl_assert_insert) (struct avl_table * table, void *item) { - void **p = avl_probe (table, item); - assert (p != NULL && *p == item); -} - -/* Asserts that |avl_delete()| really removes |item| from |table|, - and returns the removed item. */ -void *(avl_assert_delete) (struct avl_table * table, void *item) { - void *p = avl_delete (table, item); - assert (p != NULL); - return p; -} diff --git a/Build/source/texk/web2c/luatexdir/mp/avl.h b/Build/source/texk/web2c/luatexdir/mp/avl.h deleted file mode 100644 index acdf8bacc53..00000000000 --- a/Build/source/texk/web2c/luatexdir/mp/avl.h +++ /dev/null @@ -1,118 +0,0 @@ -/* Produced by texiweb from libavl.w on 2003/01/06 at 18:07. */ - -/* libavl - library for manipulation of binary trees. - Copyright (C) 1998-2002 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - 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., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. - - The author may be contacted at on the Internet, or - write to Ben Pfaff, Stanford University, Computer Science Dept., 353 - Serra Mall, Stanford CA 94305, USA. -*/ - -#ifndef AVL_H -# define AVL_H 1 - -# include -# if defined(__cplusplus) -extern "C" { -# endif - - -/* Function types. */ - typedef int avl_comparison_func (const void *avl_a, const void *avl_b, - void *avl_param); - typedef void avl_item_func (void *avl_item, void *avl_param); - typedef void *avl_copy_func (void *avl_item, void *avl_param); - -# ifndef LIBAVL_ALLOCATOR -# define LIBAVL_ALLOCATOR -/* Memory allocator. */ - struct libavl_allocator { - void *(*libavl_malloc) (struct libavl_allocator *, size_t libavl_size); - void (*libavl_free) (struct libavl_allocator *, void *libavl_block); - }; -# endif - -/* Default memory allocator. */ - extern struct libavl_allocator avl_allocator_default; - void *avl_malloc (struct libavl_allocator *, size_t); - void avl_free (struct libavl_allocator *, void *); - -/* Maximum AVL height. */ -# ifndef AVL_MAX_HEIGHT -# define AVL_MAX_HEIGHT 32 -# endif - -/* Tree data structure. */ - struct avl_table { - struct avl_node *avl_root; /* Tree's root. */ - avl_comparison_func *avl_compare; /* Comparison function. */ - void *avl_param; /* Extra argument to |avl_compare|. */ - struct libavl_allocator *avl_alloc; /* Memory allocator. */ - size_t avl_count; /* Number of items in tree. */ - unsigned long avl_generation; /* Generation number. */ - }; - -/* An AVL tree node. */ - struct avl_node { - struct avl_node *avl_link[2]; /* Subtrees. */ - void *avl_data; /* Pointer to data. */ - signed char avl_balance; /* Balance factor. */ - }; - -/* AVL traverser structure. */ - struct avl_traverser { - struct avl_table *avl_table; /* Tree being traversed. */ - struct avl_node *avl_node; /* Current node in tree. */ - struct avl_node *avl_stack[AVL_MAX_HEIGHT]; - /* All the nodes above |avl_node|. */ - size_t avl_height; /* Number of nodes in |avl_parent|. */ - unsigned long avl_generation; /* Generation number. */ - }; - -/* Table functions. */ - struct avl_table *avl_create (avl_comparison_func *, void *, - struct libavl_allocator *); - struct avl_table *avl_copy (const struct avl_table *, avl_copy_func *, - avl_item_func *, struct libavl_allocator *); - void avl_destroy (struct avl_table *, avl_item_func *); - void **avl_probe (struct avl_table *, void *); - void *avl_insert (struct avl_table *, void *); - void *avl_replace (struct avl_table *, void *); - void *avl_delete (struct avl_table *, const void *); - void *avl_find (const struct avl_table *, const void *); - void avl_assert_insert (struct avl_table *, void *); - void *avl_assert_delete (struct avl_table *, void *); - -# define avl_count(table) ((size_t) (table)->avl_count) - -/* Table traverser functions. */ - void avl_t_init (struct avl_traverser *, struct avl_table *); - void *avl_t_first (struct avl_traverser *, struct avl_table *); - void *avl_t_last (struct avl_traverser *, struct avl_table *); - void *avl_t_find (struct avl_traverser *, struct avl_table *, void *); - void *avl_t_insert (struct avl_traverser *, struct avl_table *, void *); - void *avl_t_copy (struct avl_traverser *, const struct avl_traverser *); - void *avl_t_next (struct avl_traverser *); - void *avl_t_prev (struct avl_traverser *); - void *avl_t_cur (struct avl_traverser *); - void *avl_t_replace (struct avl_traverser *, void *); - -# if defined(__cplusplus) -} -# endif -#endif /* avl.h */ diff --git a/Build/source/texk/web2c/luatexdir/mp/lmplib.c b/Build/source/texk/web2c/luatexdir/mp/lmplib.c deleted file mode 100644 index 7bea10e1406..00000000000 --- a/Build/source/texk/web2c/luatexdir/mp/lmplib.c +++ /dev/null @@ -1,1238 +0,0 @@ -/* lmplib.c - - Copyright 2006-2008 Taco Hoekwater - - This file is part of LuaTeX. - - LuaTeX is free software; you can redistribute it and/or modify it under - the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your - option) any later version. - - LuaTeX is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. - - You should have received a copy of the GNU General Public License along - with LuaTeX; if not, see . */ - -#include "config.h" -#include -#include -#include -#include /* temporary */ - -#ifndef pdfTeX -# include -# include -# include -#else -# include <../lua51/lua.h> -# include <../lua51/lauxlib.h> -# include <../lua51/lualib.h> -#endif - -#include "mplib.h" -#include "mplibps.h" - - /*@unused@*/ static const char _svn_version[] = - "$Id: lmplib.c 1364 2008-07-04 16:09:46Z taco $ $URL: http://scm.foundry.supelec.fr/svn/luatex/trunk/src/texk/web2c/luatexdir/lua/lmplib.c $"; - -/* metatable identifiers and tests */ - -#define MPLIB_METATABLE "MPlib" -#define MPLIB_FIG_METATABLE "MPlib.fig" -#define MPLIB_GR_METATABLE "MPlib.gr" - -#define is_mp(L,b) (MP *)luaL_checkudata(L,b,MPLIB_METATABLE) -#define is_fig(L,b) (struct mp_edge_object **)luaL_checkudata(L,b,MPLIB_FIG_METATABLE) -#define is_gr_object(L,b) (struct mp_graphic_object **)luaL_checkudata(L,b,MPLIB_GR_METATABLE) - -/* Lua string pre-hashing */ - -#define mplib_init_S(a) do { \ - lua_pushliteral(L,#a); \ - mplib_##a##_ptr = (char *)lua_tostring(L,-1); \ - mplib_##a##_index = luaL_ref (L,LUA_REGISTRYINDEX); \ - } while (0) - -#define mplib_push_S(a) do { \ - lua_rawgeti(L,LUA_REGISTRYINDEX,mplib_##a##_index); \ - } while (0) - -#define mplib_is_S(a,i) (mplib_##a##_ptr==(char *)lua_tostring(L,i)) - -#define mplib_make_S(a) \ - static int mplib_##a##_index = 0; \ - static char *mplib_##a##_ptr = NULL - -static int mplib_type_Ses[mp_special_code + 1] = { 0 }; /* [0] is not used */ - -mplib_make_S(fill); -mplib_make_S(outline); -mplib_make_S(text); -mplib_make_S(special); -mplib_make_S(start_bounds); -mplib_make_S(stop_bounds); -mplib_make_S(start_clip); -mplib_make_S(stop_clip); - -mplib_make_S(left_type); -mplib_make_S(right_type); -mplib_make_S(x_coord); -mplib_make_S(y_coord); -mplib_make_S(left_x); -mplib_make_S(left_y); -mplib_make_S(right_x); -mplib_make_S(right_y); - -mplib_make_S(color); -mplib_make_S(dash); -mplib_make_S(depth); -mplib_make_S(dsize); -mplib_make_S(font); -mplib_make_S(height); -mplib_make_S(htap); -mplib_make_S(linecap); -mplib_make_S(linejoin); -mplib_make_S(miterlimit); -mplib_make_S(path); -mplib_make_S(pen); -mplib_make_S(postscript); -mplib_make_S(prescript); -mplib_make_S(transform); -mplib_make_S(type); -mplib_make_S(width); - -static void mplib_init_Ses(lua_State * L) -{ - mplib_init_S(fill); - mplib_init_S(outline); - mplib_init_S(text); - mplib_init_S(start_bounds); - mplib_init_S(stop_bounds); - mplib_init_S(start_clip); - mplib_init_S(stop_clip); - mplib_init_S(special); - - mplib_type_Ses[mp_fill_code] = mplib_fill_index; - mplib_type_Ses[mp_stroked_code] = mplib_outline_index; - mplib_type_Ses[mp_text_code] = mplib_text_index; - mplib_type_Ses[mp_start_bounds_code] = mplib_start_bounds_index; - mplib_type_Ses[mp_stop_bounds_code] = mplib_stop_bounds_index; - mplib_type_Ses[mp_start_clip_code] = mplib_start_clip_index; - mplib_type_Ses[mp_stop_clip_code] = mplib_stop_clip_index; - mplib_type_Ses[mp_special_code] = mplib_special_index; - - mplib_init_S(left_type); - mplib_init_S(right_type); - mplib_init_S(x_coord); - mplib_init_S(y_coord); - mplib_init_S(left_x); - mplib_init_S(left_y); - mplib_init_S(right_x); - mplib_init_S(right_y); - - mplib_init_S(color); - mplib_init_S(dash); - mplib_init_S(depth); - mplib_init_S(dsize); - mplib_init_S(font); - mplib_init_S(height); - mplib_init_S(htap); - mplib_init_S(linecap); - mplib_init_S(linejoin); - mplib_init_S(miterlimit); - mplib_init_S(path); - mplib_init_S(pen); - mplib_init_S(postscript); - mplib_init_S(prescript); - mplib_init_S(transform); - mplib_init_S(type); - mplib_init_S(width); -} - - -/* Enumeration arrays to map MPlib enums to Lua strings */ - -static const char *interaction_options[] = - { "unknown", "batch", "nonstop", "scroll", "errorstop", NULL }; - -static const char *mplib_filetype_names[] = - { "term", "error", "mp", "log", "ps", "mem", "tfm", "map", "pfb", "enc", NULL }; - -static const char *knot_type_enum[] = - { "endpoint", "explicit", "given", "curl", "open", "end_cycle" }; - -static const char *fill_fields[] = - { "type", "path", "htap", "pen", "color", "linejoin", "miterlimit", - "prescript", "postscript", NULL }; - -static const char *stroked_fields[] = - { "type", "path", "pen", "color", "linejoin", "miterlimit", "linecap", - "dash", "prescript", "postscript", NULL }; - -static const char *text_fields[] = - { "type", "text", "dsize", "font", "color", "width", "height", "depth", - "transform", "prescript", "postscript", NULL }; - -static const char *special_fields[] = - { "type", "prescript", NULL }; - -static const char *start_bounds_fields[] = - { "type", "path", NULL }; - -static const char *start_clip_fields[] = - { "type", "path", NULL }; - -static const char *stop_bounds_fields[] = - { "type", NULL }; - -static const char *stop_clip_fields[] = - { "type", NULL }; - -static const char *no_fields[] = - { NULL }; - - -/* The list of supported MPlib options (not all make sense) */ - -typedef enum { - P_ERROR_LINE, P_MAX_LINE, - P_MAIN_MEMORY, P_HASH_SIZE, P_PARAM_SIZE, P_IN_OPEN, P_RANDOM_SEED, - P_INTERACTION, P_INI_VERSION, P_MEM_NAME, P_JOB_NAME, P_FIND_FILE, - P__SENTINEL } mplib_parm_idx; - -typedef struct { - const char *name; /* parameter name */ - mplib_parm_idx idx; /* parameter index */ -} mplib_parm_struct; - -static mplib_parm_struct mplib_parms[] = { - {"error_line", P_ERROR_LINE }, - {"print_line", P_MAX_LINE }, - {"main_memory", P_MAIN_MEMORY }, - {"hash_size", P_HASH_SIZE }, - {"param_size", P_PARAM_SIZE }, - {"max_in_open", P_IN_OPEN }, - {"random_seed", P_RANDOM_SEED }, - {"interaction", P_INTERACTION }, - {"ini_version", P_INI_VERSION }, - {"mem_name", P_MEM_NAME }, - {"job_name", P_JOB_NAME }, - {"find_file", P_FIND_FILE }, - {NULL, P__SENTINEL } -}; - - -/* Start by defining the needed callback routines for the library */ - -static char *mplib_find_file(MP mp, const char *fname, const char *fmode, int ftype) -{ - lua_State *L = (lua_State *)mp_userdata(mp); - lua_checkstack(L, 4); - lua_getfield(L, LUA_REGISTRYINDEX, "mplib_file_finder"); - if (lua_isfunction(L, -1)) { - char *s = NULL, *x = NULL; - lua_pushstring(L, fname); - lua_pushstring(L, fmode); - if (ftype >= mp_filetype_text) { - lua_pushnumber(L, (lua_Number)(ftype - mp_filetype_text)); - } else { - lua_pushstring(L, mplib_filetype_names[ftype]); - } - if (lua_pcall(L, 3, 1, 0) != 0) { - fprintf(stdout, "Error in mp.find_file: %s\n", - (char *) lua_tostring(L, -1)); - return NULL; - } - x = (char *) lua_tostring(L, -1); - if (x != NULL) - s = strdup(x); - lua_pop(L, 1); /* pop the string */ - return s; - } else { - lua_pop(L, 1); - } - if (fmode[0] != 'r' || (!access(fname, R_OK)) || ftype) { - return strdup(fname); - } - return NULL; -} - -static int mplib_find_file_function(lua_State * L) -{ - if (!(lua_isfunction(L, -1) || lua_isnil(L, -1))) { - return 1; /* error */ - } - lua_pushstring(L, "mplib_file_finder"); - lua_pushvalue(L, -2); - lua_rawset(L, LUA_REGISTRYINDEX); - return 0; -} - -#define xfree(A) if ((A)!=NULL) { free((A)); A = NULL; } - -static int mplib_new(lua_State * L) -{ - MP *mp_ptr; - mp_ptr = lua_newuserdata(L, sizeof(MP *)); - if (mp_ptr) { - int i; - struct MP_options *options = mp_options(); - options->userdata = (void *) L; - options->noninteractive = 1; /* required ! */ - options->find_file = mplib_find_file; - options->print_found_names = 1; - if (lua_type(L, 1) == LUA_TTABLE) { - for (i = 0; mplib_parms[i].name != NULL; i++) { - lua_getfield(L, 1, mplib_parms[i].name); - if (lua_isnil(L, -1)) { - lua_pop(L, 1); - continue; /* skip unset */ - } - switch (mplib_parms[i].idx) { - case P_ERROR_LINE: - options->error_line = (int)lua_tointeger(L, -1); - if (options->error_line<60) options->error_line =60; - if (options->error_line>250) options->error_line = 250; - options->half_error_line = (options->error_line/2)+10; - break; - case P_MAX_LINE: - options->max_print_line = (int)lua_tointeger(L, -1); - if (options->max_print_line<60) options->max_print_line = 60; - break; - case P_MAIN_MEMORY: - options->main_memory = (int)lua_tointeger(L, -1); - break; - case P_HASH_SIZE: - options->hash_size = (unsigned)lua_tointeger(L, -1); - break; - case P_PARAM_SIZE: - options->param_size = (int)lua_tointeger(L, -1); - break; - case P_IN_OPEN: - options->max_in_open = (int)lua_tointeger(L, -1); - break; - case P_RANDOM_SEED: - options->random_seed = (int)lua_tointeger(L, -1); - break; - case P_INTERACTION: - options->interaction = - luaL_checkoption(L, -1, "errorstopmode", - interaction_options); - break; - case P_INI_VERSION: - options->ini_version = lua_toboolean(L, -1); - break; - case P_MEM_NAME: - options->mem_name = strdup((char *) lua_tostring(L, -1)); - break; - case P_JOB_NAME: - options->job_name = strdup((char *) lua_tostring(L, -1)); - break; - case P_FIND_FILE: - if (mplib_find_file_function(L)) { /* error here */ - fprintf(stdout, - "Invalid arguments to mp.new({find_file=...})\n"); - } - break; - default: - break; - } - lua_pop(L, 1); - } - } - *mp_ptr = mp_initialize(options); - xfree(options->command_line); - xfree(options->mem_name); - free(options); - if (*mp_ptr) { - luaL_getmetatable(L, MPLIB_METATABLE); - lua_setmetatable(L, -2); - return 1; - } - } - lua_pushnil(L); - return 1; -} - -static int mplib_collect(lua_State * L) -{ - MP *mp_ptr = is_mp(L, 1); - if (*mp_ptr != NULL) { - (void)mp_finish(*mp_ptr); - *mp_ptr = NULL; - } - return 0; -} - -static int mplib_tostring(lua_State * L) -{ - MP *mp_ptr = is_mp(L, 1); - if (*mp_ptr != NULL) { - (void)lua_pushfstring(L, "", *mp_ptr); - return 1; - } - return 0; -} - -static int mplib_wrapresults(lua_State * L, mp_run_data *res, int status) -{ - lua_checkstack(L, 5); - lua_newtable(L); - if (res->term_out.size != 0) { - lua_pushstring(L, res->term_out.data); - lua_setfield(L, -2, "term"); - } - if (res->error_out.size != 0) { - lua_pushstring(L, res->error_out.data); - lua_setfield(L, -2, "error"); - } - if (res->log_out.size != 0) { - lua_pushstring(L, res->log_out.data); - lua_setfield(L, -2, "log"); - } - if (res->edges != NULL) { - struct mp_edge_object **v; - struct mp_edge_object *p = res->edges; - int i = 1; - lua_newtable(L); - while (p != NULL) { - v = lua_newuserdata(L, sizeof(struct mp_edge_object *)); - *v = p; - luaL_getmetatable(L, MPLIB_FIG_METATABLE); - lua_setmetatable(L, -2); - lua_rawseti(L, -2, i); - i++; - p = p->next; - } - lua_setfield(L, -2, "fig"); - res->edges = NULL; - } - lua_pushnumber(L, (lua_Number)status); - lua_setfield(L, -2, "status"); - return 1; -} - -static int mplib_execute(lua_State * L) -{ - MP *mp_ptr = is_mp(L, 1); - if (*mp_ptr != NULL && lua_isstring(L, 2)) { - size_t l; - char *s = (char *) lua_tolstring(L, 2, &l); - int h = mp_execute(*mp_ptr, s, l); - mp_run_data *res = mp_rundata(*mp_ptr); - return mplib_wrapresults(L, res, h); - } else { - lua_pushnil(L); - } - return 1; -} - -static int mplib_finish(lua_State * L) -{ - MP *mp_ptr = is_mp(L, 1); - if (*mp_ptr != NULL) { - int i; - int h = mp_execute(*mp_ptr,NULL,0); - mp_run_data *res = mp_rundata(*mp_ptr); - i = mplib_wrapresults(L, res, h); - (void)mp_finish(*mp_ptr); - *mp_ptr = NULL; - return i; - } else { - lua_pushnil(L); - } - return 1; -} - -static int mplib_char_dimension(lua_State * L, int t) -{ - MP *mp_ptr = is_mp(L, 1); - if (*mp_ptr != NULL) { - char *fname = (char *)luaL_checkstring(L,2); - int charnum = (int)luaL_checkinteger(L,3); - if (charnum<0 || charnum>255) { - lua_pushnumber(L, (lua_Number)0); - } else { - lua_pushnumber(L,(lua_Number)mp_get_char_dimension(*mp_ptr,fname,charnum,t)); - } - } else { - lua_pushnumber(L, (lua_Number)0); - } - return 1; -} - -static int mplib_charwidth(lua_State * L) -{ - return mplib_char_dimension(L, 'w'); -} - -static int mplib_chardepth(lua_State * L) -{ - return mplib_char_dimension(L, 'd'); -} - -static int mplib_charheight(lua_State * L) -{ - return mplib_char_dimension(L, 'h'); -} - -static int mplib_version(lua_State * L) -{ - char *s = mp_metapost_version(); - lua_pushstring(L, s); - free(s); - return 1; -} - -static int mplib_statistics(lua_State * L) -{ - MP *mp_ptr = is_mp(L, 1); - if (*mp_ptr != NULL) { - lua_newtable(L); - lua_pushnumber(L, (lua_Number)mp_memory_usage(*mp_ptr)); - lua_setfield(L, -2, "main_memory"); - lua_pushnumber(L, (lua_Number)mp_hash_usage(*mp_ptr)); - lua_setfield(L, -2, "hash_size"); - lua_pushnumber(L, (lua_Number)mp_param_usage(*mp_ptr)); - lua_setfield(L, -2, "param_size"); - lua_pushnumber(L, (lua_Number)mp_open_usage(*mp_ptr)); - lua_setfield(L, -2, "max_in_open"); - } else { - lua_pushnil(L); - } - return 1; -} - - -/* figure methods */ - -static int mplib_fig_collect(lua_State * L) -{ - struct mp_edge_object **hh = is_fig(L, 1); - if (*hh != NULL) { - mp_gr_toss_objects(*hh); - *hh = NULL; - } - return 0; -} - -static int mplib_fig_body(lua_State * L) -{ - int i = 1; - struct mp_graphic_object **v; - struct mp_graphic_object *p; - struct mp_edge_object **hh = is_fig(L, 1); - lua_newtable(L); - p = (*hh)->body; - while (p != NULL) { - v = lua_newuserdata(L, sizeof(struct mp_graphic_object *)); - *v = p; - luaL_getmetatable(L, MPLIB_GR_METATABLE); - lua_setmetatable(L, -2); - lua_rawseti(L, -2, i); - i++; - p = p->next; - } - (*hh)->body = NULL; /* prevent double free */ - return 1; -} - -static int mplib_fig_copy_body(lua_State * L) -{ - int i = 1; - struct mp_graphic_object **v; - struct mp_graphic_object *p; - struct mp_edge_object **hh = is_fig(L, 1); - lua_newtable(L); - p = (*hh)->body; - while (p != NULL) { - v = lua_newuserdata(L, sizeof(struct mp_graphic_object *)); - *v = mp_gr_copy_object((*hh)->parent, p); - luaL_getmetatable(L, MPLIB_GR_METATABLE); - lua_setmetatable(L, -2); - lua_rawseti(L, -2, i); - i++; - p = p->next; - } - return 1; -} - - -static int mplib_fig_tostring(lua_State * L) -{ - struct mp_edge_object **hh = is_fig(L, 1); - (void)lua_pushfstring(L, "
", *hh); - return 1; -} - -static int mplib_fig_postscript(lua_State * L) -{ - mp_run_data *res; - struct mp_edge_object **hh = is_fig(L, 1); - int prologues = (int)luaL_optnumber(L, 2, (lua_Number)-1); - int procset = (int)luaL_optnumber(L, 3, (lua_Number)-1); - if (mp_ps_ship_out(*hh, prologues, procset) - && (res = mp_rundata((*hh)->parent)) - && (res->ps_out.size != 0)) { - lua_pushstring(L, res->ps_out.data); - } else { - lua_pushnil(L); - } - return 1; -} - -static int mplib_fig_filename(lua_State * L) -{ - struct mp_edge_object **hh = is_fig(L, 1); - if (*hh != NULL) { - char *s = (*hh)->filename; - lua_pushstring(L, s); - } else { - lua_pushnil(L); - } - return 1; -} - -static int mplib_fig_width(lua_State * L) -{ - struct mp_edge_object **hh = is_fig(L, 1); - if (*hh != NULL) { - lua_pushnumber(L, (double) (*hh)->width / 65536.0); - } else { - lua_pushnil(L); - } - return 1; -} - -static int mplib_fig_height(lua_State * L) -{ - struct mp_edge_object **hh = is_fig(L, 1); - if (*hh != NULL) { - lua_pushnumber(L, (double) (*hh)->height / 65536.0); - } else { - lua_pushnil(L); - } - return 1; -} - -static int mplib_fig_depth(lua_State * L) -{ - struct mp_edge_object **hh = is_fig(L, 1); - if (*hh != NULL) { - lua_pushnumber(L, (double) (*hh)->depth / 65536.0); - } else { - lua_pushnil(L); - } - return 1; -} - -static int mplib_fig_italcorr(lua_State * L) -{ - struct mp_edge_object **hh = is_fig(L, 1); - if (*hh != NULL) { - lua_pushnumber(L, (double) (*hh)->ital_corr / 65536.0); - } else { - lua_pushnil(L); - } - return 1; -} - -static int mplib_fig_charcode(lua_State * L) -{ - struct mp_edge_object **hh = is_fig(L, 1); - if (*hh != NULL) { - lua_pushnumber(L, (lua_Number)(*hh)->charcode); - } else { - lua_pushnil(L); - } - return 1; -} - - - -static int mplib_fig_bb(lua_State * L) -{ - struct mp_edge_object **hh = is_fig(L, 1); - lua_newtable(L); - lua_pushnumber(L, (double) (*hh)->minx / 65536.0); - lua_rawseti(L, -2, 1); - lua_pushnumber(L, (double) (*hh)->miny / 65536.0); - lua_rawseti(L, -2, 2); - lua_pushnumber(L, (double) (*hh)->maxx / 65536.0); - lua_rawseti(L, -2, 3); - lua_pushnumber(L, (double) (*hh)->maxy / 65536.0); - lua_rawseti(L, -2, 4); - return 1; -} - -/* object methods */ - -static int mplib_gr_collect(lua_State * L) -{ - struct mp_graphic_object **hh = is_gr_object(L, 1); - if (*hh != NULL) { - mp_gr_toss_object(*hh); - *hh = NULL; - } - return 0; -} - -static int mplib_gr_tostring(lua_State * L) -{ - struct mp_graphic_object **hh = is_gr_object(L, 1); - (void)lua_pushfstring(L, "", *hh); - return 1; -} - -#define pyth(a,b) (sqrt((a)*(a) + (b)*(b))) - -#define aspect_bound (10.0/65536.0) -#define aspect_default (1.0/65536.0) - -static double eps = 0.0001; - -static double coord_range_x (mp_knot *h, double dz) { - double z; - double zlo = 0.0, zhi = 0.0; - mp_knot *f = h; - while (h != NULL) { - z = (double)h->x_coord; - if (z < zlo) zlo = z; else if (z > zhi) zhi = z; - z = (double)h->right_x; - if (z < zlo) zlo = z; else if (z > zhi) zhi = z; - z = (double)h->left_x; - if (z < zlo) zlo = z; else if (z > zhi) zhi = z; - h = h->next; - if (h==f) - break; - } - return (zhi - zlo <= dz ? aspect_bound : aspect_default); -} - -static double coord_range_y (mp_knot *h, double dz) { - double z; - double zlo = 0.0, zhi = 0.0; - mp_knot *f = h; - while (h != NULL) { - z = (double)h->y_coord; - if (z < zlo) zlo = z; else if (z > zhi) zhi = z; - z = (double)h->right_y; - if (z < zlo) zlo = z; else if (z > zhi) zhi = z; - z = (double)h->left_y; - if (z < zlo) zlo = z; else if (z > zhi) zhi = z; - h = h->next; - if (h==f) - break; - } - return (zhi - zlo <= dz ? aspect_bound : aspect_default); -} - - -static int mplib_gr_peninfo(lua_State * L) { - double x_coord, y_coord, left_x, left_y, right_x, right_y; - double wx, wy; - double rx = 1.0, sx = 0.0, sy = 0.0, ry = 1.0, tx = 0.0, ty = 0.0; - double divider = 1.0; - double width = 1.0; - mp_knot *p = NULL, *path = NULL; - struct mp_graphic_object **hh = is_gr_object(L, -1); - if (!*hh) { - lua_pushnil(L); - return 1; - } - if ((*hh)->type == mp_fill_code) { - p = ((mp_fill_object *)(*hh))->pen_p; - path = ((mp_fill_object *)(*hh))->path_p; - } else if ((*hh)->type == mp_stroked_code) { - p = ((mp_stroked_object *)(*hh))->pen_p; - path = ((mp_stroked_object *)(*hh))->path_p; - } - if (p==NULL || path == NULL) { - lua_pushnil(L); - return 1; - } - x_coord = p->x_coord/65536.0; - y_coord = p->y_coord/65536.0; - left_x = p->left_x/65536.0; - left_y = p->left_y/65536.0; - right_x = p->right_x/65536.0; - right_y = p->right_y/65536.0; - if ((right_x == x_coord) && (left_y == y_coord)) { - wx = fabs(left_x - x_coord); - wy = fabs(right_y - y_coord); - } else { - wx = pyth(left_x - x_coord, right_x - x_coord); - wy = pyth(left_y - y_coord, right_y - y_coord); - } - if ((wy/coord_range_x(path, wx)) >= (wx/coord_range_y(path, wy))) - width = wy; - else - width = wx; - tx = x_coord; - ty = y_coord; - sx = left_x - tx; - rx = left_y - ty; - ry = right_x - tx; - sy = right_y - ty; - if (width !=1.0) { - if (width == 0.0) { - sx = 1.0; sy = 1.0; - } else { - rx/=width; ry/=width; sx/=width; sy/=width; - } - } - if (fabs(sx) < eps) sx = eps; - if (fabs(sy) < eps) sy = eps; - divider = sx*sy - rx*ry; - lua_newtable(L); - lua_pushnumber(L,width); lua_setfield(L,-2,"width"); - lua_pushnumber(L,rx); lua_setfield(L,-2,"rx"); - lua_pushnumber(L,sx); lua_setfield(L,-2,"sx"); - lua_pushnumber(L,sy); lua_setfield(L,-2,"sy"); - lua_pushnumber(L,ry); lua_setfield(L,-2,"ry"); - lua_pushnumber(L,tx); lua_setfield(L,-2,"tx"); - lua_pushnumber(L,ty); lua_setfield(L,-2,"ty"); - return 1; -} - - -static int mplib_gr_fields(lua_State * L) -{ - const char **fields; - int i; - struct mp_graphic_object **hh = is_gr_object(L, 1); - if (*hh) { - switch ((*hh)->type) { - case mp_fill_code: - fields = fill_fields; - break; - case mp_stroked_code: - fields = stroked_fields; - break; - case mp_text_code: - fields = text_fields; - break; - case mp_special_code: - fields = special_fields; - break; - case mp_start_clip_code: - fields = start_clip_fields; - break; - case mp_start_bounds_code: - fields = start_bounds_fields; - break; - case mp_stop_clip_code: - fields = stop_clip_fields; - break; - case mp_stop_bounds_code: - fields = stop_bounds_fields; - break; - default: - fields = no_fields; - } - lua_newtable(L); - for (i = 0; fields[i] != NULL; i++) { - lua_pushstring(L, fields[i]); - lua_rawseti(L, -2, (i + 1)); - } - } else { - lua_pushnil(L); - } - return 1; -} - - -#define mplib_push_number(L,x) lua_pushnumber(L,(lua_Number)(x)/65536.0) - -#define MPLIB_PATH 0 -#define MPLIB_PEN 1 - -static void mplib_push_path(lua_State * L, struct mp_knot *h, int is_pen) -{ - struct mp_knot *p; /* for scanning the path */ - int i = 1; - p = h; - if (p != NULL) { - lua_newtable(L); - do { - lua_createtable(L, 0, 6); - if (!is_pen) { - if (p->left_type != mp_explicit) { - mplib_push_S(left_type); - lua_pushstring(L, knot_type_enum[p->left_type]); - lua_rawset(L, -3); - } - if (p->right_type != mp_explicit) { - mplib_push_S(right_type); - lua_pushstring(L, knot_type_enum[p->right_type]); - lua_rawset(L, -3); - } - } - mplib_push_S(x_coord); - mplib_push_number(L, p->x_coord); - lua_rawset(L, -3); - mplib_push_S(y_coord); - mplib_push_number(L, p->y_coord); - lua_rawset(L, -3); - mplib_push_S(left_x); - mplib_push_number(L, p->left_x); - lua_rawset(L, -3); - mplib_push_S(left_y); - mplib_push_number(L, p->left_y); - lua_rawset(L, -3); - mplib_push_S(right_x); - mplib_push_number(L, p->right_x); - lua_rawset(L, -3); - mplib_push_S(right_y); - mplib_push_number(L, p->right_y); - lua_rawset(L, -3); - lua_rawseti(L, -2, i); - i++; - if (p->right_type == mp_endpoint) { - return; - } - p = p->next; - } while (p != h); - } else { - lua_pushnil(L); - } -} - -/* this assumes that the top of the stack is a table - or nil already in the case - */ -static void mplib_push_pentype(lua_State * L, struct mp_knot *h) -{ - struct mp_knot *p; /* for scanning the path */ - p = h; - if (p == NULL) { - /* do nothing */ - } else if (p == p->next) { - mplib_push_S(type); - lua_pushstring(L, "elliptical"); - lua_rawset(L, -3); - } else { - } -} - -#define set_color_objects(pq) \ - object_color_model = pq->color_model; \ - object_color_a = pq->color.a_val; \ - object_color_b = pq->color.b_val; \ - object_color_c = pq->color.c_val; \ - object_color_d = pq->color.d_val; - - -static void mplib_push_color(lua_State * L, struct mp_graphic_object *p) -{ - int object_color_model; - int object_color_a, object_color_b, object_color_c, object_color_d; - if (p != NULL) { - if (p->type == mp_fill_code) { - mp_fill_object *h = (mp_fill_object *) p; - set_color_objects(h); - } else if (p->type == mp_stroked_code) { - mp_stroked_object *h = (mp_stroked_object *) p; - set_color_objects(h); - } else { - mp_text_object *h = (mp_text_object *) p; - set_color_objects(h); - } - lua_newtable(L); - if (object_color_model >= mp_grey_model) { - mplib_push_number(L, object_color_a); - lua_rawseti(L, -2, 1); - if (object_color_model >= mp_rgb_model) { - mplib_push_number(L, object_color_b); - lua_rawseti(L, -2, 2); - mplib_push_number(L, object_color_c); - lua_rawseti(L, -2, 3); - if (object_color_model == mp_cmyk_model) { - mplib_push_number(L, object_color_d); - lua_rawseti(L, -2, 4); - } - } - } - } else { - lua_pushnil(L); - } -} - -/* the dash scale is not exported, the field has no external value */ -static void mplib_push_dash(lua_State * L, struct mp_stroked_object *h) -{ - mp_dash_object *d; - double ds; - if (h != NULL && h->dash_p != NULL) { - d = h->dash_p; - lua_newtable(L); - mplib_push_number(L, d->offset); - lua_setfield(L, -2, "offset"); - if (d->array != NULL) { - int i = 0; - lua_newtable(L); - while (*(d->array + i) != -1) { - ds = *(d->array + i) / 65536.0; - lua_pushnumber(L, ds); - i++; - lua_rawseti(L, -2, i); - } - lua_setfield(L, -2, "dashes"); - } - } else { - lua_pushnil(L); - } -} - -static void mplib_push_transform(lua_State * L, struct mp_text_object *h) -{ - int i = 1; - if (h != NULL) { - lua_createtable(L, 6, 0); - mplib_push_number(L, h->tx); - lua_rawseti(L, -2, i); - i++; - mplib_push_number(L, h->ty); - lua_rawseti(L, -2, i); - i++; - mplib_push_number(L, h->txx); - lua_rawseti(L, -2, i); - i++; - mplib_push_number(L, h->tyx); - lua_rawseti(L, -2, i); - i++; - mplib_push_number(L, h->txy); - lua_rawseti(L, -2, i); - i++; - mplib_push_number(L, h->tyy); - lua_rawseti(L, -2, i); - i++; - } else { - lua_pushnil(L); - } -} - -#define FIELD(A) (mplib_is_S(A,2)) - -static void mplib_fill(lua_State * L, struct mp_fill_object *h) -{ - if (FIELD(path)) { - mplib_push_path(L, h->path_p, MPLIB_PATH); - } else if (FIELD(htap)) { - mplib_push_path(L, h->htap_p, MPLIB_PATH); - } else if (FIELD(pen)) { - mplib_push_path(L, h->pen_p, MPLIB_PEN); - mplib_push_pentype(L, h->pen_p); - } else if (FIELD(color)) { - mplib_push_color(L, (mp_graphic_object *) h); - } else if (FIELD(linejoin)) { - lua_pushnumber(L, (lua_Number)h->ljoin); - } else if (FIELD(miterlimit)) { - mplib_push_number(L, h->miterlim); - } else if (FIELD(prescript)) { - lua_pushstring(L, h->pre_script); - } else if (FIELD(postscript)) { - lua_pushstring(L, h->post_script); - } else { - lua_pushnil(L); - } -} - -static void mplib_stroked(lua_State * L, struct mp_stroked_object *h) -{ - if (FIELD(path)) { - mplib_push_path(L, h->path_p, MPLIB_PATH); - } else if (FIELD(pen)) { - mplib_push_path(L, h->pen_p, MPLIB_PEN); - mplib_push_pentype(L, h->pen_p); - } else if (FIELD(color)) { - mplib_push_color(L, (mp_graphic_object *) h); - } else if (FIELD(dash)) { - mplib_push_dash(L, h); - } else if (FIELD(linecap)) { - lua_pushnumber(L, (lua_Number)h->lcap); - } else if (FIELD(linejoin)) { - lua_pushnumber(L, (lua_Number)h->ljoin); - } else if (FIELD(miterlimit)) { - mplib_push_number(L, h->miterlim); - } else if (FIELD(prescript)) { - lua_pushstring(L, h->pre_script); - } else if (FIELD(postscript)) { - lua_pushstring(L, h->post_script); - } else { - lua_pushnil(L); - } -} - -static void mplib_text(lua_State * L, struct mp_text_object *h) -{ - if (FIELD(text)) { - lua_pushstring(L, h->text_p); - } else if (FIELD(dsize)) { - mplib_push_number(L, (h->font_dsize / 16)); - } else if (FIELD(font)) { - lua_pushstring(L, h->font_name); - } else if (FIELD(color)) { - mplib_push_color(L, (mp_graphic_object *) h); - } else if (FIELD(width)) { - mplib_push_number(L, h->width); - } else if (FIELD(height)) { - mplib_push_number(L, h->height); - } else if (FIELD(depth)) { - mplib_push_number(L, h->depth); - } else if (FIELD(transform)) { - mplib_push_transform(L, h); - } else if (FIELD(prescript)) { - lua_pushstring(L, h->pre_script); - } else if (FIELD(postscript)) { - lua_pushstring(L, h->post_script); - } else { - lua_pushnil(L); - } -} - -static void mplib_special(lua_State * L, struct mp_special_object *h) -{ - if (FIELD(prescript)) { - lua_pushstring(L, h->pre_script); - } else { - lua_pushnil(L); - } -} - -static void mplib_start_bounds(lua_State * L, struct mp_bounds_object *h) -{ - if (FIELD(path)) { - mplib_push_path(L, h->path_p, MPLIB_PATH); - } else { - lua_pushnil(L); - } -} - -static void mplib_start_clip(lua_State * L, struct mp_clip_object *h) -{ - if (FIELD(path)) { - mplib_push_path(L, h->path_p, MPLIB_PATH); - } else { - lua_pushnil(L); - } -} - -static int mplib_gr_index(lua_State * L) -{ - struct mp_graphic_object **hh = is_gr_object(L, 1); - if (*hh) { - struct mp_graphic_object *h = *hh; - - if (mplib_is_S(type, 2)) { - lua_rawgeti(L, LUA_REGISTRYINDEX, mplib_type_Ses[h->type]); - } else { - switch (h->type) { - case mp_fill_code: - mplib_fill(L, (mp_fill_object *) h); - break; - case mp_stroked_code: - mplib_stroked(L, (mp_stroked_object *) h); - break; - case mp_text_code: - mplib_text(L, (mp_text_object *) h); - break; - case mp_special_code: - mplib_special(L, (mp_special_object *) h); - break; - case mp_start_clip_code: - mplib_start_clip(L, (mp_clip_object *) h); - break; - case mp_start_bounds_code: - mplib_start_bounds(L, (mp_bounds_object *) h); - break; - case mp_stop_clip_code: - case mp_stop_bounds_code: - default: - lua_pushnil(L); - } - } - } else { - lua_pushnil(L); - } - return 1; -} - - -static const struct luaL_reg mplib_meta[] = { - {"__gc", mplib_collect}, - {"__tostring", mplib_tostring}, - {NULL, NULL} /* sentinel */ -}; - -static const struct luaL_reg mplib_fig_meta[] = { - {"__gc", mplib_fig_collect}, - {"__tostring", mplib_fig_tostring}, - {"objects", mplib_fig_body}, - {"copy_objects", mplib_fig_copy_body}, - {"filename", mplib_fig_filename}, - {"postscript", mplib_fig_postscript}, - {"boundingbox", mplib_fig_bb}, - {"width", mplib_fig_width}, - {"height", mplib_fig_height}, - {"depth", mplib_fig_depth}, - {"italcorr", mplib_fig_italcorr}, - {"charcode", mplib_fig_charcode}, - {NULL, NULL} /* sentinel */ -}; - -static const struct luaL_reg mplib_gr_meta[] = { - {"__gc", mplib_gr_collect}, - {"__tostring", mplib_gr_tostring}, - {"__index", mplib_gr_index}, - {NULL, NULL} /* sentinel */ -}; - -static const struct luaL_reg mplib_d[] = { - {"execute", mplib_execute}, - {"finish", mplib_finish}, - {"char_width", mplib_charwidth}, - {"char_height", mplib_charheight}, - {"char_depth", mplib_chardepth}, - {"statistics", mplib_statistics}, - {NULL, NULL} /* sentinel */ -}; - - -static const struct luaL_reg mplib_m[] = { - {"new", mplib_new}, - {"version", mplib_version}, - {"fields", mplib_gr_fields}, - {"pen_info", mplib_gr_peninfo}, - {NULL, NULL} /* sentinel */ -}; - - -int luaopen_mplib(lua_State * L) -{ - mplib_init_Ses(L); - - luaL_newmetatable(L, MPLIB_GR_METATABLE); - lua_pushvalue(L, -1); /* push metatable */ - lua_setfield(L, -2, "__index"); /* metatable.__index = metatable */ - luaL_register(L, NULL, mplib_gr_meta); /* object meta methods */ - lua_pop(L, 1); - - luaL_newmetatable(L, MPLIB_FIG_METATABLE); - lua_pushvalue(L, -1); /* push metatable */ - lua_setfield(L, -2, "__index"); /* metatable.__index = metatable */ - luaL_register(L, NULL, mplib_fig_meta); /* figure meta methods */ - lua_pop(L, 1); - - luaL_newmetatable(L, MPLIB_METATABLE); - lua_pushvalue(L, -1); /* push metatable */ - lua_setfield(L, -2, "__index"); /* metatable.__index = metatable */ - luaL_register(L, NULL, mplib_meta); /* meta methods */ - luaL_register(L, NULL, mplib_d); /* dict methods */ - luaL_register(L, "mplib", mplib_m); /* module functions */ - return 1; -} diff --git a/Build/source/texk/web2c/luatexdir/mp/memio.w b/Build/source/texk/web2c/luatexdir/mp/memio.w deleted file mode 100644 index 06bf9bf91d4..00000000000 --- a/Build/source/texk/web2c/luatexdir/mp/memio.w +++ /dev/null @@ -1,405 +0,0 @@ -% $Id: psout.w 616 2008-07-09 14:05:55Z taco $ -% -% Copyright 2008 Taco Hoekwater. -% -% This program is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 2 of the License, or -% (at your option) any later version. -% -% This program is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with this program. If not, see . -% -% TeX is a trademark of the American Mathematical Society. -% METAFONT is a trademark of Addison-Wesley Publishing Company. -% PostScript is a trademark of Adobe Systems Incorporated. - -% Here is TeX material that gets inserted after \input webmac - -\font\tenlogo=logo10 % font used for the METAFONT logo -\def\MP{{\tenlogo META}\-{\tenlogo POST}} -\def\title{MetaPost MEM reading and writing} -\def\topofcontents{\hsize 5.5in - \vglue -30pt plus 1fil minus 1.5in - \def\?##1]{\hbox to 1in{\hfil##1.\ }} - } -\def\botofcontents{\vskip 0pt plus 1fil minus 1.5in} -\pdfoutput=1 -\pageno=3 - -@ As usual, need true and false. - -@d true 1 -@d false 0 -@d null 0 /* the null pointer */ -@d incr(A) (A)=(A)+1 /* increase a variable by unity */ -@d decr(A) (A)=(A)-1 /* decrease a variable by unity */ -@d qo(A) (A) /* to read eight bits from a quarterword */ -@d qi(A) (quarterword)(A) /* to store eight bits in a quarterword */ -@d max_quarterword 0x3FFF /* largest allowable value in a |quarterword| */ -@d max_halfword 0xFFFFFFF /* largest allowable value in a |halfword| */ -@d max_str_ref 127 /* ``infinite'' number of references */ - - -@c -#include "config.h" -#include -#include -#include -#include "mplib.h" -#include "mpmp.h" - -@ @c void mp_store_mem_file (MP mp) { - integer k; /* all-purpose index */ - pointer p,q; /* all-purpose pointers */ - integer x; /* something to dump */ - four_quarters w; /* four ASCII codes */ - memory_word WW; - @; - @; - @; - @; - @; - @; - @; -} - -@ Corresponding to the procedure that dumps a mem file, we also have a function -that reads~one~in. The function returns |false| if the dumped mem is -incompatible with the present \MP\ table sizes, etc. - -@d too_small(A) { wake_up_terminal; - wterm_ln("---! Must increase the "); wterm((A)); -@.Must increase the x@> - goto OFF_BASE; - } - -@c -boolean mp_load_mem_file (MP mp) { - integer k; /* all-purpose index */ - pointer p,q; /* all-purpose pointers */ - integer x; /* something undumped */ - str_number s; /* some temporary string */ - four_quarters w; /* four ASCII codes */ - memory_word WW; - @; - @; - @; - @; - return true; /* it worked! */ -OFF_BASE: - wake_up_terminal; - wterm_ln("(Fatal mem file error; I'm stymied)\n"); -@.Fatal mem file error@> - return false; -} - -@ Mem files consist of |memory_word| items, and we use the following -macros to dump words of different types: - -@d dump_wd(A) { WW=(A); (mp->write_binary_file)(mp,mp->mem_file,&WW,sizeof(WW)); } -@d dump_int(A) { int cint=(A); (mp->write_binary_file)(mp,mp->mem_file,&cint,sizeof(cint)); } -@d dump_hh(A) { WW.hh=(A); (mp->write_binary_file)(mp,mp->mem_file,&WW,sizeof(WW)); } -@d dump_qqqq(A) { WW.qqqq=(A); (mp->write_binary_file)(mp,mp->mem_file,&WW,sizeof(WW)); } -@d dump_string(A) { dump_int((int)(strlen(A)+1)); - (mp->write_binary_file)(mp,mp->mem_file,A,strlen(A)+1); } - -@ The inverse macros are slightly more complicated, since we need to check -the range of the values we are reading in. We say `|undump(a)(b)(x)|' to -read an integer value |x| that is supposed to be in the range |a<=x<=b|. - -@d mgeti(A) do { - size_t wanted = sizeof(A); - void *A_ptr = &A; - (mp->read_binary_file)(mp, mp->mem_file,&A_ptr,&wanted); - if (wanted!=sizeof(A)) goto OFF_BASE; -} while (0) - -@d mgetw(A) do { - size_t wanted = sizeof(A); - void *A_ptr = &A; - (mp->read_binary_file)(mp, mp->mem_file,&A_ptr,&wanted); - if (wanted!=sizeof(A)) goto OFF_BASE; -} while (0) - -@d undump_wd(A) { mgetw(WW); A=WW; } -@d undump_int(A) { int cint; mgeti(cint); A=cint; } -@d undump_hh(A) { mgetw(WW); A=WW.hh; } -@d undump_qqqq(A) { mgetw(WW); A=WW.qqqq; } -@d undump_strings(A,B,C) { - undump_int(x); if ( (x<(A)) || (x>(B)) ) goto OFF_BASE; else C=str(x); } -@d undump(A,B,C) { undump_int(x); - if ( (x<(A)) || (x>(int)(B)) ) goto OFF_BASE; else C=x; } -@d undump_size(A,B,C,D) { undump_int(x); - if (x<(A)) goto OFF_BASE; - if (x>(B)) too_small((C)); else D=x; } -@d undump_string(A) { - size_t the_wanted; - void *the_string; - integer XX=0; - undump_int(XX); - the_wanted = (size_t)XX; - the_string = mp_xmalloc(mp,(size_t)XX,1); - (mp->read_binary_file)(mp,mp->mem_file,&the_string,&the_wanted); - A = (char *)the_string; - if (the_wanted!=(size_t)XX) goto OFF_BASE; -} - -@ The next few sections of the program should make it clear how we use the -dump/undump macros. - -@= -x = metapost_magic; dump_int(x); -dump_int(mp->mem_top); -dump_int((integer)mp->hash_size); -dump_int(mp->hash_prime) -dump_int(mp->param_size); -dump_int(mp->max_in_open); - -@ Sections of a \.{WEB} program that are ``commented out'' still contribute -strings to the string pool; therefore \.{INIMP} and \MP\ will have -the same strings. (And it is, of course, a good thing that they do.) -@.WEB@> -@^string pool@> - -@ @c -int mp_undump_constants (MP mp) { - integer x; - undump_int(x); - if (x!=metapost_magic) return x; - undump_int(x); mp->mem_top = x; - undump_int(x); mp->hash_size = (unsigned)x; - undump_int(x); mp->hash_prime = x; - undump_int(x); mp->param_size = x; - undump_int(x); mp->max_in_open = x; - return metapost_magic; - OFF_BASE: - return -1; -} - -@ We do string pool compaction to avoid dumping unused strings. - -@d dump_four_ASCII - w.b0=qi(mp->str_pool[k]); w.b1=qi(mp->str_pool[k+1]); - w.b2=qi(mp->str_pool[k+2]); w.b3=qi(mp->str_pool[k+3]); - dump_qqqq(w) - -@= -mp_do_compaction(mp, mp->pool_size); -dump_int(mp->pool_ptr); -dump_int(mp->max_str_ptr); -dump_int(mp->str_ptr); -k=0; -while ( (mp->next_str[k]==k+1) && (k<=mp->max_str_ptr) ) - k++; -dump_int(k); -while ( k<=mp->max_str_ptr ) { - dump_int(mp->next_str[k]); incr(k); -} -k=0; -while (1) { - dump_int(mp->str_start[k]); /* TODO: valgrind warning here */ - if ( k==mp->str_ptr ) { - break; - } else { - k=mp->next_str[k]; - } -} -k=0; -while (k+4pool_ptr ) { - dump_four_ASCII; k=k+4; -} -k=mp->pool_ptr-4; dump_four_ASCII; -mp_print_ln(mp); mp_print(mp, "at most "); mp_print_int(mp, mp->max_str_ptr); -mp_print(mp, " strings of total length "); -mp_print_int(mp, mp->pool_ptr) - -@ @d undump_four_ASCII - undump_qqqq(w); - mp->str_pool[k]=(ASCII_code)qo(w.b0); mp->str_pool[k+1]=(ASCII_code)qo(w.b1); - mp->str_pool[k+2]=(ASCII_code)qo(w.b2); mp->str_pool[k+3]=(ASCII_code)qo(w.b3) - -@= -undump_int(mp->pool_ptr); -mp_reallocate_pool(mp, mp->pool_ptr) ; -undump_int(mp->max_str_ptr); -mp_reallocate_strings (mp,mp->max_str_ptr) ; -undump(0,mp->max_str_ptr,mp->str_ptr); -undump(0,mp->max_str_ptr+1,s); -for (k=0;k<=s-1;k++) - mp->next_str[k]=k+1; -for (k=s;k<=mp->max_str_ptr;k++) - undump(s+1,mp->max_str_ptr+1,mp->next_str[k]); -mp->fixed_str_use=0; -k=0; -while (1) { - undump(0,mp->pool_ptr,mp->str_start[k]); - if ( k==mp->str_ptr ) break; - mp->str_ref[k]=max_str_ref; - incr(mp->fixed_str_use); - mp->last_fixed_str=k; k=mp->next_str[k]; -} -k=0; -while ( k+4pool_ptr ) { - undump_four_ASCII; k=k+4; -} -k=mp->pool_ptr-4; undump_four_ASCII; -mp->init_str_use=mp->fixed_str_use; mp->init_pool_ptr=mp->pool_ptr; -mp->max_pool_ptr=mp->pool_ptr; -mp->strs_used_up=mp->fixed_str_use; -mp->pool_in_use=mp->str_start[mp->str_ptr]; mp->strs_in_use=mp->fixed_str_use; -mp->max_pl_used=mp->pool_in_use; mp->max_strs_used=mp->strs_in_use; -mp->pact_count=0; mp->pact_chars=0; mp->pact_strs=0; - -@ By sorting the list of available spaces in the variable-size portion of -|mem|, we are usually able to get by without having to dump very much -of the dynamic memory. - -We recompute |var_used| and |dyn_used|, so that \.{INIMP} dumps valid -information even when it has not been gathering statistics. - -@= -mp_sort_avail(mp); mp->var_used=0; -dump_int(mp->lo_mem_max); dump_int(mp->rover); -p=0; q=mp->rover; x=0; -do { - for (k=p;k<= q+1;k++) - dump_wd(mp->mem[k]); - x=x+q+2-p; mp->var_used=mp->var_used+q-p; - p=q+node_size(q); q=rmp_link(q); -} while (q!=mp->rover); -mp->var_used=mp->var_used+mp->lo_mem_max-p; -mp->dyn_used=mp->mem_end+1-mp->hi_mem_min; -for (k=p;k<= mp->lo_mem_max;k++ ) - dump_wd(mp->mem[k]); -x=x+mp->lo_mem_max+1-p; -dump_int(mp->hi_mem_min); dump_int(mp->avail); -for (k=mp->hi_mem_min;k<=mp->mem_end;k++ ) - dump_wd(mp->mem[k]); -x=x+mp->mem_end+1-mp->hi_mem_min; -p=mp->avail; -while ( p!=null ) { - decr(mp->dyn_used); p=mp_link(p); -} -dump_int(mp->var_used); dump_int(mp->dyn_used); -mp_print_ln(mp); mp_print_int(mp, x); -mp_print(mp, " memory locations dumped; current usage is "); -mp_print_int(mp, mp->var_used); mp_print_char(mp, xord('&')); mp_print_int(mp, mp->dyn_used) - -@ @= -undump(lo_mem_stat_max+1000,hi_mem_stat_min-1,mp->lo_mem_max); -undump(lo_mem_stat_max+1,mp->lo_mem_max,mp->rover); -p=0; q=mp->rover; -do { - for (k=p;k<= q+1; k++) - undump_wd(mp->mem[k]); - p=q+node_size(q); - if ( (p>mp->lo_mem_max)||((q>=rmp_link(q))&&(rmp_link(q)!=mp->rover)) ) - goto OFF_BASE; - q=rmp_link(q); -} while (q!=mp->rover); -for (k=p;k<=mp->lo_mem_max;k++ ) - undump_wd(mp->mem[k]); -undump(mp->lo_mem_max+1,hi_mem_stat_min,mp->hi_mem_min); -undump(null,mp->mem_top,mp->avail); mp->mem_end=mp->mem_top; -mp->last_pending=spec_head; -for (k=mp->hi_mem_min;k<= mp->mem_end;k++) - undump_wd(mp->mem[k]); -undump_int(mp->var_used); undump_int(mp->dyn_used) - -@ A different scheme is used to compress the hash table, since its lower region -is usually sparse. When |text(p)<>0| for |p<=hash_used|, we output three -words: |p|, |hash[p]|, and |eqtb[p]|. The hash table is, of course, densely -packed for |p>=hash_used|, so the remaining entries are output in~a~block. - -@= -dump_int(mp->hash_used); -mp->st_count=frozen_inaccessible-1-mp->hash_used; -for (p=1;p<=mp->hash_used;p++) { - if ( text(p)!=0 ) { - dump_int(p); dump_hh(mp->hash[p]); dump_hh(mp->eqtb[p]); incr(mp->st_count); - } -} -for (p=mp->hash_used+1;p<=(int)hash_end;p++) { - dump_hh(mp->hash[p]); dump_hh(mp->eqtb[p]); -} -dump_int(mp->st_count); -mp_print_ln(mp); mp_print_int(mp, mp->st_count); mp_print(mp, " symbolic tokens") - -@ @= -undump(1,frozen_inaccessible,mp->hash_used); -p=0; -do { - undump(p+1,mp->hash_used,p); - undump_hh(mp->hash[p]); undump_hh(mp->eqtb[p]); -} while (p!=mp->hash_used); -for (p=mp->hash_used+1;p<=(int)hash_end;p++ ) { - undump_hh(mp->hash[p]); undump_hh(mp->eqtb[p]); -} -undump_int(mp->st_count) - -@ We have already printed a lot of statistics, so we set |mp_tracing_stats:=0| -to prevent them appearing again. - -@= -dump_int(mp->max_internal); -dump_int(mp->int_ptr); -for (k=1;k<= mp->int_ptr;k++ ) { - dump_int(mp->internal[k]); - dump_string(mp->int_name[k]); -} -dump_int(mp->start_sym); -dump_int(mp->interaction); -dump_string(mp->mem_ident); -dump_int(mp->bg_loc); dump_int(mp->eg_loc); dump_int(mp->serial_no); dump_int(69073); -mp->internal[mp_tracing_stats]=0 - -@ @= -undump_int(x); -if (x>mp->max_internal) mp_grow_internals(mp,x); -undump_int(mp->int_ptr); -for (k=1;k<= mp->int_ptr;k++) { - undump_int(mp->internal[k]); - undump_string(mp->int_name[k]); -} -undump(0,frozen_inaccessible,mp->start_sym); -if (mp->interaction==mp_unspecified_mode) { - undump(mp_unspecified_mode,mp_error_stop_mode,mp->interaction); -} else { - undump(mp_unspecified_mode,mp_error_stop_mode,x); -} -undump_string(mp->mem_ident); -undump(1,hash_end,mp->bg_loc); -undump(1,hash_end,mp->eg_loc); -undump_int(mp->serial_no); -undump_int(x); -if (x!=69073) goto OFF_BASE - -@ @= -{ - char *tmp = mp_xmalloc(mp,11,1); - mp_xfree(mp->mem_ident); - mp->mem_ident = mp_xmalloc(mp,256,1); - mp_snprintf(tmp,11,"%04d.%02d.%02d", - (int)mp_round_unscaled(mp, mp->internal[mp_year]), - (int)mp_round_unscaled(mp, mp->internal[mp_month]), - (int)mp_round_unscaled(mp, mp->internal[mp_day])); - mp_snprintf(mp->mem_ident,256," (mem=%s %s)",mp->job_name, tmp); - mp_xfree(tmp); - mp_pack_job_name(mp, ".mem"); - while (! mp_w_open_out(mp, &mp->mem_file) ) - mp_prompt_file_name(mp, "mem file name", ".mem"); - mp_print_nl(mp, "Beginning to dump on file "); -@.Beginning to dump...@> - mp_print(mp, mp->name_of_file); - mp_print_nl(mp, mp->mem_ident); -} - -@ @= -(mp->close_file)(mp,mp->mem_file) diff --git a/Build/source/texk/web2c/luatexdir/mp/mp.w b/Build/source/texk/web2c/luatexdir/mp/mp.w deleted file mode 100644 index ef61a38f820..00000000000 --- a/Build/source/texk/web2c/luatexdir/mp/mp.w +++ /dev/null @@ -1,26390 +0,0 @@ -% $Id: mp.w 806 2008-12-23 16:22:29Z taco $ -% -% Copyright 2008 Taco Hoekwater. -% -% This program is free software: you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published by -% the Free Software Foundation, either version 2 of the License, or -% (at your option) any later version. -% -% This program is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with this program. If not, see . -% -% TeX is a trademark of the American Mathematical Society. -% METAFONT is a trademark of Addison-Wesley Publishing Company. -% PostScript is a trademark of Adobe Systems Incorporated. - -% Here is TeX material that gets inserted after \input webmac -\def\hang{\hangindent 3em\noindent\ignorespaces} -\def\textindent#1{\hangindent2.5em\noindent\hbox to2.5em{\hss#1 }\ignorespaces} -\def\ps{PostScript} -\def\psqrt#1{\sqrt{\mathstrut#1}} -\def\k{_{k+1}} -\def\pct!{{\char`\%}} % percent sign in ordinary text -\font\tenlogo=logo10 % font used for the METAFONT logo -\font\logos=logosl10 -\def\MF{{\tenlogo META}\-{\tenlogo FONT}} -\def\MP{{\tenlogo META}\-{\tenlogo POST}} -\def\[#1]{\ignorespaces} % left over from pascal web -\def\<#1>{$\langle#1\rangle$} -\def\section{\mathhexbox278} -\let\swap=\leftrightarrow -\def\round{\mathop{\rm round}\nolimits} -\mathchardef\vbv="026A % synonym for `\|' -\def\vb{\relax\ifmmode\vbv\else$\vbv$\fi} - -\def\(#1){} % this is used to make section names sort themselves better -\def\9#1{} % this is used for sort keys in the index via @@:sort key}{entry@@> -\def\title{MetaPost} -\pdfoutput=1 -\pageno=3 - -@* \[1] Introduction. - -This is \MP\ by John Hobby, a graphics-language processor based on D. E. Knuth's \MF. - -Much of the original Pascal version of this program was copied with -permission from MF.web Version 1.9. It interprets a language very -similar to D.E. Knuth's METAFONT, but with changes designed to make it -more suitable for PostScript output. - -The main purpose of the following program is to explain the algorithms of \MP\ -as clearly as possible. However, the program has been written so that it -can be tuned to run efficiently in a wide variety of operating environments -by making comparatively few changes. Such flexibility is possible because -the documentation that follows is written in the \.{WEB} language, which is -at a higher level than C. - -A large piece of software like \MP\ has inherent complexity that cannot -be reduced below a certain level of difficulty, although each individual -part is fairly simple by itself. The \.{WEB} language is intended to make -the algorithms as readable as possible, by reflecting the way the -individual program pieces fit together and by providing the -cross-references that connect different parts. Detailed comments about -what is going on, and about why things were done in certain ways, have -been liberally sprinkled throughout the program. These comments explain -features of the implementation, but they rarely attempt to explain the -\MP\ language itself, since the reader is supposed to be familiar with -{\sl The {\logos METAFONT\/}book} as well as the manual -@.WEB@> -@:METAFONTbook}{\sl The {\logos METAFONT\/}book@> -{\sl A User's Manual for MetaPost}, Computing Science Technical Report 162, -AT\AM T Bell Laboratories. - -@ The present implementation is a preliminary version, but the possibilities -for new features are limited by the desire to remain as nearly compatible -with \MF\ as possible. - -On the other hand, the \.{WEB} description can be extended without changing -the core of the program, and it has been designed so that such -extensions are not extremely difficult to make. -The |banner| string defined here should be changed whenever \MP\ -undergoes any modifications, so that it will be clear which version of -\MP\ might be the guilty party when a problem arises. -@^extensions to \MP@> -@^system dependencies@> - -@d default_banner "This is MetaPost, Version 1.102" /* printed when \MP\ starts */ -@d true 1 -@d false 0 - -@(mpmp.h@>= -#define metapost_version "1.102" -#define metapost_magic (('M'*256) + 'P')*65536 + 1102 -#define metapost_old_magic (('M'*256) + 'P')*65536 + 1080 - -@ The external library header for \MP\ is |mplib.h|. It contains a -few typedefs and the header defintions for the externally used -fuctions. - -The most important of the typedefs is the definition of the structure -|MP_options|, that acts as a small, configurable front-end to the fairly -large |MP_instance| structure. - -@(mplib.h@>= -typedef struct MP_instance * MP; -@ -typedef struct MP_options { - @