X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/blobdiff_plain/18c831dcd0ae4d660c70ccac69d27ed2a97851be..33e3ac9056f046affd69e3b8871275e5e2697aa4:/utils/Makefile.am

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 226e86a..2f6ed7c 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -32,6 +32,10 @@ libutils_la_SOURCES	 =
 ###--------------------------------------------------------------------------
 ### Component files.
 
+## Compiler checking.
+pkginclude_HEADERS	+= compiler.h
+LIBMANS			+= compiler.3
+
 ## Utility macros.
 pkginclude_HEADERS	+= macros.h
 LIBMANS			+= macros.3
@@ -44,20 +48,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 +73,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 --------------------------------------------------