diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-03-21 09:16:59 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-03-21 09:16:59 +0000 |
commit | 388463b9fa865c3b2311508c41647b0f3c532031 (patch) | |
tree | 1cdfbf5552d0783ecbcc52017e49567e5042af33 /Build/source/texk/web2c/luatexdir/am | |
parent | abd0b00a4e8c1ac6f5b20c7474d70ef579129991 (diff) |
Import MetaPost 1.800 and LuaTeX beta-0.75.0 from LuaTeX repository r4604
git-svn-id: svn://tug.org/texlive/trunk@29453 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/am')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/liblua51.am | 79 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/liblua52.am | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/libluatex.am | 44 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luafontforge.am | 11 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luamisc.am | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luasocket.am | 13 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luatex.am | 10 |
7 files changed, 54 insertions, 114 deletions
diff --git a/Build/source/texk/web2c/luatexdir/am/liblua51.am b/Build/source/texk/web2c/luatexdir/am/liblua51.am deleted file mode 100644 index 1067e4da432..00000000000 --- a/Build/source/texk/web2c/luatexdir/am/liblua51.am +++ /dev/null @@ -1,79 +0,0 @@ -## texk/web2c/luatexdir/am/liblua51.am: Makefile fragment for liblua51. -## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> -## You may freely use, modify and/or distribute this file. - -## liblua51 -## -EXTRA_LIBRARIES += liblua51.a - -liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 -if !MINGW32 -liblua51_a_CPPFLAGS += -DLUA_USE_POSIX -endif !MINGW32 -liblua51_a_CFLAGS = # $(WARNING_CFLAGS) - -liblua51_a_SOURCES = \ - luatexdir/lua51/lapi.c \ - luatexdir/lua51/lapi.h \ - luatexdir/lua51/lauxlib.c \ - luatexdir/lua51/lauxlib.h \ - luatexdir/lua51/lbaselib.c \ - luatexdir/lua51/lcoco.c \ - luatexdir/lua51/lcoco.h \ - luatexdir/lua51/lcode.c \ - luatexdir/lua51/lcode.h \ - luatexdir/lua51/ldblib.c \ - luatexdir/lua51/ldebug.c \ - luatexdir/lua51/ldebug.h \ - luatexdir/lua51/ldo.c \ - luatexdir/lua51/ldo.h \ - luatexdir/lua51/ldump.c \ - luatexdir/lua51/lfunc.c \ - luatexdir/lua51/lfunc.h \ - luatexdir/lua51/lgc.c \ - luatexdir/lua51/lgc.h \ - luatexdir/lua51/linit.c \ - luatexdir/lua51/llex.c \ - luatexdir/lua51/llex.h \ - luatexdir/lua51/llimits.h \ - luatexdir/lua51/lmathlib.c \ - luatexdir/lua51/lmem.c \ - luatexdir/lua51/lmem.h \ - luatexdir/lua51/loadlib.c \ - luatexdir/lua51/lobject.c \ - luatexdir/lua51/lobject.h \ - luatexdir/lua51/lopcodes.c \ - luatexdir/lua51/lopcodes.h \ - luatexdir/lua51/loslib.c \ - luatexdir/lua51/lparser.c \ - luatexdir/lua51/lparser.h \ - luatexdir/lua51/lstate.c \ - luatexdir/lua51/lstate.h \ - luatexdir/lua51/lstring.c \ - luatexdir/lua51/lstring.h \ - luatexdir/lua51/lstrlib.c \ - luatexdir/lua51/ltable.c \ - luatexdir/lua51/ltable.h \ - luatexdir/lua51/ltablib.c \ - luatexdir/lua51/ltm.c \ - luatexdir/lua51/ltm.h \ - luatexdir/lua51/lua.h \ - luatexdir/lua51/luaconf.h \ - luatexdir/lua51/lualib.h \ - luatexdir/lua51/lundump.c \ - luatexdir/lua51/lundump.h \ - luatexdir/lua51/lvm.c \ - luatexdir/lua51/lvm.h \ - luatexdir/lua51/lzio.c \ - luatexdir/lua51/lzio.h - -## Not used -## -EXTRA_DIST += \ - luatexdir/lua51/Makefile \ - luatexdir/lua51/liolib.c \ - luatexdir/lua51/lua.c \ - luatexdir/lua51/luac.c \ - luatexdir/lua51/print.c - diff --git a/Build/source/texk/web2c/luatexdir/am/liblua52.am b/Build/source/texk/web2c/luatexdir/am/liblua52.am index 5f4ad91045c..bcb5a6d1a13 100644 --- a/Build/source/texk/web2c/luatexdir/am/liblua52.am +++ b/Build/source/texk/web2c/luatexdir/am/liblua52.am @@ -7,7 +7,11 @@ ## EXTRA_LIBRARIES += liblua52.a -liblua52_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua52 -DLUA_COMPAT_MODULE +LUA_INCLUDES = -DLUA_COMPAT_MODULE -I$(top_srcdir)/luatexdir/lua52 +LUA_LIBS = liblua52.a +LUA_DEPEND = liblua52.a + +liblua52_a_CPPFLAGS = $(LUA_INCLUDES) if !WIN32 liblua52_a_CPPFLAGS += -DLUA_USE_POSIX if USE_DLOPEN diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index d71398d787a..f82b83e4d01 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -1,6 +1,6 @@ ## texk/web2c/luatexdir/am/libluatex.am: Makefile fragment for libluatex. ## -## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## libluatex @@ -11,9 +11,9 @@ libluatex_a_DEPENDENCIES = libff.a libluatex_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) libluatex_a_CPPFLAGS += $(POPPLER_INCLUDES) -I$(srcdir)/libmd5 -libluatex_a_CPPFLAGS += -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 -libluatex_a_CPPFLAGS += -DpdfTeX -libluatex_a_CPPFLAGS += -I$(srcdir)/synctexdir -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' +libluatex_a_CPPFLAGS += -DpdfTeX -I$(srcdir)/luatexdir +libluatex_a_CPPFLAGS += $(LUA_INCLUDES) +libluatex_a_CPPFLAGS += -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' -I$(srcdir)/synctexdir libluatex_a_CXXFLAGS = # $(WARNING_CXXFLAGS) ## from luatexdir @@ -23,8 +23,10 @@ libluatex_web = nodist_libluatex_a_SOURCES = libluatex_a_SOURCES = \ + luatexdir/luatexcallbackids.h \ luatexdir/luatex.h \ - luatexdir/luatex-common.h + luatexdir/luatex-common.h \ + luatexdir/ptexlib.h ## from luatexdir/dvi ## @@ -127,18 +129,21 @@ writejp2.c: ctangle$(EXEEXT) luatexdir/image/writejp2.w $(luatex_image_ctangle) writejp2.w writepng.c: ctangle$(EXEEXT) luatexdir/image/writepng.w $(luatex_image_ctangle) writepng.w +pdftoepdf.cc: ctangle$(EXEEXT) luatexdir/image/pdftoepdf.w + $(luatex_image_ctangle) pdftoepdf.w - $@ libluatex_web += luatexdir/image/writeimg.w libluatex_web += luatexdir/image/writejbig2.w -libluatex_web += luatexdir/image/writejpg.w luatexdir/image/writejp2.w +libluatex_web += luatexdir/image/writejpg.w +libluatex_web += luatexdir/image/writejp2.w libluatex_web += luatexdir/image/writepng.w +libluatex_web += luatexdir/image/pdftoepdf.w -nodist_libluatex_a_SOURCES += writeimg.c writejbig2.c writejpg.c writejp2.c writepng.c +nodist_libluatex_a_SOURCES += writeimg.c writejbig2.c writejpg.c writejp2.c writepng.c pdftoepdf.cc libluatex_a_SOURCES += \ luatexdir/image/epdf.h \ luatexdir/image/image.h \ - luatexdir/image/pdftoepdf.cc \ luatexdir/image/pdftoepdf.h \ luatexdir/image/writeimg.h \ luatexdir/image/writejbig2.h \ @@ -192,14 +197,16 @@ libluatex_a_SOURCES += \ luatexdir/lua/lcallbacklib.c \ luatexdir/lua/lfontlib.c \ luatexdir/lua/limglib.c \ + luatexdir/lua/lpdfscannerlib.cc \ luatexdir/lua/lepdflib.cc \ luatexdir/lua/lkpselib.c \ luatexdir/lua/llanglib.c \ luatexdir/lua/llualib.c \ luatexdir/lua/llfslibext.c \ luatexdir/lua/lnodelib.c \ + luatexdir/lua/liolibext.c \ luatexdir/lua/loslibext.c \ - luatexdir/lua/liolib.c \ + luatexdir/lua/lstrlibext.c \ luatexdir/lua/lpdflib.c \ luatexdir/lua/lstatslib.c \ luatexdir/lua/ltexiolib.c \ @@ -212,8 +219,8 @@ libluatex_a_SOURCES += \ ## luatex_pdf_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/pdf $(ctangle) -pagetree.c: ctangle$(EXEEXT) luatexdir/pdf/pagetree.w - $(luatex_pdf_ctangle) pagetree.w +pdfpagetree.c: ctangle$(EXEEXT) luatexdir/pdf/pdfpagetree.w + $(luatex_pdf_ctangle) pdfpagetree.w pdfaction.c: ctangle$(EXEEXT) luatexdir/pdf/pdfaction.w $(luatex_pdf_ctangle) pdfaction.w pdfannot.c: ctangle$(EXEEXT) luatexdir/pdf/pdfannot.w @@ -259,7 +266,7 @@ pdfthread.c: ctangle$(EXEEXT) luatexdir/pdf/pdfthread.w pdfxform.c: ctangle$(EXEEXT) luatexdir/pdf/pdfxform.w $(luatex_pdf_ctangle) pdfxform.w -libluatex_web += luatexdir/pdf/pagetree.w luatexdir/pdf/pdfaction.w luatexdir/pdf/pdfannot.w +libluatex_web += luatexdir/pdf/pdfpagetree.w luatexdir/pdf/pdfaction.w luatexdir/pdf/pdfannot.w libluatex_web += luatexdir/pdf/pdfcolorstack.w luatexdir/pdf/pdfdest.w libluatex_web += luatexdir/pdf/pdffont.w luatexdir/pdf/pdfgen.w luatexdir/pdf/pdfglyph.w libluatex_web += luatexdir/pdf/pdfimage.w luatexdir/pdf/pdflink.w luatexdir/pdf/pdflistout.w @@ -269,13 +276,13 @@ libluatex_web += luatexdir/pdf/pdfsaverestore.w luatexdir/pdf/pdfsetmatrix.w libluatex_web += luatexdir/pdf/pdfshipout.w luatexdir/pdf/pdftables.w libluatex_web += luatexdir/pdf/pdfthread.w luatexdir/pdf/pdfxform.w -nodist_libluatex_a_SOURCES += pagetree.c pdfaction.c pdfannot.c pdfcolorstack.c pdfdest.c pdffont.c +nodist_libluatex_a_SOURCES += pdfpagetree.c pdfaction.c pdfannot.c pdfcolorstack.c pdfdest.c pdffont.c nodist_libluatex_a_SOURCES += pdfgen.c pdfglyph.c pdfimage.c pdflink.c pdflistout.c pdfliteral.c nodist_libluatex_a_SOURCES += pdfluaapi.c pdfobj.c pdfoutline.c pdfpage.c pdfrule.c pdfsaverestore.c nodist_libluatex_a_SOURCES += pdfsetmatrix.c pdfshipout.c pdftables.c pdfthread.c pdfxform.c libluatex_a_SOURCES += \ - luatexdir/pdf/pagetree.h \ + luatexdir/pdf/pdfpagetree.h \ luatexdir/pdf/pdfaction.h \ luatexdir/pdf/pdfannot.h \ luatexdir/pdf/pdfcolorstack.h \ @@ -463,17 +470,20 @@ managed-sa.c: ctangle$(EXEEXT) luatexdir/utils/managed-sa.w $(luatex_utils_ctangle) managed-sa.w utils.c: ctangle$(EXEEXT) luatexdir/utils/utils.w $(luatex_utils_ctangle) utils.w +unistring.c: ctangle$(EXEEXT) luatexdir/utils/unistring.w + $(luatex_utils_ctangle) unistring.w -libluatex_web += luatexdir/utils/avlstuff.w luatexdir/utils/managed-sa.w luatexdir/utils/utils.w +libluatex_web += luatexdir/utils/avlstuff.w luatexdir/utils/managed-sa.w luatexdir/utils/utils.w luatexdir/utils/unistring.w -nodist_libluatex_a_SOURCES += avlstuff.c managed-sa.c utils.c +nodist_libluatex_a_SOURCES += avlstuff.c managed-sa.c utils.c unistring.c libluatex_a_SOURCES += \ luatexdir/utils/avl.c \ luatexdir/utils/avl.h \ luatexdir/utils/avlstuff.h \ luatexdir/utils/managed-sa.h \ - luatexdir/utils/utils.h + luatexdir/utils/utils.h \ + luatexdir/utils/unistring.h ## from ../synctexdir ## diff --git a/Build/source/texk/web2c/luatexdir/am/luafontforge.am b/Build/source/texk/web2c/luatexdir/am/luafontforge.am index 123e043533d..e3a2c9e925a 100644 --- a/Build/source/texk/web2c/luatexdir/am/luafontforge.am +++ b/Build/source/texk/web2c/luatexdir/am/luafontforge.am @@ -11,11 +11,12 @@ libff_a_DEPENDENCIES = libluamisc.a $(libff_a_OBJECTS): $(libff_a_DEPENDENCIES) -libff_a_CPPFLAGS = $(AM_CPPFLAGS) \ +libff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) \ -DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 \ -D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 -DNODYNAMIC=1 \ -D_NO_FREETYPE=1 -D_NO_LIBUNINAMESLIST=1 -UHAVE_LIBINTL_H \ - -I$(top_srcdir)/luatexdir/lua51 \ + -DUSE_OUR_MEMORY=1 \ + -I$(top_srcdir)/w2c \ -I$(top_srcdir)/luatexdir/luafontloader/fontforge/inc \ -I$(top_srcdir)/luatexdir/luafontloader/fontforge/fontforge libff_a_CFLAGS = # $(WARNING_CFLAGS) @@ -23,12 +24,15 @@ libff_a_CFLAGS = # $(WARNING_CFLAGS) libff_a_SOURCES = \ luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c \ luatexdir/luafontloader/fontforge/Unicode/alphabet.c \ + luatexdir/luafontloader/fontforge/Unicode/backtrns.c \ luatexdir/luafontloader/fontforge/Unicode/char.c \ luatexdir/luafontloader/fontforge/Unicode/cjk.c \ luatexdir/luafontloader/fontforge/Unicode/combiners.h \ luatexdir/luafontloader/fontforge/Unicode/gwwiconv.c \ luatexdir/luafontloader/fontforge/Unicode/memory.c \ luatexdir/luafontloader/fontforge/Unicode/ucharmap.c \ + luatexdir/luafontloader/fontforge/Unicode/unialt.c \ + luatexdir/luafontloader/fontforge/Unicode/usprintf.c \ luatexdir/luafontloader/fontforge/Unicode/ustring.c \ luatexdir/luafontloader/fontforge/Unicode/utype.c \ luatexdir/luafontloader/fontforge/fontforge/PfEd.h \ @@ -47,8 +51,6 @@ libff_a_SOURCES = \ luatexdir/luafontloader/fontforge/fontforge/fontviewbase.c \ luatexdir/luafontloader/fontforge/fontforge/fvcomposit.c \ luatexdir/luafontloader/fontforge/fontforge/fvfonts.c \ - luatexdir/luafontloader/fontforge/fontforge/libffstamp.h \ - luatexdir/luafontloader/fontforge/fontforge/libstamp.pre \ luatexdir/luafontloader/fontforge/fontforge/lookups.c \ luatexdir/luafontloader/fontforge/fontforge/lookups.h \ luatexdir/luafontloader/fontforge/fontforge/macbinary.c \ @@ -97,7 +99,6 @@ libff_a_SOURCES = \ luatexdir/luafontloader/fontforge/fontforge/unicoderange.h \ luatexdir/luafontloader/fontforge/fontforge/views.h \ luatexdir/luafontloader/fontforge/gutils/fsys.c \ - luatexdir/luafontloader/fontforge/gutils/gwwintl.c \ luatexdir/luafontloader/fontforge/inc/basics.h \ luatexdir/luafontloader/fontforge/inc/chardata.h \ luatexdir/luafontloader/fontforge/inc/charset.h \ diff --git a/Build/source/texk/web2c/luatexdir/am/luamisc.am b/Build/source/texk/web2c/luatexdir/am/luamisc.am index 5f43cf2b64a..3c66a0c01ff 100644 --- a/Build/source/texk/web2c/luatexdir/am/luamisc.am +++ b/Build/source/texk/web2c/luatexdir/am/luamisc.am @@ -1,7 +1,7 @@ ## texk/web2c/luatexdir/am/luamisc.am: Makefile fragment for libluamisc ## (luafilesystem, luamd5, luapeg, luazip, luazlib, luaprofiler, and slnunicode) ## -## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## libluamisc (luafilesystem, luamd5, luapeg, luazip, luazlib, luaprofiler, @@ -15,7 +15,7 @@ $(libluamisc_a_OBJECTS): $(libluamisc_a_DEPENDENCIES) libluamisc_a_CPPFLAGS = \ $(ZLIB_INCLUDES) \ $(ZZIPLIB_INCLUDES) \ - -I$(top_srcdir)/luatexdir/lua51 + $(LUA_INCLUDES) libluamisc_a_CFLAGS = # $(WARNING_CFLAGS) libluamisc_a_SOURCES = \ @@ -26,6 +26,7 @@ libluamisc_a_SOURCES = \ luatexdir/luamd5/md5lib.c \ luatexdir/luamd5/md5_lua.c \ luatexdir/luapeg/lpeg.c \ + luatexdir/luapeg/lpeg.h \ luatexdir/luaprofiler/clocks.c \ luatexdir/luaprofiler/clocks.h \ luatexdir/luaprofiler/core_profiler.c \ diff --git a/Build/source/texk/web2c/luatexdir/am/luasocket.am b/Build/source/texk/web2c/luatexdir/am/luasocket.am index 4dfb0149861..8da1a893a94 100644 --- a/Build/source/texk/web2c/luatexdir/am/luasocket.am +++ b/Build/source/texk/web2c/luatexdir/am/luasocket.am @@ -1,18 +1,18 @@ ## texk/web2c/luatexdir/am/luasocket.am: Makefile fragment for libluasocket. ## -## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## luasocket ## EXTRA_LIBRARIES += libluasocket.a -libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) liblua51.a +libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) $(LUA_DEPEND) -$(libluasocket_a_OBJECTS): liblua51.a +$(libluasocket_a_OBJECTS): $(LUA_LIBS) libluasocket_a_CPPFLAGS = \ - -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket -I$(srcdir)/luatexdir/lua51 + -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket $(LUA_INCLUDES) libluasocket_a_CFLAGS = # $(WARNING_CFLAGS) libluasocket_a_SOURCES = \ @@ -35,6 +35,7 @@ libluasocket_a_SOURCES = \ luatexdir/luasocket/src/options.h \ luatexdir/luasocket/src/select.c \ luatexdir/luasocket/src/select.h \ + luatexdir/luasocket/src/serial.c \ luatexdir/luasocket/src/socket.c \ luatexdir/luasocket/src/socket.h \ luatexdir/luasocket/src/tcp.c \ @@ -49,11 +50,13 @@ libluasocket_a_SOURCES = \ EXTRA_DIST += \ luatexdir/luasocket/src/socket_lua.c \ luatexdir/luasocket/src/ftp_lua.c \ + luatexdir/luasocket/src/headers_lua.c \ luatexdir/luasocket/src/http_lua.c \ luatexdir/luasocket/src/smtp_lua.c \ luatexdir/luasocket/src/tp_lua.c \ luatexdir/luasocket/src/url_lua.c \ luatexdir/luasocket/src/ltn12_lua.c \ + luatexdir/luasocket/src/mbox_lua.c \ luatexdir/luasocket/src/mime_lua.c ## Not used @@ -66,12 +69,14 @@ EXTRA_DIST += \ luatexdir/luasocket/src/wsocket.c \ luatexdir/luasocket/src/wsocket.h \ luatexdir/luasocket/src/ftp.lua \ + luatexdir/luasocket/src/headers.lua \ luatexdir/luasocket/src/http.lua \ luatexdir/luasocket/src/smtp.lua \ luatexdir/luasocket/src/socket.lua \ luatexdir/luasocket/src/tp.lua \ luatexdir/luasocket/src/url.lua \ luatexdir/luasocket/src/ltn12.lua \ + luatexdir/luasocket/src/mbox.lua \ luatexdir/luasocket/src/mime.lua \ luatexdir/luasocket/LICENSE \ luatexdir/luasocket/NEW \ diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index c9ffee3099a..eacf0a044b7 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -21,15 +21,15 @@ EXTRA_PROGRAMS += luatex nodist_EXTRA_luatex_SOURCES = dummy.cxx luatex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -luatex_CPPFLAGS += $(POPPLER_INCLUDES) -I$(srcdir)/libmd5 -luatex_CPPFLAGS += -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 -I$(srcdir)/mplibdir +luatex_CPPFLAGS += $(POPPLER_INCLUDES) $(LUA_INCLUDES) -I$(srcdir)/libmd5 +luatex_CPPFLAGS += -I$(srcdir)/luatexdir -I$(srcdir)/mplibdir luatex_CPPFLAGS += -Dextra_version_info=`date +-%Y%m%d%H` luatex_CPPFLAGS += -I$(srcdir)/synctexdir -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' luatex_CXXFLAGS = $(WARNING_CXXFLAGS) -luatex_ldadd = libluatex.a libff.a libluamisc.a libluasocket.a liblua51.a +luatex_ldadd = libluatex.a libff.a libluamisc.a libluasocket.a $(LUA_LIBS) +luatex_ldadd += libmd5.a libmplib.a $(CAIRO_LIBS) $(PIXMAN_LIBS) luatex_ldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) -luatex_ldadd += libmd5.a libmplib.a luatex_LDFLAGS = -export-dynamic @@ -43,8 +43,6 @@ $(luatex_OBJECTS): libluatex.a luatex_SOURCES = luatexdir/luatex_svnversion.h luatexdir/luatex.c luatexdir/luatex.h -EXTRA_DIST += luatexdir/ptexlib.h - EXTRA_DIST += luatexdir/getluatexsvnversion.sh call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\" |