From d7cae99d81f3378f609d6b635f780b52fd2b2af5 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Mon, 12 Apr 2010 16:19:26 +0000 Subject: luatex build problems git-svn-id: svn://tug.org/texlive/trunk@17814 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/ChangeLog | 7 +++++++ Build/source/texk/web2c/luatexdir/am/libluatex.am | 2 +- Build/source/texk/web2c/luatexdir/am/luatangle.am | 5 ----- Build/source/texk/web2c/luatexdir/am/luatex.am | 2 +- Build/source/texk/web2c/luatexdir/luafontloader/ff-config.in | 2 -- 5 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 Build/source/texk/web2c/luatexdir/am/luatangle.am diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 31a0dd6411d..4e34ea4e3ef 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,10 @@ +2010-04-12 Peter Breitenlohner + + * am/luatex.am: Remove libmplib.a from $($(luatex_OBJECTS)'s + dependencies ... + * am/libluatex.am: and add to $(libluatex_a_OBJECTS)'s + dependencies; otherwise parallel builds may fail. + 2010-04-04 Taco Hoekwater * import of luatex 0.60.0, with a few local changes: diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index 9a0397ddd3f..cbff094261d 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -621,7 +621,7 @@ libluatex_a_SOURCES = \ $(nodist_libluatex_a_SOURCES) \ mplibdir/lmplib.c -$(libluatex_a_OBJECTS): libff.a +$(libluatex_a_OBJECTS): libff.a libmplib.a EXTRA_DIST += $(libluatex_web) diff --git a/Build/source/texk/web2c/luatexdir/am/luatangle.am b/Build/source/texk/web2c/luatexdir/am/luatangle.am deleted file mode 100644 index 39218db3d56..00000000000 --- a/Build/source/texk/web2c/luatexdir/am/luatangle.am +++ /dev/null @@ -1,5 +0,0 @@ -## texk/web2c/luatexdir/am/luatangle.am: Makefile fragment for luatangle. -## -## Copyright (C) 2009 Peter Breitenlohner -## You may freely use, modify and/or distribute this file. - diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index e979f60865a..2b0660f5d2d 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -32,7 +32,7 @@ luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a luatex_DEPENDENCIES += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND) luatex_DEPENDENCIES += $(OBSDCOMPAT_DEPEND) libmd5.a libmplib.a -$(luatex_OBJECTS): libluatex.a libmplib.a +$(luatex_OBJECTS): libluatex.a luatex_SOURCES = luatexdir/luatex_svnversion.h luatexdir/luatex.c luatexdir/luatex.h diff --git a/Build/source/texk/web2c/luatexdir/luafontloader/ff-config.in b/Build/source/texk/web2c/luatexdir/luafontloader/ff-config.in index f36a6ebad3c..17ce6a5bf1e 100644 --- a/Build/source/texk/web2c/luatexdir/luafontloader/ff-config.in +++ b/Build/source/texk/web2c/luatexdir/luafontloader/ff-config.in @@ -1,5 +1,3 @@ -/* @configure_input@ */ - /* Guard against double inclusion. */ #ifndef FF_CONFIG_H #define FF_CONFIG_H -- cgit v1.2.3