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/luatex.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/luatex.am')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luatex.am | 10 |
1 files changed, 4 insertions, 6 deletions
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\" |