From d04f47331945f4316c495b1a8a034a8dba1862c6 Mon Sep 17 00:00:00 2001
Message-Id: <d04f47331945f4316c495b1a8a034a8dba1862c6.1714802582.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 13 Jan 2002 13:26:59 +0000
Subject: [PATCH] New hex encoding stuff.  Rename test programs.
Organization: Straylight/Edgeware

From: mdw <mdw>

---
 Makefile.am | 75 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 33 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0181434..0fbd799 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-Makefile-*-
 ##
-## $Id: Makefile.am,v 1.32 2001/03/03 12:20:23 mdw Exp $
+## $Id: Makefile.am,v 1.33 2002/01/13 13:26:59 mdw Exp $
 ##
 ## Building the distribution
 ##
@@ -29,6 +29,9 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## Revision 1.33  2002/01/13 13:26:59  mdw
+## New hex encoding stuff.  Rename test programs.
+##
 ## Revision 1.32  2001/03/03 12:20:23  mdw
 ## New macros @DA_FIRST@ and @DA_LAST@ for stack/queue peeking.
 ##
@@ -127,7 +130,7 @@ pkginclude_HEADERS = \
 	env.h fdflags.h fwatch.h lock.h \
 	bres.h conn.h lbuf.h ident.h pkbuf.h sel.h selbuf.h selpk.h sig.h \
 	tv.h \
-	base64.h mdwopt.h str.h testrig.h url.h
+	base64.h hex.h mdwopt.h str.h testrig.h url.h
 
 ## --- Things to put in the library ---
 
@@ -144,7 +147,7 @@ libmLib_la_SOURCES = \
 	env.c fdflags.c fwatch.c lock.c \
 	bres.c conn.c lbuf.c ident.c pkbuf.c sel.c selbuf.c selpk.c sig.c \
 	tv.c \
-	base64.c mdwopt.c str.c testrig.c url.c
+	base64.c hex.c mdwopt.c str.c testrig.c url.c
 
 BUILT_SOURCES = crc32-tab.c
 
@@ -157,37 +160,41 @@ crc_mktab_SOURCES = crc-mktab.c mdwopt.c quis.c pquis.c report.c str.c
 
 ## --- Test code ---
 
-noinst_PROGRAMS = da-test sym-test assoc-test bits.t
-
-check: da-test.test sym-test.test assoc-test.test bits-test
-
-da_test_LDADD = libmLib.la
-da_test_LDFLAGS = -static
-da-test.in: $(srcdir)/da-gtest
-	perl $(srcdir)/da-gtest 10000 >da-test.in
-da-test.ref: da-test.in $(srcdir)/da-ref
-	perl $(srcdir)/da-ref <da-test.in >da-test.ref
-da-test.test: da-test da-test.in da-test.ref
-	./da-test <da-test.in >da-test.test
-	cmp da-test.test da-test.ref || { rm da-test.test; false; }
+noinst_PROGRAMS = da.t sym.t assoc.t bits.t
+
+check: \
+	da.test sym.test assoc.test bits.test
+
+da_t_SOURCES = da-test.c
+da_t_LDADD = libmLib.la
+da_t_LDFLAGS = -static
+da.in: $(srcdir)/da-gtest
+	perl $(srcdir)/da-gtest 10000 >da.in
+da.ref: da.in $(srcdir)/da-ref
+	perl $(srcdir)/da-ref <da.in >da.ref
+da.test: da.t da.in da.ref
+	./da.t <da.in >da.test
+	cmp da.test da.ref || { rm da.test; false; }
 	@echo "darray tested OK."
 
-sym_test_LDADD = libmLib.la
-sym_test_LDFLAGS = -static
-sym-test.in: $(srcdir)/sym-gtest
-	perl $(srcdir)/sym-gtest 10000 >sym-test.in
-sym-test.ref: sym-test.in $(srcdir)/sym-ref
-	perl $(srcdir)/sym-ref <sym-test.in >sym-test.ref
-sym-test.test: sym-test sym-test.in sym-test.ref
-	./sym-test <sym-test.in >sym-test.test
-	cmp sym-test.test sym-test.ref || { rm sym-test.test; false; }
+sym_t_SOURCES = sym-test.c
+sym_t_LDADD = libmLib.la
+sym_t_LDFLAGS = -static
+sym.in: $(srcdir)/sym-gtest
+	perl $(srcdir)/sym-gtest 10000 >sym.in
+sym.ref: sym.in $(srcdir)/sym-ref
+	perl $(srcdir)/sym-ref <sym.in >sym.ref
+sym.test: sym.t sym.in sym.ref
+	./sym.t <sym.in >sym.test
+	cmp sym.test sym.ref || { rm sym.test; false; }
 	@echo "sym tested OK."
 
-assoc_test_LDADD = libmLib.la
-assoc_test_LDFLAGS = -static
-assoc-test.test: assoc-test sym-test.in sym-test.ref
-	./assoc-test <sym-test.in >assoc-test.test
-	cmp assoc-test.test sym-test.ref || { rm assoc-test.test; false; }
+assoc_t_SOURCES = assoc-test.c
+assoc_t_LDADD = libmLib.la
+assoc_t_LDFLAGS = -static
+assoc.test: assoc.t sym.in sym.ref
+	./assoc.t <sym.in >assoc.test
+	cmp assoc.test sym.ref || { rm assoc.test; false; }
 	@echo "assoc tested OK."
 
 bits_t_SOURCES = bits.c
@@ -199,13 +206,15 @@ bits-test: bits.t
 	./bits.t -f $(srcdir)/bits.test
 
 TEST_CLEAN = \
-	da-test.in da-test.ref da-test.test \
-	sym-test.in sym-test.ref sym-test.test
+	da.in da.ref da.test \
+	sym.in sym.ref sym.test \
+	base64.test hex.test
 
 TEST_DIST = \
 	da-gtest da-ref \
 	sym-gtest sym-ref \
-	bits.test bits-testgen.c
+	bits.test bits-testgen.c \
+	base64.in hex.in
 
 ## --- Background resolver ---
 ##
-- 
[mdw]