diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-06-20 10:19:54 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-06-20 10:19:54 +0000 |
commit | 56b37a9f04f25a2d90d7523360ebf9fd6aea2e6f (patch) | |
tree | 560e1832a46bb3ef1a6e249d85f50966928e9754 /Build/source/texk/web2c/luatexdir | |
parent | ff2b3637ce66eb629ed6b5df7a6d10e319d94082 (diff) |
MetaPost 1.999
git-svn-id: svn://tug.org/texlive/trunk@34334 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 9 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/libluatex.am | 9 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luatex.am | 15 |
3 files changed, 19 insertions, 14 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index b59cc04370c..b03efd33104 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,12 @@ +2014-06-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/libluatex.am: Remove ../mplibdir/lmplib.c from sources and + dependency on libmplib.a. + * am/luatex.am: Add ../mplibdir/lmplib.c to sources, dependency + on libmplib.a, and -DpdfTeX to CPPFLAGS. + + * am/luatex.am: Adapt to MetaPost 1.999 (libgmp and libmpfr). + 2014-06-19 Peter Breitenlohner <peb@mppmu.mpg.de> * font/mapfile.w, font/tounicode.w, font/writet1.w, diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index 1f48d8006f5..e414fd2bc1d 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -47,8 +47,8 @@ nodist_libluajittex_a_SOURCES = \ $(dist_libluatex_sources) \ $(nodist_libluatex_sources) -$(libluatex_a_OBJECTS): libff.a libmplib.a $(POPPLER_DEPEND) -$(libluajittex_a_OBJECTS): libjitff.a libmplib.a $(POPPLER_DEPEND) +$(libluatex_a_OBJECTS): libff.a $(POPPLER_DEPEND) +$(libluajittex_a_OBJECTS): libjitff.a $(POPPLER_DEPEND) ## from luatexdir ## @@ -531,11 +531,6 @@ dist_libluatex_sources += \ synctexdir/synctex.c \ synctexdir/synctex.h -## from ../mplibdir -## -dist_libluatex_sources += \ - mplibdir/lmplib.c - EXTRA_DIST += \ $(dist_libluatex_sources) \ $(libluatex_web) diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index a93f086185e..aa0c9b68145 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -34,22 +34,22 @@ nodist_EXTRA_luatex_SOURCES = dummy.cxx nodist_EXTRA_luajittex_SOURCES = dummy.cxx luatex_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(POPPLER_INCLUDES) -luatex_postflags = -I$(srcdir)/libmd5 -I$(srcdir)/luatexdir -I$(srcdir)/mplibdir +luatex_postflags = -I$(srcdir)/libmd5 -DpdfTeX -I$(srcdir)/luatexdir -I$(srcdir)/mplibdir luatex_postflags += -Dextra_version_info=`date +-%Y%m%d%H` luatex_postflags += -I$(srcdir)/synctexdir -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' luatex_CPPFLAGS = $(luatex_preflags) $(LUA_INCLUDES) $(luatex_postflags) -luajittex_CPPFLAGS = $(luatex_preflags) $(LUAJIT_INCLUDES) $(luatex_postflags) +luajittex_CPPFLAGS = $(luatex_preflags) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES) $(luatex_postflags) luatex_CXXFLAGS = $(WARNING_CXXFLAGS) luajittex_CXXFLAGS = $(WARNING_CXXFLAGS) luatex_ldadd = libluatex.a libff.a libunilib.a libluamisc.a libluasocket.a $(LUA_LIBS) -luatex_ldadd += libmd5.a libmplib.a $(CAIRO_LIBS) $(PIXMAN_LIBS) +luatex_ldadd += libmd5.a libmplib.a $(MPFR_LIBS) $(GMP_LIBS) $(CAIRO_LIBS) $(PIXMAN_LIBS) luatex_ldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) luajittex_ldadd = libluajittex.a libjitff.a libunilib.a libluajitmisc.a libluajitsocket.a $(LUAJIT_LIBS) -luajittex_ldadd += libmd5.a libmplib.a $(CAIRO_LIBS) $(PIXMAN_LIBS) +luajittex_ldadd += libmd5.a libmplib.a $(MPFR_LIBS) $(GMP_LIBS) $(CAIRO_LIBS) $(PIXMAN_LIBS) luajittex_ldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) luatex_LDFLAGS = -export-dynamic @@ -63,8 +63,8 @@ luatex_DEPENDENCIES += $(LIBPNG_DEPEND) libmd5.a libmplib.a luajittex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluajittex.a luajittex_DEPENDENCIES += $(LIBPNG_DEPEND) libmd5.a libmplib.a -$(luatex_OBJECTS): libluatex.a -$(luajittex_OBJECTS): libluajittex.a +$(luatex_OBJECTS): libluatex.a libmplib.a +$(luajittex_OBJECTS): libluajittex.a libmplib.a nodist_luatex_SOURCES = $(luatex_sources) nodist_luajittex_SOURCES = $(luatex_sources) @@ -72,7 +72,8 @@ nodist_luajittex_SOURCES = $(luatex_sources) luatex_sources = \ luatexdir/luatex_svnversion.h \ luatexdir/luatex.c \ - luatexdir/luatex.h + luatexdir/luatex.h \ + mplibdir/lmplib.c EXTRA_DIST += \ $(luatex_sources) \ |