diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-04-13 06:12:45 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-04-13 06:12:45 +0000 |
commit | f5f40c67a09cef7d4ab7a8a65c12a261b0bf0206 (patch) | |
tree | cdb6b938c53bfd53bf805e44ed3b3dd4d59d90ef /Build/source/texk/web2c/luatexdir/am | |
parent | 7de2289e693d3fd86402207517568f99511aa916 (diff) |
luatex build fixes and cleanup
git-svn-id: svn://tug.org/texlive/trunk@22068 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/am')
6 files changed, 14 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/luatexdir/am/liblua51.am b/Build/source/texk/web2c/luatexdir/am/liblua51.am index 8f4e80782c0..1067e4da432 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 = $(AM_CPPFLAGS) -I$(top_srcdir)/luatexdir/lua51 +liblua51_a_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 73a909d32a4..4d3e50cbfc9 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -130,13 +130,14 @@ nodist_libluatex_a_SOURCES += luagen.c luainit.c luanode.c luastuff.c luatoken.c ##********************************************************************** luatex_luascripts_txt2zlib = $(TXTTOZLIB) -luatex_luascripts_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/luascripts $(ctangle) pdflua.c: txt2zlib$(EXEEXT) luatexdir/luascripts/pdflua.lua $(luatex_luascripts_txt2zlib) $(srcdir)/luatexdir/luascripts/pdflua.lua pdflua.c nodist_libluatex_a_SOURCES += pdflua.c +EXTRA_DIST += luatexdir/luascripts/pdflua.lua + ##********************************************************************** luatex_lang_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/lang $(ctangle) @@ -614,8 +615,8 @@ libluatex_a_SOURCES = \ luatexdir/utils/managed-sa.h \ luatexdir/utils/synctex-common.h \ luatexdir/utils/synctex-luatex.h \ - luatexdir/utils/synctex.h \ luatexdir/utils/synctex.c \ + luatexdir/utils/synctex.h \ 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 7864ac82ac5..3b9847586eb 100644 --- a/Build/source/texk/web2c/luatexdir/am/luafontforge.am +++ b/Build/source/texk/web2c/luatexdir/am/luafontforge.am @@ -1,6 +1,6 @@ ## texk/web2c/luatexdir/am/luafontforge.am: Makefile fragment for libff. ## -## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org> ## You may freely use, modify and/or distribute this file. ## luafontforge diff --git a/Build/source/texk/web2c/luatexdir/am/luamisc.am b/Build/source/texk/web2c/luatexdir/am/luamisc.am index 8518f3022ce..5f43cf2b64a 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 = $(AM_CPPFLAGS) \ +libluamisc_a_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 03b947ede2c..4dfb0149861 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 = $(AM_CPPFLAGS) \ +libluasocket_a_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/txt2zlib.am b/Build/source/texk/web2c/luatexdir/am/txt2zlib.am index 4936ac7a28b..31d702df15b 100644 --- a/Build/source/texk/web2c/luatexdir/am/txt2zlib.am +++ b/Build/source/texk/web2c/luatexdir/am/txt2zlib.am @@ -1,6 +1,6 @@ ## texk/web2c/luatexdir/am/txt2zlib.am: Makefile fragment for txt2zlib. ## -## Copyright (C) 2010 Hartmut Henkel <hartmut@luatex.org> +## Copyright (C) 2010, 2011 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 $ @@ -8,12 +8,16 @@ noinst_PROGRAMS += txt2zlib nodist_txt2zlib_SOURCES = txt2zlib.c -txt2zlib_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) +txt2zlib_CPPFLAGS = $(ZLIB_INCLUDES) txt2zlib_DEPENDENCIES = $(ZLIB_DEPEND) txt2zlib_CFLAGS = $(WARNING_CFLAGS) -txt2zlib_LDADD = $(ZLIB_LIBS) $(LDADD) +txt2zlib_LDADD = $(ZLIB_LIBS) DISTCLEANFILES += txt2zlib.c +luatex_luascripts_ctangle = CWEBINPUTS=$(srcdir)/luatexdir/luascripts $(ctangle) + txt2zlib.c: ctangle$(EXEEXT) luatexdir/luascripts/txt2zlib.w $(luatex_luascripts_ctangle) txt2zlib.w +EXTRA_DIST += luatexdir/luascripts/txt2zlib.w + |