texk/web2c: Build system: Fix various dependencies

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

9 files changed, 28 insertions, 4 deletions

diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index c01bbe1fd49..3f849bf8a64 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/web.am: Fix dependencies for 'make check'.
+
 2015-07-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* texmfmp.h: Declare convertStringToHexString() and getmd5sum().
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 3032929ec86..81b9d406a02 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -15381,6 +15381,7 @@ weave-web2c: weave.p $(web2c_depend)
 	@$(web2c) weave
 weave.p: tangle$(EXEEXT) weave.web weave.ch
 	$(tangle) weave weave
+pooltype.log: pooltype$(EXEEXT) tex.pool
 ctie.c: ctangle$(EXEEXT) ctiedir/ctie.w ctiedir/ctie-k.ch
 	$(ctangle_silent)CWEBINPUTS=$(srcdir)/ctiedir $(ctangle) ctie.w ctie-k.ch
 $(cweave_OBJECTS): cweb.h
@@ -15468,7 +15469,7 @@ $(mflua_OBJECTS) $(mflua_nowin_OBJECTS): mfluad.h mfluadir/mflua_version.h
 # We must create mfluad.h before building the libmflua_a_OBJECTS.
 $(libmflua_a_OBJECTS): mfluad.h
 
-$(mflua_c_h): mflua-web2c $(LUA_LIBS)
+$(mflua_c_h): mflua-web2c $(LUA_DEPEND)
 	@$(web2c) mflua
 mflua-web2c: mflua.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluadir/mflua.defines
 	@$(web2c) mflua
@@ -15515,7 +15516,7 @@ $(mfluajit_OBJECTS) $(mfluajit_nowin_OBJECTS): mfluajitd.h mfluadir/mflua_versio
 # We must create mfluajitd.h before building the libmfluajit_a_OBJECTS.
 $(libmfluajit_a_OBJECTS): mfluajitd.h
 
-$(mfluajit_c_h): mfluajit-web2c $(LUAJIT_LIBS)
+$(mfluajit_c_h): mfluajit-web2c $(LUAJIT_DEPEND)
 	@$(web2c) mfluajit
 mfluajit-web2c: mfluajit.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluajitdir/mfluajit.defines
 	@$(web2c) mfluajit
@@ -16275,6 +16276,9 @@ ovp2ovf.p: otangle$(EXEEXT) ovp2ovf.web omegaware/ovp2ovf.ch
 	$(tangle_silent)$(ow_otangle) ovp2ovf ovp2ovf
 ovp2ovf.web: tie$(EXEEXT) omegaware/ovp2ovf.web omegaware/ovp2ovf.up
 	$(tie_m) omegaware/ovp2ovf.web omegaware/ovp2ovf.up
+omegaware/odvicopy.log: odvicopy$(EXEEXT) odvitype$(EXEEXT)
+omegaware/odvitype.log: odvitype$(EXEEXT)
+omegaware/otangle.log: otangle$(EXEEXT)
 
 # We must create alephd.h before building the aleph_OBJECTS.
 $(aleph_OBJECTS): alephd.h
diff --git a/Build/source/texk/web2c/am/web.am b/Build/source/texk/web2c/am/web.am
index 2448409ca34..08f9a1e9c11 100644
--- a/Build/source/texk/web2c/am/web.am
+++ b/Build/source/texk/web2c/am/web.am
@@ -185,6 +185,7 @@ DISTCLEANFILES += tests/xcmr10.pktyp
 ## pltotf.test
 DISTCLEANFILES += badpl.* tests/xcmr10.tfm
 ## pooltype.test
+pooltype.log: pooltype$(EXEEXT) tex.pool
 DISTCLEANFILES += tests/xtexpool.typ
 ## tftopl.test
 DISTCLEANFILES += badtfm.* tests/xcmr10*.pl
diff --git a/Build/source/texk/web2c/mfluadir/ChangeLog b/Build/source/texk/web2c/mfluadir/ChangeLog
index 07000a7f866..1fb7aae18ea 100644
--- a/Build/source/texk/web2c/mfluadir/ChangeLog
+++ b/Build/source/texk/web2c/mfluadir/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/mflua.am: Fix dependencies.
+
 2015-07-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/mflua.am, mfluac.[ch]: Use lkpselib.c.
