summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/luatexdir/am
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-10-07 13:00:49 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-10-07 13:00:49 +0000
commitfe3f8b9c55ab825497837f98fad165d9ed75560f (patch)
tree1047c3194594d5758f50e632a99cbf36fd4cb638 /Build/source/texk/web2c/luatexdir/am
parente09dd5638b67d66f92d29b9a4a2d33d5c84ac50d (diff)
Lua(JIT)TeX: Simplify the build system
git-svn-id: svn://tug.org/texlive/trunk@38577 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/am')
-rw-r--r--Build/source/texk/web2c/luatexdir/am/libluatex.am18
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luafontforge.am38
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luatex.am2
3 files changed, 27 insertions, 31 deletions
diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am
index 19fc671a3fe..6fffb43de4a 100644
--- a/Build/source/texk/web2c/luatexdir/am/libluatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am
@@ -13,12 +13,15 @@ LUA_DEPEND = $(LUA52_DEPEND)
##
EXTRA_LIBRARIES += libluatex.a libluajittex.a
-libluatex_a_DEPENDENCIES = libff.a
-libluajittex_a_DEPENDENCIES = libjitff.a
+libluatex_a_DEPENDENCIES = libff.a libluamisc.a
+libluajittex_a_DEPENDENCIES = libff.a libluajitmisc.a
libluatex_a_preflags = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES)
libluatex_a_preflags += $(POPPLER_INCLUDES) -I$(srcdir)/libmd5
libluatex_a_preflags += -DpdfTeX -I$(srcdir)/luatexdir
+libluatex_a_preflags += -I$(srcdir)/luatexdir/unilib
+libluatex_a_preflags += -I$(srcdir)/luatexdir/luafontloader/fontforge/inc
+libluatex_a_preflags += -DLUA_FF_LIB=1 -I$(srcdir)/luatexdir/luafontloader/fontforge/fontforge
libluatex_a_preflags += -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' -I$(srcdir)/synctexdir
libluatex_a_CPPFLAGS = $(libluatex_a_preflags) $(LUA_INCLUDES)
@@ -42,8 +45,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 libmplib.a libluamisc.a $(POPPLER_DEPEND)
+$(libluajittex_a_OBJECTS): libff.a libmplib.a libluajitmisc.a $(POPPLER_DEPEND)
## from luatexdir
##
@@ -57,6 +60,13 @@ dist_libluatex_sources = \
luatexdir/luatex-common.h \
luatexdir/ptexlib.h
+## from luatexdir/luafontloader/src
+##
+dist_libluatex_sources += \
+ luatexdir/luafontloader/src/ffdummies.c \
+ luatexdir/luafontloader/src/ffdummies.h \
+ luatexdir/luafontloader/src/luafflib.c
+
## from luatexdir/dvi
##
luatex_dvi_ctangle = $(ctangle_silent)CWEBINPUTS=$(srcdir)/luatexdir/dvi $(ctangle)
diff --git a/Build/source/texk/web2c/luatexdir/am/luafontforge.am b/Build/source/texk/web2c/luatexdir/am/luafontforge.am
index e629ca20061..3707f894d9b 100644
--- a/Build/source/texk/web2c/luatexdir/am/luafontforge.am
+++ b/Build/source/texk/web2c/luatexdir/am/luafontforge.am
@@ -1,36 +1,26 @@
## texk/web2c/luatexdir/am/luafontforge.am: Makefile fragment for libff.
##
-## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## luafontforge
##
-EXTRA_LIBRARIES += libff.a libjitff.a
+EXTRA_LIBRARIES += libff.a
-libff_a_DEPENDENCIES = libunilib.a libluamisc.a
-libjitff_a_DEPENDENCIES = libunilib.a libluajitmisc.a
+$(libff_a_OBJECTS): libunilib.a
-$(libff_a_OBJECTS): $(libff_a_DEPENDENCIES)
-$(libjitff_a_OBJECTS): $(libjitff_a_DEPENDENCIES)
+libff_a_CPPFLAGS = $(AM_CPPFLAGS) \
+ -DLUA_FF_LIB=1 -D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 -DUSE_OUR_MEMORY=1 \
+ -I$(srcdir)/w2c \
+ -I$(srcdir)/luatexdir \
+ -I$(srcdir)/luatexdir/unilib \
+ -I$(srcdir)/luatexdir/luafontloader/fontforge/inc \
+ -I$(srcdir)/luatexdir/luafontloader/fontforge/fontforge
-libff_a_postflags = -DLUA_FF_LIB=1 -D_NO_PYTHON=1 -DX_DISPLAY_MISSING=1 \
- -DUSE_OUR_MEMORY=1 \
- -I$(top_srcdir)/w2c \
- -I$(top_srcdir)/luatexdir \
- -I$(top_srcdir)/luatexdir/unilib \
- -I$(top_srcdir)/luatexdir/luafontloader/fontforge/inc \
- -I$(top_srcdir)/luatexdir/luafontloader/fontforge/fontforge
-
-libff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) $(libff_a_postflags)
-libjitff_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) -DLuajitTeX $(libff_a_postflags)
libff_a_CFLAGS = # $(WARNING_CFLAGS)
-libjitff_a_CFLAGS = # $(WARNING_CFLAGS)
-
-nodist_libff_a_SOURCES = $(libff_sources)
-nodist_libjitff_a_SOURCES = $(libff_sources)
-libff_sources = \
+libff_a_SOURCES = \
luatexdir/luafontloader/fontforge/fontforge/PfEd.h \
luatexdir/luafontloader/fontforge/fontforge/autohint.c \
luatexdir/luafontloader/fontforge/fontforge/baseviews.h \
@@ -96,11 +86,7 @@ libff_sources = \
luatexdir/luafontloader/fontforge/inc/basics.h \
luatexdir/luafontloader/fontforge/inc/gfile.h \
luatexdir/luafontloader/fontforge/inc/gimage.h \
- luatexdir/luafontloader/fontforge/inc/intl.h \
- luatexdir/luafontloader/src/ffdummies.c \
- luatexdir/luafontloader/src/luafflib.c
-
-EXTRA_DIST += $(libff_sources)
+ luatexdir/luafontloader/fontforge/inc/intl.h
## Not used
##
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index ac147077c94..891a11030d5 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -53,7 +53,7 @@ luatex_postldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(POPPLER_LIBS)
luatex_postldadd += $(LDADD) libmputil.a libunilib.a libmd5.a $(lua_socketlibs)
luatex_LDADD = libluatex.a libff.a libluamisc.a libluasocket.a $(LUA_LIBS) $(luatex_postldadd)
-luajittex_LDADD = libluajittex.a libjitff.a libluajitmisc.a libluajitsocket.a $(LUAJIT_LIBS) $(luatex_postldadd)
+luajittex_LDADD = libluajittex.a libff.a libluajitmisc.a libluajitsocket.a $(LUAJIT_LIBS) $(luatex_postldadd)
luatex_depend = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) libmputil.a libmd5.a
luatex_DEPENDENCIES = $(luatex_depend) libluatex.a