From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 11 Sep 2016 14:03:59 +0000 (+0100)
Subject: vars.am, symm/Makefile.am: Associate built test vector files with logs.
X-Git-Tag: 2.3.0~37
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/3c8d8c60a5e3f08f84c327e7476c6095843e23ab

vars.am, symm/Makefile.am: Associate built test vector files with logs.

Previously they were associated with the test executables, but that's
not the right approach, and it's going to be a problem if we don't fix
it.

Unfortunately, Automake only allows dependencies on test log files if
the test-file suffix is listed in $(TEST_EXTENSIONS).
---

diff --git a/symm/Makefile.am b/symm/Makefile.am
index 4539e0a3..2c1cc06f 100644
--- a/symm/Makefile.am
+++ b/symm/Makefile.am
@@ -118,7 +118,7 @@ endif
 ## Adams and Tavares' `CAST' block ciphers.
 BLKCS			+= cast128 cast256
 libsymm_la_SOURCES	+= cast-s.c cast-sk.c cast-base.h
-cast256.t$(EXEEXT): t/cast256
+cast256.log: t/cast256
 EXTRA_DIST		+= t/cast256.aes
 MAINTAINERCLEANFILES	+= $(srcdir)/t/cast256
 t/cast256: t/cast256.aes
@@ -160,7 +160,7 @@ $(precomp)/symm/mars-tab.c:
 	$(AM_V_GEN)./mars-mktab >$(precomp)/symm/mars-tab.c.new && \
 		mv $(precomp)/symm/mars-tab.c.new $(precomp)/symm/mars-tab.c
 endif
-mars.t$(EXEEXT): t/mars
+mars.log: t/mars
 EXTRA_DIST		+= t/mars.aes
 MAINTAINERCLEANFILES	+= $(srcdir)/t/mars
 t/mars: t/mars.aes
@@ -204,7 +204,7 @@ $(precomp)/symm/rijndael-tab.c:
 		mv $(precomp)/symm/rijndael-tab.c.new \
 			$(precomp)/symm/rijndael-tab.c
 endif
-rijndael.t$(EXEEXT): t/rijndael
+rijndael.log: t/rijndael
 EXTRA_DIST		+= t/rijndael.aes
 MAINTAINERCLEANFILES	+= $(srcdir)/t/rijndael
 t/rijndael: t/rijndael.aes
@@ -233,7 +233,7 @@ BLKCS			+= serpent
 libsymm_la_SOURCES	+= serpent-sbox.h
 check_PROGRAMS		+= serpent-check
 TESTS			+= serpent-check
-serpent.t$(EXEEXT): t/serpent
+serpent.log: t/serpent
 EXTRA_DIST		+= t/serpent.aes
 MAINTAINERCLEANFILES	+= $(srcdir)/t/serpent
 t/serpent: t/serpent.aes
@@ -278,7 +278,7 @@ $(precomp)/symm/twofish-tab.c:
 		mv $(precomp)/symm/twofish-tab.c.new \
 			$(precomp)/symm/twofish-tab.c
 endif
-twofish.t$(EXEEXT): t/twofish
+twofish.log: t/twofish
 EXTRA_DIST		+= t/twofish.aes
 MAINTAINERCLEANFILES	+= $(srcdir)/t/twofish
 t/twofish: t/twofish.aes
@@ -418,7 +418,7 @@ STUBS_HDR		+= XSalsa20/12,xsalsa2012,salsa20
 STUBS_HDR		+= XSalsa20/8,xsalsa208,salsa20
 EXTRA_DIST		+= t/salsa20
 MAINTAINERCLEANFILES	+= t/salsa20
-salsa20.t$(EXEEXT): t/salsa20
+salsa20.log: t/salsa20
 SALSA20_ESTREAM_TV	 = t/salsa20.estream
 SALSA20_ESTREAM_TV	+= t/salsa2012.estream
 SALSA20_ESTREAM_TV	+= t/salsa208.estream
diff --git a/vars.am b/vars.am
index ea5cbc0e..feb75884 100644
--- a/vars.am
+++ b/vars.am
@@ -108,6 +108,7 @@ AM_CPPFLAGS		 = $(CATACOMB_INCLUDES)
 ###--------------------------------------------------------------------------
 ### Testing.
 
+TEST_EXTENSIONS		 = .t
 SUFFIXES		+= .c .t$(EXEEXT) .to
 .c.to:
 	$(AM_V_CC)$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $< -o $@