diff --git a/Build/source/texk/web2c/mfluadir/am/mflua.am b/Build/source/texk/web2c/mfluadir/am/mflua.am
index a241ec13ee0..cf4387a3f98 100644
--- a/Build/source/texk/web2c/mfluadir/am/mflua.am
+++ b/Build/source/texk/web2c/mfluadir/am/mflua.am
@@ -68,7 +68,7 @@ libmflua_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) -DMF_LUA
 # We must create mfluad.h before building the libmflua_a_OBJECTS.
 $(libmflua_a_OBJECTS): mfluad.h
 
-$(mflua_c_h): mflua-web2c $(LUA_LIBS)
+$(mflua_c_h): mflua-web2c $(LUA_DEPEND)
 	@$(web2c) mflua
 mflua-web2c: mflua.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluadir/mflua.defines
 	@$(web2c) mflua
diff --git a/Build/source/texk/web2c/mfluajitdir/ChangeLog b/Build/source/texk/web2c/mfluajitdir/ChangeLog
index 675f6def274..e06f75abcd2 100644
--- a/Build/source/texk/web2c/mfluajitdir/ChangeLog
+++ b/Build/source/texk/web2c/mfluajitdir/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/mfluajit.am: Fix dependencies.
+
 2015-07-03  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/mfluajit.am, mfluac.[ch]: Use lkpselib.c.
diff --git a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
index 38c16430ac0..808d9c7b958 100644
--- a/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
+++ b/Build/source/texk/web2c/mfluajitdir/am/mfluajit.am
@@ -68,7 +68,7 @@ libmfluajit_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) -DMF_LUA -DJIT
 # We must create mfluajitd.h before building the libmfluajit_a_OBJECTS.
 $(libmfluajit_a_OBJECTS): mfluajitd.h
 
-$(mfluajit_c_h): mfluajit-web2c $(LUAJIT_LIBS)
+$(mfluajit_c_h): mfluajit-web2c $(LUAJIT_DEPEND)
 	@$(web2c) mfluajit
 mfluajit-web2c: mfluajit.p $(web2c_texmf) web2c/cvtmf1.sed web2c/cvtmf2.sed mfluajitdir/mfluajit.defines
 	@$(web2c) mfluajit
diff --git a/Build/source/texk/web2c/omegaware/ChangeLog b/Build/source/texk/web2c/omegaware/ChangeLog
index 01480911ed7..4a47e11cc8c 100644
--- a/Build/source/texk/web2c/omegaware/ChangeLog
+++ b/Build/source/texk/web2c/omegaware/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* am/omegaware.am: Fix dependencies for 'make check'.
+
 2015-06-22  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* am/omegaware.am: Use $(tie_m).
diff --git a/Build/source/texk/web2c/omegaware/am/omegaware.am b/Build/source/texk/web2c/omegaware/am/omegaware.am
index 802dd5b6be1..db86b56e56b 100644
--- a/Build/source/texk/web2c/omegaware/am/omegaware.am
+++ b/Build/source/texk/web2c/omegaware/am/omegaware.am
@@ -137,6 +137,7 @@ EXTRA_DIST += \
 	omegaware/tests/liguse.opl omegaware/tests/liguse1.opl omegaware/tests/liguse2.opl
 DISTCLEANFILES += omegaware/tests/xlig*.*
 ## omegaware/odvicopy.test (and ofonts.test)
+omegaware/odvicopy.log: odvicopy$(EXEEXT) odvitype$(EXEEXT)
 EXTRA_DIST += \
 	omegaware/tests/ofontd1.dvi omegaware/tests/ofontd1.typ \
 	omegaware/tests/ofontd2.dvi omegaware/tests/ofontd2.typ \
@@ -146,6 +147,7 @@ EXTRA_DIST += \
 	omegaware/tests/ofontv5.ovf omegaware/tests/ofontv6.ovf
 DISTCLEANFILES += ofont*vf omegaware/tests/xpagenum.*
 ## omegaware/odvitype.test (and odvicopy.test, ofonts.test)
+omegaware/odvitype.log: odvitype$(EXEEXT)
 EXTRA_DIST += omegaware/tests/ofontd0.dtl omegaware/tests/ofontd0.dvi \
 	omegaware/tests/ofontd0.typ omegaware/tests/ofontr0.tfm \
 	omegaware/tests/ofontr1.tfm omegaware/tests/ofontr2.ofm \
@@ -166,6 +168,7 @@ DISTCLEANFILES += omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
 	omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
 	omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.*
 ## omegaware/otangle.test
+omegaware/otangle.log: otangle$(EXEEXT)
 DISTCLEANFILES += ocftest.*
 ## omegaware/overbmp.test
 EXTRA_DIST += omegaware/tests/inbmp.opl omegaware/tests/overbmp.opl \