summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/am
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-02-03 13:01:31 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-02-03 13:01:31 +0000
commit4dc568b1e2c01476f34b6c014da3bc487b71aacf (patch)
treea6a389e1a3915bdc1b618eb2aeae27fd7f21b68a /Build/source/texk/web2c/luatexdir/am
parent4a985ab4153e6ba130b801d4cec60709b0a44e47 (diff)
Import LuaTeX snapshot 0.78.3
git-svn-id: svn://tug.org/texlive/trunk@32854 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/am')
-rw-r--r--Build/source/texk/web2c/luatexdir/am/libunilib.am36
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luafontforge.am39
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luatex.am2
3 files changed, 41 insertions, 36 deletions
diff --git a/Build/source/texk/web2c/luatexdir/am/libunilib.am b/Build/source/texk/web2c/luatexdir/am/libunilib.am
new file mode 100644
index 00000000000..3e0662aa96b
--- /dev/null
+++ b/Build/source/texk/web2c/luatexdir/am/libunilib.am
@@ -0,0 +1,36 @@
+## texk/web2c/luatexdir/am/libunilib.am: Makefile fragment for libunilib.
+##
+## Copyright (C) 2013, 2014 Taco Hoekwater <taco@luatex.org>
+## You may freely use, modify and/or distribute this file.
+
+## libunilib
+##
+EXTRA_LIBRARIES += libunilib.a
+
+libunilib_a_CPPFLAGS = $(AM_CPPFLAGS) \
+ -I$(top_srcdir)/w2c \
+ -I$(top_srcdir)/luatexdir/unilib
+
+libunilib_a_CFLAGS = # $(WARNING_CFLAGS)
+
+libunilib_a_SOURCES = \
+ luatexdir/unilib/ArabicForms.c \
+ luatexdir/unilib/alphabet.c \
+ luatexdir/unilib/char.c \
+ luatexdir/unilib/chardata.h \
+ luatexdir/unilib/charset.h \
+ luatexdir/unilib/cjk.c \
+ luatexdir/unilib/combiners.h \
+ luatexdir/unilib/gwwiconv.c \
+ luatexdir/unilib/gwwiconv.h \
+ luatexdir/unilib/ucharmap.c \
+ luatexdir/unilib/unialt.c \
+ luatexdir/unilib/unibasics.h \
+ luatexdir/unilib/usprintf.c \
+ luatexdir/unilib/ustring.c \
+ luatexdir/unilib/ustring.h \
+ luatexdir/unilib/utype.c \
+ luatexdir/unilib/utype.h
+
+EXTRA_DIST += luatexdir/unilib/src/makeutype.c
+
diff --git a/Build/source/texk/web2c/luatexdir/am/luafontforge.am b/Build/source/texk/web2c/luatexdir/am/luafontforge.am
index 78c73eb8f68..eaf2b591076 100644
--- a/Build/source/texk/web2c/luatexdir/am/luafontforge.am
+++ b/Build/source/texk/web2c/luatexdir/am/luafontforge.am
@@ -7,16 +7,15 @@
##
EXTRA_LIBRARIES += libff.a
-libff_a_DEPENDENCIES = libluamisc.a
+libff_a_DEPENDENCIES = libunilib.a libluamisc.a
$(libff_a_OBJECTS): $(libff_a_DEPENDENCIES)
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 \
+ -DLUA_FF_LIB=1 -D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 \
-DUSE_OUR_MEMORY=1 \
-I$(top_srcdir)/w2c \
+ -I$(top_srcdir)/luatexdir/unilib \
-I$(top_srcdir)/luatexdir/luafontloader/fontforge/inc \
-I$(top_srcdir)/luatexdir/luafontloader/fontforge/fontforge
libff_a_CFLAGS = # $(WARNING_CFLAGS)
@@ -24,19 +23,6 @@ libff_a_CFLAGS = # $(WARNING_CFLAGS)
nodist_libff_a_SOURCES = $(libff_sources)
libff_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 \
luatexdir/luafontloader/fontforge/fontforge/autohint.c \
luatexdir/luafontloader/fontforge/fontforge/baseviews.h \
@@ -58,6 +44,7 @@ libff_sources = \
luatexdir/luafontloader/fontforge/fontforge/macbinary.c \
luatexdir/luafontloader/fontforge/fontforge/macenc.c \
luatexdir/luafontloader/fontforge/fontforge/mathconstants.c \
+ luatexdir/luafontloader/fontforge/fontforge/memory.c \
luatexdir/luafontloader/fontforge/fontforge/mm.c \
luatexdir/luafontloader/fontforge/fontforge/mm.h \
luatexdir/luafontloader/fontforge/fontforge/namelist.c \
@@ -66,7 +53,6 @@ libff_sources = \
luatexdir/luafontloader/fontforge/fontforge/parsepfa.c \
luatexdir/luafontloader/fontforge/fontforge/parsettf.c \
luatexdir/luafontloader/fontforge/fontforge/parsettfatt.c \
- luatexdir/luafontloader/fontforge/fontforge/parsettfvar.c \
luatexdir/luafontloader/fontforge/fontforge/pfaedit.h \
luatexdir/luafontloader/fontforge/fontforge/plugins.h \
luatexdir/luafontloader/fontforge/fontforge/psfont.h \
@@ -93,33 +79,16 @@ libff_sources = \
luatexdir/luafontloader/fontforge/fontforge/stemdb.c \
luatexdir/luafontloader/fontforge/fontforge/stemdb.h \
luatexdir/luafontloader/fontforge/fontforge/tottf.c \
- luatexdir/luafontloader/fontforge/fontforge/tottfaat.c \
luatexdir/luafontloader/fontforge/fontforge/tottfgpos.c \
luatexdir/luafontloader/fontforge/fontforge/ttf.h \
luatexdir/luafontloader/fontforge/fontforge/ttfspecial.c \
luatexdir/luafontloader/fontforge/fontforge/uiinterface.h \
luatexdir/luafontloader/fontforge/fontforge/unicoderange.h \
- luatexdir/luafontloader/fontforge/fontforge/views.h \
luatexdir/luafontloader/fontforge/gutils/fsys.c \
luatexdir/luafontloader/fontforge/inc/basics.h \
- luatexdir/luafontloader/fontforge/inc/chardata.h \
- luatexdir/luafontloader/fontforge/inc/charset.h \
- luatexdir/luafontloader/fontforge/inc/dynamic.h \
- luatexdir/luafontloader/fontforge/inc/fileutil.h \
- luatexdir/luafontloader/fontforge/inc/gdraw.h \
luatexdir/luafontloader/fontforge/inc/gfile.h \
- luatexdir/luafontloader/fontforge/inc/ggadget.h \
- luatexdir/luafontloader/fontforge/inc/gicons.h \
luatexdir/luafontloader/fontforge/inc/gimage.h \
- luatexdir/luafontloader/fontforge/inc/gio.h \
- luatexdir/luafontloader/fontforge/inc/gkeysym.h \
- luatexdir/luafontloader/fontforge/inc/gprogress.h \
- luatexdir/luafontloader/fontforge/inc/gresource.h \
- luatexdir/luafontloader/fontforge/inc/gwidget.h \
- luatexdir/luafontloader/fontforge/inc/gwwiconv.h \
luatexdir/luafontloader/fontforge/inc/intl.h \
- luatexdir/luafontloader/fontforge/inc/ustring.h \
- luatexdir/luafontloader/fontforge/inc/utype.h \
luatexdir/luafontloader/src/ffdummies.c \
luatexdir/luafontloader/src/luafflib.c
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index ce9d9c23a4c..a8ee3b2f1eb 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -27,7 +27,7 @@ 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 $(LUA_LIBS)
+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 += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS)