diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-06-26 07:35:06 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-06-26 07:35:06 +0000 |
commit | d0c3117e5c8cea5fe0d1a44f1e71e52238eda87e (patch) | |
tree | 037acf292d5408aa20359396e2c33cdc78c8ef15 /Build/source/texk/web2c | |
parent | a9d413edd25d84283f1222cb1d2e1beba5ba1daa (diff) |
build system: Fix dependencies for build `on demand'
git-svn-id: svn://tug.org/texlive/trunk@30950 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r-- | Build/source/texk/web2c/Makefile.in | 9 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 5 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/libluatex.am | 2 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luasocket.am | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luatex.am | 3 |
5 files changed, 13 insertions, 10 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 217893e56e8..a86d5bba4f5 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -2510,7 +2510,7 @@ pdftosrc_SOURCES = pdftexdir/pdftosrc.cc pdftosrc_LDADD = $(pdftex_ldadd) $(LDADD) pdftosrc_DEPENDENCIES = $(pdftex_dependencies) pdftosrc_tests = pdftexdir/pdftosrc.test -libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) $(LUA_DEPEND) +libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) libluasocket_a_CPPFLAGS = \ -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket $(LUA_INCLUDES) @@ -2849,8 +2849,7 @@ luatex_ldadd = libluatex.a libff.a libluamisc.a libluasocket.a \ luatex_LDFLAGS = -export-dynamic luatex_LDADD = $(luatex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs) luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a \ - $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(POPPLER_DEPEND) libmd5.a \ - libmplib.a + $(LIBPNG_DEPEND) libmd5.a libmplib.a luatex_SOURCES = luatexdir/luatex_svnversion.h luatexdir/luatex.c luatexdir/luatex.h call_luatex_CPPFLAGS = -DEXEPROG=\"luatex.exe\" nodist_call_luatex_SOURCES = callexe.c @@ -10798,7 +10797,7 @@ pdftex.ch: tie$(EXEEXT) $(pdftex_ch_srcs) $(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) -$(libluasocket_a_OBJECTS): $(LUA_LIBS) +$(libluasocket_a_OBJECTS): $(LUA_DEPEND) $(libluamisc_a_OBJECTS): $(libluamisc_a_DEPENDENCIES) @@ -11015,7 +11014,7 @@ utils.c: ctangle$(EXEEXT) luatexdir/utils/utils.w unistring.c: ctangle$(EXEEXT) luatexdir/utils/unistring.w $(luatex_utils_ctangle) unistring.w -$(libluatex_a_OBJECTS): libff.a libmplib.a +$(libluatex_a_OBJECTS): libff.a libmplib.a $(POPPLER_DEPEND) $(luatex_OBJECTS): libluatex.a diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 6965d69ac1e..171cd9e08cc 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,8 @@ +2013-06-26 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/libluatex.am, am/luasocket.am, am/luatex.am: + Correct dependencies for build `on demand'. + 2013-06-19 Peter Breitenlohner <peb@mppmu.mpg.de> * lua52/: Moved to ../../../libs/lua52/. diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index 2e39a3b266a..7c23a7c1eda 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -504,7 +504,7 @@ libluatex_a_SOURCES += \ libluatex_a_SOURCES += \ mplibdir/lmplib.c -$(libluatex_a_OBJECTS): libff.a libmplib.a +$(libluatex_a_OBJECTS): libff.a libmplib.a $(POPPLER_DEPEND) EXTRA_DIST += $(libluatex_web) diff --git a/Build/source/texk/web2c/luatexdir/am/luasocket.am b/Build/source/texk/web2c/luatexdir/am/luasocket.am index 8da1a893a94..91f3e4e4e01 100644 --- a/Build/source/texk/web2c/luatexdir/am/luasocket.am +++ b/Build/source/texk/web2c/luatexdir/am/luasocket.am @@ -7,9 +7,9 @@ ## EXTRA_LIBRARIES += libluasocket.a -libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) $(LUA_DEPEND) +libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) -$(libluasocket_a_OBJECTS): $(LUA_LIBS) +$(libluasocket_a_OBJECTS): $(LUA_DEPEND) libluasocket_a_CPPFLAGS = \ -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket $(LUA_INCLUDES) diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index eacf0a044b7..a4a7f2ced09 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -36,8 +36,7 @@ luatex_LDFLAGS = -export-dynamic luatex_LDADD = $(luatex_ldadd) $(LDADD) $(LIBADD_DLOPEN) $(lua_socketlibs) luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a -luatex_DEPENDENCIES += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(POPPLER_DEPEND) -luatex_DEPENDENCIES += libmd5.a libmplib.a +luatex_DEPENDENCIES += $(LIBPNG_DEPEND) libmd5.a libmplib.a $(luatex_OBJECTS): libluatex.a |