X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/ba57d6526b809146b9c22d8f166b51d22e3bdb68..c0160f6c79a746d7e8a285ea21c8d43200d1f042:/vars.am

diff --git a/vars.am b/vars.am
index ea5cbc0e..69154072 100644
--- a/vars.am
+++ b/vars.am
@@ -108,12 +108,25 @@ AM_CPPFLAGS		 = $(CATACOMB_INCLUDES)
 ###--------------------------------------------------------------------------
 ### Testing.
 
+TEST_EXTENSIONS		 = .t
 SUFFIXES		+= .c .t$(EXEEXT) .to
+
+## This unpleasant duplication of rules makes the build system basically work
+## for non-GNU make(1) variants, while GNU Make will associate useful
+## additional dependencies with the test programs.  GNU Make seems not to
+## mind the duplicate rules, and uses the second (better) set; non-GNU Make
+## will think the second set refer to bizarrely-named targets which nobody is
+## apparently interested in.
 .c.to:
 	$(AM_V_CC)$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $< -o $@
 .to.t$(EXEEXT):
 	$(AM_V_CCLD)$(LINK) $< $(TEST_LIBS) $(top_builddir)/libcatacomb.la \
 		$(mLib_LIBS) $(CATACOMB_LIBS) $(LIBS)
+%.to: %.c %.lo
+	$(AM_V_CC)$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $< -o $@
+%.t$(EXEEXT): %.to $(TEST_LIBS) $(top_builddir)/libcatacomb.la
+	$(AM_V_CCLD)$(LINK) $+ $(mLib_LIBS) $(CATACOMB_LIBS) $(LIBS)
+
 .PRECIOUS: %.to
 CLEANFILES		+= *.to *.t$(EXEEXT)