X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/blobdiff_plain/236f657b6dab66f31f4902cecfc03b4673f5bb98..7cf5c72a6d353ed5a7e340562c11e54c21c85e5e:/utils/Makefile.am

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 226e86a..b52e7f6 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -44,20 +44,21 @@ LIBMANS			+= align.3
 pkginclude_HEADERS	+= bits.h
 LIBMANS			+= bits.3
 
-EXTRA_DIST		+= bits.in bits-testgen.c
-tests:: bits.t bits.in
-	./bits.t -f $(srcdir)/bits.in
-
-check_PROGRAMS		+= bits.t
-bits_t_SOURCES		 = bits.c
-bits_t_CPPFLAGS		 = $(TEST_CPPFLAGS)
-bits_t_LDFLAGS		 = -static
+check_PROGRAMS		+= t/bits.t
+t_bits_t_SOURCES	 = t/bits-test.c
+t_bits_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
+t_bits_t_LDFLAGS	 = -static
+EXTRA_DIST		+= t/bits-testgen.py
 
 ## Exceptions.
 pkginclude_HEADERS	+= exc.h
 libutils_la_SOURCES	+= exc.c
 LIBMANS			+= exc.3
 
+check_PROGRAMS		+= t/exc.t
+t_exc_t_SOURCES		 = t/exc-test.c
+t_exc_t_LDFLAGS		 = -static
+
 ## String handling.
 pkginclude_HEADERS	+= str.h
 libutils_la_SOURCES	+= str.c
@@ -68,13 +69,10 @@ pkginclude_HEADERS	+= versioncmp.h
 libutils_la_SOURCES	+= versioncmp.c
 LIBMANS			+= versioncmp.3
 
-EXTRA_DIST		+= versioncmp.in
-tests:: versioncmp.t versioncmp.in
-	./versioncmp.t -f $(srcdir)/versioncmp.in
-
-check_PROGRAMS		+= versioncmp.t
-versioncmp_t_SOURCES	 = versioncmp-test.c
-versioncmp_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
-versioncmp_t_LDFLAGS	 = -static
+check_PROGRAMS		+= t/versioncmp.t
+t_versioncmp_t_SOURCES	 = t/versioncmp-test.c
+t_versioncmp_t_CPPFLAGS	 = $(TEST_CPPFLAGS)
+t_versioncmp_t_LDFLAGS	 = -static
+EXTRA_DIST		+= t/versioncmp.tests
 
 ###----- That's all, folks --------------------------------------------------