Update qf dependency stuff for recent automake

Not sure just what version of automake broke things, but I do remember
having a bad time getting the dependencies to work in the first place.
At least now they should be more reliable (until automake changes
things).

tools/qfcc/test/Makefile.am

@@ -31,9 +31,9 @@ fail_bins=
 test_progs_dat=\
 	chewed-alias.dat \
 	chewed-return.dat \
+	deadbool.dat \
 	func-expr.dat \
 	func-static.dat \
-	deadbool.dat \
 	infloop.dat \
 	modulo.dat \
 	paramret.dat \
@@ -47,8 +47,8 @@ test_progs_dat=\
 	triangle.dat \
 	vecexpr.dat \
 	vecinit.dat \
-	while.dat \
+	voidfor.dat \
-	voidfor.dat
+	while.dat
 
 fail_progs_dat=
 
@@ -68,13 +68,16 @@ test_harness_SOURCES=		test-bi.c test-harness.c
 test_harness_LDADD=			$(QFCC_TEST_LIBS)
 test_harness_DEPENDENCIES=	$(QFCC_TEST_DEPS)
 
+r_depfiles_remade=
+
 chewed_alias_dat_SOURCES=chewed-alias.r
 chewed_alias_obj=$(chewed_alias_dat_SOURCES:.r=.qfo)
 chewed-alias.dat$(EXEEXT): $(chewed_alias_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(chewed_alias_obj)
 chewed-alias.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/chewed-alias.Qo
+include ./$(DEPDIR)/chewed-alias.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/chewed-alias.Qo
 
 chewed_return_dat_SOURCES=chewed-return.r
 chewed_return_obj=$(chewed_return_dat_SOURCES:.r=.qfo)
@@ -82,23 +85,8 @@ chewed-return.dat$(EXEEXT): $(chewed_return_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(chewed_return_obj)
 chewed-return.run: Makefile build-run
 	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
-include ./$(DEPDIR)/chewed-return.Qo
+include ./$(DEPDIR)/chewed-return.Qo # am--include-marker
-
+r_depfiles_remade += ./$(DEPDIR)/chewed-return.Qo
-func_expr_dat_SOURCES=func-expr.r
-func_expr_obj=$(func_expr_dat_SOURCES:.r=.qfo)
-func-expr.dat$(EXEEXT): $(func_expr_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(func_expr_obj)
-func-expr.run: Makefile build-run
-	$(srcdir)/build-run $@
-include ./$(DEPDIR)/func-expr.Qo
-
-func_static_dat_SOURCES=func-static.r
-func_static_obj=$(func_static_dat_SOURCES:.r=.qfo)
-func-static.dat$(EXEEXT): $(func_static_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(func_static_obj)
-func-static.run: Makefile build-run
-	$(srcdir)/build-run $@
-include ./$(DEPDIR)/func-static.Qo
 
 deadbool_dat_SOURCES=deadbool.r
 deadbool_obj=$(deadbool_dat_SOURCES:.r=.qfo)
@@ -106,7 +94,26 @@ deadbool.dat$(EXEEXT): $(deadbool_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(deadbool_obj)
 deadbool.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/deadbool.Qo
+include ./$(DEPDIR)/deadbool.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/deadbool.Qo
+
+func_expr_dat_SOURCES=func-expr.r
+func_expr_obj=$(func_expr_dat_SOURCES:.r=.qfo)
+func-expr.dat$(EXEEXT): $(func_expr_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(func_expr_obj)
+func-expr.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/func-expr.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/func-expr.Qo
+
+func_static_dat_SOURCES=func-static.r
+func_static_obj=$(func_static_dat_SOURCES:.r=.qfo)
+func-static.dat$(EXEEXT): $(func_static_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(func_static_obj)
+func-static.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/func-static.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/func-static.Qo
 
 infloop_dat_SOURCES=infloop.r
 infloop_obj=$(infloop_dat_SOURCES:.r=.qfo)
@@ -114,7 +121,8 @@ infloop.dat$(EXEEXT): $(infloop_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(infloop_obj)
 infloop.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/infloop.Qo
+include ./$(DEPDIR)/infloop.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/infloop.Qo
 
 modulo_dat_SOURCES=modulo.r
 modulo_obj=$(modulo_dat_SOURCES:.r=.qfo)
@@ -122,7 +130,8 @@ modulo.dat$(EXEEXT): $(modulo_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(modulo_obj)
 modulo.run: Makefile build-run
 	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
-include ./$(DEPDIR)/modulo.Qo
+include ./$(DEPDIR)/modulo.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/modulo.Qo
 
 paramret_dat_SOURCES=paramret.r
 paramret_obj=$(paramret_dat_SOURCES:.r=.qfo)
@@ -130,7 +139,8 @@ paramret.dat$(EXEEXT): $(paramret_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(paramret_obj)
 paramret.run: Makefile build-run
 	TEST_HARNESS_OPTS=--float $(srcdir)/build-run $@
-include ./$(DEPDIR)/paramret.Qo
+include ./$(DEPDIR)/paramret.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/paramret.Qo
 
 quaternion_dat_SOURCES=quaternion.r
 quaternion_obj=$(quaternion_dat_SOURCES:.r=.qfo)
@@ -138,7 +148,8 @@ quaternion.dat$(EXEEXT): $(quaternion_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(quaternion_obj)
 quaternion.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/quaternion.Qo
+include ./$(DEPDIR)/quaternion.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/quaternion.Qo
 
 return_ivar_dat_SOURCES=return-ivar.r
 return_ivar_obj=$(return_ivar_dat_SOURCES:.r=.qfo)
@@ -146,7 +157,8 @@ return-ivar.dat$(EXEEXT): $(return_ivar_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(return_ivar_obj)
 return-ivar.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/return-ivar.Qo
+include ./$(DEPDIR)/return-ivar.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/return-ivar.Qo
 
 sendv_dat_SOURCES=sendv.r
 sendv_obj=$(sendv_dat_SOURCES:.r=.qfo)
@@ -154,7 +166,8 @@ sendv.dat$(EXEEXT): $(sendv_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(sendv_obj)
 sendv.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/sendv.Qo
+include ./$(DEPDIR)/sendv.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/sendv.Qo
 
 state_dat_SOURCES=state.r
 state_obj=$(state_dat_SOURCES:.r=.qfo)
@@ -162,7 +175,8 @@ state.dat$(EXEEXT): $(state_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(state_obj)
 state.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/state.Qo
+include ./$(DEPDIR)/state.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/state.Qo
 
 structlive_dat_SOURCES=structlive.r
 structlive_obj=$(structlive_dat_SOURCES:.r=.qfo)
@@ -170,7 +184,8 @@ structlive.dat$(EXEEXT): $(structlive_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structlive_obj)
 structlive.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/structlive.Qo
+include ./$(DEPDIR)/structlive.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/structlive.Qo
 
 structptr_dat_SOURCES=structptr.r
 structptr_obj=$(structptr_dat_SOURCES:.r=.qfo)
@@ -178,7 +193,8 @@ structptr.dat$(EXEEXT): $(structptr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(structptr_obj)
 structptr.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/structptr.Qo
+include ./$(DEPDIR)/structptr.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/structptr.Qo
 
 swap_dat_SOURCES=swap.r
 swap_obj=$(swap_dat_SOURCES:.r=.qfo)
@@ -186,7 +202,8 @@ swap.dat$(EXEEXT): $(swap_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(swap_obj)
 swap.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/swap.Qo
+include ./$(DEPDIR)/swap.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/swap.Qo
 
 triangle_dat_SOURCES=triangle.r
 triangle_obj=$(triangle_dat_SOURCES:.r=.qfo)
@@ -194,7 +211,8 @@ triangle.dat$(EXEEXT): $(triangle_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(triangle_obj)
 triangle.run: Makefile build-run
 	$(srcdir)/build-run $@ 100000 100000 1.00005 50002.4961
-include ./$(DEPDIR)/triangle.Qo
+include ./$(DEPDIR)/triangle.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/triangle.Qo
 
 vecexpr_dat_SOURCES=vecexpr.r
 vecexpr_obj=$(vecexpr_dat_SOURCES:.r=.qfo)
@@ -202,7 +220,8 @@ vecexpr.dat$(EXEEXT): $(vecexpr_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(vecexpr_obj)
 vecexpr.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/vecexpr.Qo
+include ./$(DEPDIR)/vecexpr.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/vecexpr.Qo
 
 vecinit_dat_SOURCES=vecinit.r
 vecinit_obj=$(vecinit_dat_SOURCES:.r=.qfo)
@@ -210,15 +229,8 @@ vecinit.dat$(EXEEXT): $(vecinit_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(vecinit_obj)
 vecinit.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/vecinit.Qo
+include ./$(DEPDIR)/vecinit.Qo # am--include-marker
-
+r_depfiles_remade += ./$(DEPDIR)/vecinit.Qo
-while_dat_SOURCES=while.r
-while_obj=$(while_dat_SOURCES:.r=.qfo)
-while.dat$(EXEEXT): $(while_obj) $(QFCC_DEP)
-	$(QFCC) $(QCFLAGS) -o $@ $(while_obj)
-while.run: Makefile build-run
-	$(srcdir)/build-run $@
-include ./$(DEPDIR)/while.Qo
 
 voidfor_dat_SOURCES=voidfor.r
 voidfor_obj=$(voidfor_dat_SOURCES:.r=.qfo)
@@ -226,8 +238,24 @@ voidfor.dat$(EXEEXT): $(voidfor_obj) $(QFCC_DEP)
 	$(QFCC) $(QCFLAGS) -o $@ $(voidfor_obj)
 voidfor.run: Makefile build-run
 	$(srcdir)/build-run $@
-include ./$(DEPDIR)/voidfor.Qo
+include ./$(DEPDIR)/voidfor.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/voidfor.Qo
 
+while_dat_SOURCES=while.r
+while_obj=$(while_dat_SOURCES:.r=.qfo)
+while.dat$(EXEEXT): $(while_obj) $(QFCC_DEP)
+	$(QFCC) $(QCFLAGS) -o $@ $(while_obj)
+while.run: Makefile build-run
+	$(srcdir)/build-run $@
+include ./$(DEPDIR)/while.Qo # am--include-marker
+r_depfiles_remade += ./$(DEPDIR)/while.Qo
+
+$(r_depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+
+am--depfiles: $(am__depfiles_remade) $(r_depfiles_remade)
 
 EXTRA_DIST= test-bi.h build-run test-defspace.h
 CLEANFILES= *.dat *.sym *.qfo *.run *.frame