struct/dstr-putf.c (dstr_vputf): Rewrite to support `%n$...' specs.

[mLib] / struct / Makefile.am

diff --git a/struct/Makefile.am b/struct/Makefile.am
index 280e52d171c38c1a6a1f71221dab251edb0ae0f3..6365023bc46b70bd064c103fa86bebd0160a9a54 100644 (file)
--- a/struct/Makefile.am
+++ b/struct/Makefile.am
@@ -37,6 +37,10 @@ pkginclude_HEADERS   += dstr.h dspool.h
 libstruct_la_SOURCES   += dstr.c dstr-putf.c dspool.c
 LIBMANS                        += dstr.3 dspool.3
 
+check_PROGRAMS         += t/dstr-putf.t
+t_dstr_putf_t_SOURCES   = t/dstr-putf-test.c
+t_dstr_putf_t_LDFLAGS   = -static
+
 ## Buffers.
 pkginclude_HEADERS     += buf.h
 libstruct_la_SOURCES   += buf.c buf-dstr.c
@@ -47,26 +51,12 @@ pkginclude_HEADERS  += darray.h
 libstruct_la_SOURCES   += darray.c
 LIBMANS                        += darray.3
 
-CLEANFILES             += da.out
-tests:: darray.t da.in da.ref
-       ./darray.t <da.in >da.out
-       cmp da.out da.ref
-       @echo "darray OK"
-
-check_PROGRAMS         += darray.t
-darray_t_SOURCES        = da-test.c
-darray_t_CPPFLAGS       = $(TEST_CPPFLAGS)
-darray_t_LDFLAGS        = -static
-
-EXTRA_DIST             += da-gtest
-CLEANFILES             += da.in
-da.in: da-gtest
-       perl $(srcdir)/da-gtest 10000 >$@.new && mv $@.new $@
+check_PROGRAMS         += t/darray.t
+t_darray_t_SOURCES      = t/da-test.c
+t_darray_t_CPPFLAGS     = $(TEST_CPPFLAGS)
+t_darray_t_LDFLAGS      = -static
 
-EXTRA_DIST             += da-ref
-CLEANFILES             += da.ref
-da.ref: da-ref da.in
-       perl $(srcdir)/da-ref <da.in >$@.new && mv $@.new $@
+EXTRA_DIST             += t/da-gtest.py
 
 ## Hash tables.
 pkginclude_HEADERS     += hash.h
@@ -78,26 +68,12 @@ pkginclude_HEADERS  += sym.h
 libstruct_la_SOURCES   += sym.c
 LIBMANS                        += sym.3
 
-CLEANFILES             += sym.out
-tests:: sym.t sym.in sym.ref
-       ./sym.t <sym.in >sym.out
-       cmp sym.out sym.ref
-       @echo "sym OK"
+check_PROGRAMS         += t/sym.t
+t_sym_t_SOURCES                 = t/sym-test.c
+t_sym_t_CPPFLAGS        = $(TEST_CPPFLAGS)
+t_sym_t_LDFLAGS                 = -static
 
-check_PROGRAMS         += sym.t
-sym_t_SOURCES           = sym-test.c
-sym_t_CPPFLAGS          = $(TEST_CPPFLAGS)
-sym_t_LDFLAGS           = -static
-
-EXTRA_DIST             += sym-gtest
-CLEANFILES             += sym.in
-sym.in: sym-gtest
-       perl $(srcdir)/sym-gtest 10000 >$@.new && mv $@.new $@
-
-EXTRA_DIST             += sym-ref
-CLEANFILES             += sym.ref
-sym.ref: sym-ref sym.in
-       perl $(srcdir)/sym-ref <sym.in >$@.new && mv $@.new $@
+EXTRA_DIST             += t/sym-gtest.py
 
 ## Atoms.
 pkginclude_HEADERS     += atom.h
@@ -109,15 +85,9 @@ pkginclude_HEADERS  += assoc.h
 libstruct_la_SOURCES   += assoc.c
 LIBMANS                        += assoc.3
 
-CLEANFILES             += assoc.out
-tests:: assoc.t sym.in sym.ref
-       ./assoc.t <sym.in >assoc.out
-       cmp assoc.out sym.ref
-       @echo "sym OK"
-
-check_PROGRAMS         += assoc.t
-assoc_t_SOURCES                 = assoc-test.c
-assoc_t_CPPFLAGS        = $(TEST_CPPFLAGS)
-assoc_t_LDFLAGS                 = -static
+check_PROGRAMS         += t/assoc.t
+t_assoc_t_SOURCES       = t/assoc-test.c
+t_assoc_t_CPPFLAGS      = $(TEST_CPPFLAGS)
+t_assoc_t_LDFLAGS       = -static
 
 ###----- That's all, folks --------------------------------------------------