diff options
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/am')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/liblua51.am | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/libluatex.am | 55 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luafontforge.am | 3 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luamisc.am | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luasocket.am | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luatex.am | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/txt2zlib.am | 19 |
7 files changed, 52 insertions, 37 deletions
diff --git a/Build/source/texk/web2c/luatexdir/am/liblua51.am b/Build/source/texk/web2c/luatexdir/am/liblua51.am index 1067e4da432..8f4e80782c0 100644 --- a/Build/source/texk/web2c/luatexdir/am/liblua51.am +++ b/Build/source/texk/web2c/luatexdir/am/liblua51.am @@ -7,7 +7,7 @@ ## EXTRA_LIBRARIES += liblua51.a -liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 +liblua51_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/luatexdir/lua51 if !MINGW32 liblua51_a_CPPFLAGS += -DLUA_USE_POSIX endif !MINGW32 diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index 072c448974c..73a909d32a4 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -10,7 +10,7 @@ EXTRA_LIBRARIES += libluatex.a libluatex_a_DEPENDENCIES = libff.a libluatex_a_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -libluatex_a_CPPFLAGS += $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 +libluatex_a_CPPFLAGS += $(POPPLER_INCLUDES) $(OBSDCOMPAT_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='<utils/synctex-luatex.h>' @@ -89,22 +89,23 @@ nodist_libluatex_a_SOURCES += writetype0.c writetype2.c luatex_image_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/image $(ctangle) -epdf.c: ctangle$(EXEEXT) luatexdir/image/epdf.w - $(luatex_image_ctangle) epdf.w writeimg.c: ctangle$(EXEEXT) luatexdir/image/writeimg.w $(luatex_image_ctangle) writeimg.w writejbig2.c: ctangle$(EXEEXT) luatexdir/image/writejbig2.w $(luatex_image_ctangle) writejbig2.w writejpg.c: ctangle$(EXEEXT) luatexdir/image/writejpg.w $(luatex_image_ctangle) writejpg.w +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 -libluatex_web += luatexdir/image/epdf.w luatexdir/image/writeimg.w -libluatex_web += luatexdir/image/writejbig2.w luatexdir/image/writejpg.w luatexdir/image/writepng.w - -nodist_libluatex_a_SOURCES += epdf.c writeimg.c writejbig2.c writejpg.c writepng.c +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/writepng.w +nodist_libluatex_a_SOURCES += writeimg.c writejbig2.c writejpg.c writejp2.c writepng.c luatex_lua_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/lua $(ctangle) @@ -126,24 +127,17 @@ libluatex_web += luatexdir/lua/luastuff.w luatexdir/lua/luatoken.w luatexdir/lua nodist_libluatex_a_SOURCES += luagen.c luainit.c luanode.c luastuff.c luatoken.c texluac.c +##********************************************************************** -luatex_ocp_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/ocp $(ctangle) - -ocp.c: ctangle$(EXEEXT) luatexdir/ocp/ocp.w - $(luatex_ocp_ctangle) ocp.w - -runocp.c: ctangle$(EXEEXT) luatexdir/ocp/runocp.w - $(luatex_ocp_ctangle) runocp.w - -readocp.c: ctangle$(EXEEXT) luatexdir/ocp/readocp.w - $(luatex_ocp_ctangle) readocp.w +luatex_luascripts_txt2zlib = $(TXTTOZLIB) +luatex_luascripts_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/luascripts $(ctangle) -ocplist.c: ctangle$(EXEEXT) luatexdir/ocp/ocplist.w - $(luatex_ocp_ctangle) ocplist.w +pdflua.c: txt2zlib$(EXEEXT) luatexdir/luascripts/pdflua.lua + $(luatex_luascripts_txt2zlib) $(srcdir)/luatexdir/luascripts/pdflua.lua pdflua.c -libluatex_web += luatexdir/ocp/ocp.w luatexdir/ocp/ocplist.w luatexdir/ocp/readocp.w luatexdir/ocp/runocp.w +nodist_libluatex_a_SOURCES += pdflua.c -nodist_libluatex_a_SOURCES += ocp.c ocplist.c readocp.c runocp.c +##********************************************************************** luatex_lang_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/lang $(ctangle) @@ -198,6 +192,9 @@ pdflistout.c: ctangle$(EXEEXT) luatexdir/pdf/pdflistout.w pdfliteral.c: ctangle$(EXEEXT) luatexdir/pdf/pdfliteral.w $(luatex_pdf_ctangle) pdfliteral.w +pdfluaapi.c: ctangle$(EXEEXT) luatexdir/pdf/pdfluaapi.w + $(luatex_pdf_ctangle) pdfluaapi.w + pdfobj.c: ctangle$(EXEEXT) luatexdir/pdf/pdfobj.w $(luatex_pdf_ctangle) pdfobj.w @@ -232,15 +229,15 @@ libluatex_web += luatexdir/pdf/pagetree.w luatexdir/pdf/pdfaction.w luatexdir/pd 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 -libluatex_web += luatexdir/pdf/pdfliteral.w luatexdir/pdf/pdfobj.w luatexdir/pdf/pdfoutline.w -libluatex_web += luatexdir/pdf/pdfpage.w luatexdir/pdf/pdfrule.w +libluatex_web += luatexdir/pdf/pdfliteral.w luatexdir/pdf/pdfluaapi.w luatexdir/pdf/pdfobj.w +libluatex_web += luatexdir/pdf/pdfoutline.w luatexdir/pdf/pdfpage.w luatexdir/pdf/pdfrule.w 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 += pdfgen.c pdfglyph.c pdfimage.c pdflink.c pdflistout.c pdfliteral.c -nodist_libluatex_a_SOURCES += pdfobj.c pdfoutline.c pdfpage.c pdfrule.c pdfsaverestore.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 luatex_tex_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/tex $(ctangle) @@ -530,6 +527,7 @@ libluatex_a_SOURCES = \ luatexdir/image/writeimg.h \ luatexdir/image/writejbig2.h \ luatexdir/image/writejpg.h \ + luatexdir/image/writejp2.h \ luatexdir/image/writepng.h \ luatexdir/lang/hnjalloc.h \ luatexdir/lang/hyphen.h \ @@ -541,6 +539,7 @@ libluatex_a_SOURCES = \ luatexdir/lua/lkpselib.c \ luatexdir/lua/llanglib.c \ luatexdir/lua/llualib.c \ + luatexdir/lua/llfslibext.c \ luatexdir/lua/lnodelib.c \ luatexdir/lua/loslibext.c \ luatexdir/lua/liolib.c \ @@ -551,11 +550,8 @@ libluatex_a_SOURCES = \ luatexdir/lua/ltokenlib.c \ luatexdir/lua/luagen.h \ luatexdir/lua/luatex-api.h \ + luatexdir/luascripts/pdflua.h \ luatexdir/luatex.h \ - luatexdir/ocp/ocp.h \ - luatexdir/ocp/ocplist.h \ - luatexdir/ocp/readocp.h \ - luatexdir/ocp/runocp.h \ luatexdir/pdf/pagetree.h \ luatexdir/pdf/pdfaction.h \ luatexdir/pdf/pdfannot.h \ @@ -568,6 +564,7 @@ libluatex_a_SOURCES = \ luatexdir/pdf/pdflink.h \ luatexdir/pdf/pdflistout.h \ luatexdir/pdf/pdfliteral.h \ + luatexdir/pdf/pdfluaapi.h \ luatexdir/pdf/pdfobj.h \ luatexdir/pdf/pdfoutline.h \ luatexdir/pdf/pdfpage.h \ @@ -617,8 +614,8 @@ libluatex_a_SOURCES = \ luatexdir/utils/managed-sa.h \ luatexdir/utils/synctex-common.h \ luatexdir/utils/synctex-luatex.h \ - luatexdir/utils/synctex.c \ luatexdir/utils/synctex.h \ + luatexdir/utils/synctex.c \ luatexdir/utils/utils.h nodist_libluatex_a_SOURCES += \ diff --git a/Build/source/texk/web2c/luatexdir/am/luafontforge.am b/Build/source/texk/web2c/luatexdir/am/luafontforge.am index 5f90b53b5b7..7864ac82ac5 100644 --- a/Build/source/texk/web2c/luatexdir/am/luafontforge.am +++ b/Build/source/texk/web2c/luatexdir/am/luafontforge.am @@ -11,8 +11,7 @@ libff_a_DEPENDENCIES = libluamisc.a $(libff_a_OBJECTS): $(libff_a_DEPENDENCIES) -libff_a_CPPFLAGS = \ - $(AM_CPPFLAGS) \ +libff_a_CPPFLAGS = $(AM_CPPFLAGS) \ -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 \ diff --git a/Build/source/texk/web2c/luatexdir/am/luamisc.am b/Build/source/texk/web2c/luatexdir/am/luamisc.am index 5f43cf2b64a..8518f3022ce 100644 --- a/Build/source/texk/web2c/luatexdir/am/luamisc.am +++ b/Build/source/texk/web2c/luatexdir/am/luamisc.am @@ -12,7 +12,7 @@ libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a $(libluamisc_a_OBJECTS): $(libluamisc_a_DEPENDENCIES) -libluamisc_a_CPPFLAGS = \ +libluamisc_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(ZLIB_INCLUDES) \ $(ZZIPLIB_INCLUDES) \ -I$(top_srcdir)/luatexdir/lua51 diff --git a/Build/source/texk/web2c/luatexdir/am/luasocket.am b/Build/source/texk/web2c/luatexdir/am/luasocket.am index 4dfb0149861..03b947ede2c 100644 --- a/Build/source/texk/web2c/luatexdir/am/luasocket.am +++ b/Build/source/texk/web2c/luatexdir/am/luasocket.am @@ -11,7 +11,7 @@ libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) liblua51.a $(libluasocket_a_OBJECTS): liblua51.a -libluasocket_a_CPPFLAGS = \ +libluasocket_a_CPPFLAGS = $(AM_CPPFLAGS) \ -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket -I$(srcdir)/luatexdir/lua51 libluasocket_a_CFLAGS = # $(WARNING_CFLAGS) diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index 84cd5adf423..d438ad2cbad 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -21,14 +21,14 @@ EXTRA_PROGRAMS += luatex nodist_EXTRA_luatex_SOURCES = dummy.cxx luatex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) -luatex_CPPFLAGS += $(XPDF_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 +luatex_CPPFLAGS += $(POPPLER_INCLUDES) $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 luatex_CPPFLAGS += -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 -I$(srcdir)/mplibdir luatex_CPPFLAGS += -Dextra_version_info=`date +-%Y%m%d%H` luatex_CPPFLAGS += -I$(srcdir)/synctexdir -DSYNCTEX_ENGINE_H='<utils/synctex-luatex.h>' luatex_CXXFLAGS = $(WARNING_CXXFLAGS) luatex_ldadd = libluatex.a libff.a libluamisc.a libluasocket.a liblua51.a -luatex_ldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) +luatex_ldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS) luatex_ldadd += $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a luatex_LDFLAGS = -export-dynamic @@ -36,7 +36,7 @@ luatex_LDFLAGS = -export-dynamic luatex_LDADD = $(luatex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs) luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a -luatex_DEPENDENCIES += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND) +luatex_DEPENDENCIES += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(POPPLER_DEPEND) luatex_DEPENDENCIES += $(OBSDCOMPAT_DEPEND) libmd5.a libmplib.a $(luatex_OBJECTS): libluatex.a diff --git a/Build/source/texk/web2c/luatexdir/am/txt2zlib.am b/Build/source/texk/web2c/luatexdir/am/txt2zlib.am new file mode 100644 index 00000000000..4936ac7a28b --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/am/txt2zlib.am @@ -0,0 +1,19 @@ +## texk/web2c/luatexdir/am/txt2zlib.am: Makefile fragment for txt2zlib. +## +## Copyright (C) 2010 Hartmut Henkel <hartmut@luatex.org> +## You may freely use, modify and/or distribute this file. +## +## $Id: txt2zlib.am 3958 2010-11-12 22:57:13Z hhenkel $ + +noinst_PROGRAMS += txt2zlib + +nodist_txt2zlib_SOURCES = txt2zlib.c +txt2zlib_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) +txt2zlib_DEPENDENCIES = $(ZLIB_DEPEND) +txt2zlib_CFLAGS = $(WARNING_CFLAGS) +txt2zlib_LDADD = $(ZLIB_LIBS) $(LDADD) +DISTCLEANFILES += txt2zlib.c + +txt2zlib.c: ctangle$(EXEEXT) luatexdir/luascripts/txt2zlib.w + $(luatex_luascripts_ctangle) txt2zlib.w + |