From 8f45ff6cb9a269fc6f8f631908f93b4c8123419c Mon Sep 17 00:00:00 2001
Message-Id: <8f45ff6cb9a269fc6f8f631908f93b4c8123419c.1714015883.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 4 Jan 2009 01:51:59 +0000
Subject: [PATCH] Makefile: Use check_PROGRAMS target.
Organization: Straylight/Edgeware

From: Mark Wooding <mdw@distorted.org.uk>

This saves building the test programs if we don't actually need them.
---
 Makefile.am | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5c0fd2b..8b79b3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ pkglibexecdir		 = $(libexecdir)/$(PACKAGE)
 SUBDIRS			 =
 BUILT_SOURCES		 =
 bin_PROGRAMS		 =
-noinst_PROGRAMS		 =
+check_PROGRAMS		 =
 lib_LTLIBRARIES		 =
 noinst_LTLIBRARIES	 =
 pkglibexec_PROGRAMS	 =
@@ -94,7 +94,7 @@ EXTRA_DIST		+= bits.in bits-testgen.c
 tests:: bits.t bits.in
 	./bits.t -f $(srcdir)/bits.in
 
-noinst_PROGRAMS		+= bits.t
+check_PROGRAMS		+= bits.t
 bits_t_SOURCES		 = bits.c
 bits_t_CPPFLAGS		 = $(TEST_CPPFLAGS)
 bits_t_LDFLAGS		 = -static
@@ -115,7 +115,7 @@ EXTRA_DIST		+= versioncmp.in
 tests:: versioncmp.t versioncmp.in
 	./versioncmp.t -f $(srcdir)/versioncmp.in
 
-noinst_PROGRAMS		+= versioncmp.t
+check_PROGRAMS		+= versioncmp.t
 versioncmp_t_SOURCES	 = versioncmp-test.c
 versioncmp_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
 versioncmp_t_LDFLAGS	 = -static
@@ -166,7 +166,7 @@ unihash-global.c: unihash-mkstatic$(EXEEXT)
 	./unihash-mkstatic -c -sunihash_global -iunihash.h -o$@.new && \
 		mv $@.new $@
 
-noinst_PROGRAMS		+= unihash.t
+check_PROGRAMS		+= unihash.t
 unihash_t_SOURCES	 = unihash.c
 unihash_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
 unihash_t_LDFLAGS	 = -static
@@ -200,7 +200,7 @@ tests:: darray.t da.in da.ref
 	cmp da.out da.ref
 	@echo "darray OK"
 
-noinst_PROGRAMS		+= darray.t
+check_PROGRAMS		+= darray.t
 darray_t_SOURCES	 = da-test.c
 darray_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
 darray_t_LDFLAGS	 = -static
@@ -229,7 +229,7 @@ tests:: sym.t sym.in sym.ref
 	cmp sym.out sym.ref
 	@echo "sym OK"
 
-noinst_PROGRAMS		+= sym.t
+check_PROGRAMS		+= sym.t
 sym_t_SOURCES		 = sym-test.c
 sym_t_CPPFLAGS		 = $(TEST_CPPFLAGS)
 sym_t_LDFLAGS		 = -static
@@ -258,7 +258,7 @@ tests:: assoc.t sym.in sym.ref
 	cmp assoc.out sym.ref
 	@echo "sym OK"
 
-noinst_PROGRAMS		+= assoc.t
+check_PROGRAMS		+= assoc.t
 assoc_t_SOURCES		 = assoc-test.c
 assoc_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
 assoc_t_LDFLAGS		 = -static
@@ -301,7 +301,7 @@ tests:: base64.t base64.in base64.ref
 	cmp base64.out $(srcdir)/base64.in
 	@echo "base64 OK"
 
-noinst_PROGRAMS		+= base64.t
+check_PROGRAMS		+= base64.t
 base64_t_SOURCES	 = base64.c
 base64_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
 base64_t_LDFLAGS	 = -static
@@ -319,7 +319,7 @@ tests:: base32.t base32.in base32.ref
 	cmp base32.out $(srcdir)/base32.in
 	@echo "base32 OK"
 
-noinst_PROGRAMS		+= base32.t
+check_PROGRAMS		+= base32.t
 base32_t_SOURCES	 = base32.c
 base32_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
 base32_t_LDFLAGS	 = -static
@@ -337,7 +337,7 @@ tests:: hex.t hex.in hex.ref
 	cmp hex.out $(srcdir)/hex.in
 	@echo "hex OK"
 
-noinst_PROGRAMS		+= hex.t
+check_PROGRAMS		+= hex.t
 hex_t_SOURCES		 = hex.c
 hex_t_CPPFLAGS		 = $(TEST_CPPFLAGS)
 hex_t_LDFLAGS		 = -static
-- 
[mdw]