diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-10 10:27:09 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-11-10 10:27:09 +0000 |
commit | 5e8e9500102800e68c9e7fcac9e85c1668b71a36 (patch) | |
tree | 81d79ac70ffbb127e8063f18c8f55475ca169ee1 /Build/source/texk/web2c/luatexdir/am | |
parent | e6a9c88ada2f11dd61e4c4e39dff84944bed5787 (diff) |
towards TL2010: texk/web2c
git-svn-id: svn://tug.org/texlive/trunk@15964 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/luatexdir/am')
8 files changed, 29 insertions, 23 deletions
diff --git a/Build/source/texk/web2c/luatexdir/am/liblua51.am b/Build/source/texk/web2c/luatexdir/am/liblua51.am index 135f2a802f8..1067e4da432 100644 --- a/Build/source/texk/web2c/luatexdir/am/liblua51.am +++ b/Build/source/texk/web2c/luatexdir/am/liblua51.am @@ -11,6 +11,7 @@ liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 if !MINGW32 liblua51_a_CPPFLAGS += -DLUA_USE_POSIX endif !MINGW32 +liblua51_a_CFLAGS = # $(WARNING_CFLAGS) liblua51_a_SOURCES = \ luatexdir/lua51/lapi.c \ diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index 3de565a776d..13a2fea4410 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -9,12 +9,12 @@ EXTRA_LIBRARIES += libluatex.a libluatex_a_DEPENDENCIES = libff.a -$(libluatex_a_OBJECTS): libff.a $(nodist_luatex_SOURCES) - libluatex_a_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) libluatex_a_CPPFLAGS += $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 libluatex_a_CPPFLAGS += -Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 libluatex_a_CPPFLAGS += -DpdfTeX +libluatex_a_CFLAGS = # $(WARNING_CFLAGS) +libluatex_a_CXXFLAGS = # $(WARNING_CXXFLAGS) libluatex_a_SOURCES = \ luatexdir/commands.h \ @@ -126,7 +126,8 @@ libluatex_a_SOURCES = \ ## included by luatexdir/font/writettf.c EXTRA_libluatex_a_SOURCES = luatexdir/font/macnames.c -$(libluatex_a_OBJECTS): libff.a +# We must create libff.a and luatexd.h before building the libluatex_a_OBJECTS +$(libluatex_a_OBJECTS): libff.a luatexd.h luatexdir/luatexextra.h EXTRA_DIST += \ luatexdir/ChangeLog \ diff --git a/Build/source/texk/web2c/luatexdir/am/libzzip.am b/Build/source/texk/web2c/luatexdir/am/libzzip.am index 2b7a5579aac..af3d487a790 100644 --- a/Build/source/texk/web2c/luatexdir/am/libzzip.am +++ b/Build/source/texk/web2c/luatexdir/am/libzzip.am @@ -14,6 +14,7 @@ $(libzzip_a_OBJECTS): liblua51.a libzzip_a_CPPFLAGS = \ $(ZLIB_INCLUDES) \ -I$(top_srcdir)/luatexdir/zziplib +libzzip_a_CFLAGS = $(WARNING_CFLAGS) libzzip_a_SOURCES = \ luatexdir/zziplib/zzip/__debug.h \ diff --git a/Build/source/texk/web2c/luatexdir/am/luafontforge.am b/Build/source/texk/web2c/luatexdir/am/luafontforge.am index 8669cfd3571..8cf02189eda 100644 --- a/Build/source/texk/web2c/luatexdir/am/luafontforge.am +++ b/Build/source/texk/web2c/luatexdir/am/luafontforge.am @@ -18,6 +18,7 @@ libff_a_CPPFLAGS = \ -I$(top_srcdir)/luatexdir/lua51 \ -I$(top_srcdir)/luatexdir/luafontloader/fontforge/inc \ -I$(top_srcdir)/luatexdir/luafontloader/fontforge/fontforge +libff_a_CFLAGS = # $(WARNING_CFLAGS) libff_a_SOURCES = \ luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c \ diff --git a/Build/source/texk/web2c/luatexdir/am/luamisc.am b/Build/source/texk/web2c/luatexdir/am/luamisc.am index bc8e46ebd86..c772427c2b1 100644 --- a/Build/source/texk/web2c/luatexdir/am/luamisc.am +++ b/Build/source/texk/web2c/luatexdir/am/luamisc.am @@ -16,6 +16,7 @@ libluamisc_a_CPPFLAGS = \ $(ZLIB_INCLUDES) \ -I$(top_srcdir)/luatexdir/lua51 \ -I$(top_srcdir)/luatexdir/zziplib +libluamisc_a_CFLAGS = # $(WARNING_CFLAGS) libluamisc_a_SOURCES = \ luatexdir/luafilesystem/src/lfs.c \ diff --git a/Build/source/texk/web2c/luatexdir/am/luasocket.am b/Build/source/texk/web2c/luatexdir/am/luasocket.am index 1a05d72216d..091bb9e9054 100644 --- a/Build/source/texk/web2c/luatexdir/am/luasocket.am +++ b/Build/source/texk/web2c/luatexdir/am/luasocket.am @@ -7,12 +7,13 @@ ## EXTRA_LIBRARIES += libluasocket.a -libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) libzzip.a +libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) libzzip.a -$(libluasocket_a_OBJECTS): libzzip.a +$(libluasocket_a_OBJECTS): libzzip.a libluasocket_a_CPPFLAGS = \ -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket -I$(srcdir)/luatexdir/lua51 +libluasocket_a_CFLAGS = # $(WARNING_CFLAGS) libluasocket_a_SOURCES = \ luatexdir/luasocket/src/auxiliar.c \ diff --git a/Build/source/texk/web2c/luatexdir/am/luatangle.am b/Build/source/texk/web2c/luatexdir/am/luatangle.am index ce96d497093..75fa50ca29d 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatangle.am +++ b/Build/source/texk/web2c/luatexdir/am/luatangle.am @@ -12,10 +12,9 @@ EXTRA_PROGRAMS += luatangle nodist_luatangle_SOURCES = luatangle.c luatangle.h luatangle.c luatangle.h: luatangle-web2c -luatangle-web2c: $(web2c_depend) luatangle.p - $(web2c) luatangle - echo timestamp >$@ - touch luatangle.c luatangle.h + @$(web2c) luatangle +luatangle-web2c: luatangle.p $(web2c_depend) + @$(web2c) luatangle EXTRA_DIST += $(luatangle_sources) diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index c7512a30265..dd77a520aa6 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -10,46 +10,47 @@ bin_PROGRAMS += luatex endif LUATEX EXTRA_PROGRAMS += luatex -## Force Automake to use CXXLD for linking +# Force Automake to use CXXLD for linking nodist_EXTRA_luatex_SOURCES = dummy.cxx -luatex_tangle = WEBINPUTS=$(srcdir)/luatexdir $(buildenv) $(LUATANGLE) +luatex_tangle = WEBINPUTS=$(srcdir)/luatexdir $(SHELL) ./tangle-sh $@ '$(LUATANGLE) --underlines' luatex_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) luatex_CPPFLAGS += $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 luatex_CPPFLAGS += -Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 -I$(srcdir)/mplibdir luatex_CPPFLAGS += -Dextra_version_info=`date +-%Y%m%d%H` +luatex_CFLAGS = # $(WARNING_CFLAGS) +luatex_CXXFLAGS = # $(WARNING_CXXFLAGS) luatex_ldadd = libluatex.a libff.a libluamisc.a libzzip.a libluasocket.a liblua51.a luatex_ldadd += $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) -luatex_ldadd += $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a +luatex_ldadd += $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a luatex_LDADD = $(luatex_ldadd) $(LDADD) $(lua_socketlibs) -luatex_DEPENDENCIES = $(proglib) libluatex.a +luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a luatex_DEPENDENCIES += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND) luatex_DEPENDENCIES += $(OBSDCOMPAT_DEPEND) libmd5.a libmplib.a +# We must create libluatex.a and libmplib.a before building the etex_OBJECTS. $(luatex_OBJECTS): libluatex.a libmplib.a luatex_c_h = luatexini.c luatex0.c luatexcoerce.h luatexd.h nodist_luatex_SOURCES = $(luatex_c_h) luatex-pool.c luatexextra.c luatexdir/luatexextra.h $(luatex_c_h): luatex-web2c + @$(web2c) luatex luatex-web2c: luatex.p $(web2c_texmf) luatexdir/luatex.defines - $(web2c) luatex - echo timestamp >$@ - touch $(luatex_c_h) + @$(web2c) luatex luatexextra.c: luatexd.h luatexdir/luatexextra.h lib/texmfmp.c sed s/TEX-OR-MF-OR-MP/luatex/ $(srcdir)/lib/texmfmp.c >$@ luatex_sources = luatexdir/luatex.web luatexdir/luatex.ch luatex.p luatex.pool: luatex-tangle -luatex-tangle: luatangle$(EXEEXT) $(luatex_sources) - $(luatex_tangle) --underlines luatex luatex - echo timestamp >$@ - touch luatex.p luatex.pool -luatex-pool.c: luatex.pool $(makecpool_stamp) luatexdir/ptexlib.h luatexd.h - $(makecpool) luatex.pool luatexdir/ptexlib.h >$@ || rm -f $@ -## Extract luatex version + @$(luatex_tangle) luatex luatex +luatex-tangle: luatangle$(EXEEXT) $(luatex_sources) tangle-sh + @$(luatex_tangle) luatex luatex +luatex-pool.c: luatex.pool luatexd.h $(makecpool_stamp) + $(makecpool) luatex >$@ || rm -f $@ +# Extract luatex version luatexdir/luatex.version: luatexdir/luatex.web $(mkdir_p) luatexdir grep '^@d luatex_version_string==' $(srcdir)/luatexdir/luatex.web \ |