build system: minor cleanup

git-svn-id: svn://tug.org/texlive/trunk@16863 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 15 insertions, 15 deletions

diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index ac34737d8f1..ec335cb2739 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1692,7 +1692,6 @@ liblua51_a_SOURCES = \
 	luatexdir/lua51/lzio.c \
 	luatexdir/lua51/lzio.h
 
-libzzip_a_DEPENDENCIES = liblua51.a
 libzzip_a_CPPFLAGS = \
 	$(ZLIB_INCLUDES) \
 	-I$(top_srcdir)/luatexdir/zziplib
@@ -1729,7 +1728,7 @@ libzzip_a_SOURCES = \
 	luatexdir/zziplib/zzip/zip.c \
 	luatexdir/zziplib/zzip/zzip.h
 
-libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) libzzip.a
+libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) liblua51.a
 libluasocket_a_CPPFLAGS = \
 	-DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket -I$(srcdir)/luatexdir/lua51
 
@@ -1764,7 +1763,7 @@ libluasocket_a_SOURCES = \
 	luatexdir/luasocket/src/udp.h \
 	luatexdir/luasocket/src/usocket.h
 
-libluamisc_a_DEPENDENCIES = libluasocket.a
+libluamisc_a_DEPENDENCIES = libzzip.a libluasocket.a
 libluamisc_a_CPPFLAGS = \
 	$(ZLIB_INCLUDES) \
 	-I$(top_srcdir)/luatexdir/lua51 \
@@ -8296,11 +8295,9 @@ luatangle-web2c: luatangle.p $(web2c_depend)
 luatangle.p: tangle$(EXEEXT) $(luatangle_sources)
 	WEBINPUTS=$(srcdir)/luatexdir $(buildenv) $(TANGLE) luatangle luatangle
 
-$(libzzip_a_OBJECTS): liblua51.a
+$(libluasocket_a_OBJECTS): liblua51.a
 
-$(libluasocket_a_OBJECTS): libzzip.a
-
-$(libluamisc_a_OBJECTS): libluasocket.a
+$(libluamisc_a_OBJECTS): libzzip.a libluasocket.a
 
 $(libff_a_OBJECTS): libluamisc.a
 
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 21f87b6305f..3bf7e4657ec 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Clarify dependencies between luaTeX libraries:
+	* am/libzzip.am: Remove dependency on liblua51.a.
+	* am/luamisc.am: Add dependency on libzzip.a.
+	* am/luasocket.am: Replace dependency on libzzip.a by liblua51.a.
+
 2010-01-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* utils/avl.c (avl_copy): Proper handling of const.
diff --git a/Build/source/texk/web2c/luatexdir/am/libzzip.am b/Build/source/texk/web2c/luatexdir/am/libzzip.am
index af3d487a790..eacdac63e58 100644
--- a/Build/source/texk/web2c/luatexdir/am/libzzip.am
+++ b/Build/source/texk/web2c/luatexdir/am/libzzip.am
@@ -7,10 +7,6 @@
 ##
 EXTRA_LIBRARIES += libzzip.a
 
-libzzip_a_DEPENDENCIES = liblua51.a
-
-$(libzzip_a_OBJECTS): liblua51.a
-
 libzzip_a_CPPFLAGS = \
 	$(ZLIB_INCLUDES) \
 	-I$(top_srcdir)/luatexdir/zziplib
diff --git a/Build/source/texk/web2c/luatexdir/am/luamisc.am b/Build/source/texk/web2c/luatexdir/am/luamisc.am
index c772427c2b1..f50e9a99cd0 100644
--- a/Build/source/texk/web2c/luatexdir/am/luamisc.am
+++ b/Build/source/texk/web2c/luatexdir/am/luamisc.am
@@ -8,9 +8,9 @@
 ## and slnunicode)
 EXTRA_LIBRARIES += libluamisc.a
 
-libluamisc_a_DEPENDENCIES = libluasocket.a
+libluamisc_a_DEPENDENCIES = libzzip.a libluasocket.a
 
-$(libluamisc_a_OBJECTS): libluasocket.a
+$(libluamisc_a_OBJECTS): libzzip.a libluasocket.a
 
 libluamisc_a_CPPFLAGS = \
 	$(ZLIB_INCLUDES) \
diff --git a/Build/source/texk/web2c/luatexdir/am/luasocket.am b/Build/source/texk/web2c/luatexdir/am/luasocket.am
index 091bb9e9054..4dfb0149861 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) libzzip.a
+libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) liblua51.a
 
-$(libluasocket_a_OBJECTS): libzzip.a
+$(libluasocket_a_OBJECTS): liblua51.a
 
 libluasocket_a_CPPFLAGS = \
 	-DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket -I$(srcdir)/luatexdir/lua51