X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/blobdiff_plain/d04f47331945f4316c495b1a8a034a8dba1862c6..c2168cf64919e11d6ed71bb3477a75bcefd89cf6:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0fbd799..81b9515 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-Makefile-*-
 ##
-## $Id: Makefile.am,v 1.33 2002/01/13 13:26:59 mdw Exp $
+## $Id: Makefile.am,v 1.36 2003/05/18 15:17:04 mdw Exp $
 ##
 ## Building the distribution
 ##
@@ -29,6 +29,15 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## Revision 1.36  2003/05/18 15:17:04  mdw
+## Version bump.
+##
+## Revision 1.35  2003/05/16 00:22:57  mdw
+## Test base64 and hex encoding.
+##
+## Revision 1.34  2003/04/23 12:51:03  mdw
+## New manpage installer.
+##
 ## Revision 1.33  2002/01/13 13:26:59  mdw
 ## New hex encoding stuff.  Rename test programs.
 ##
@@ -134,7 +143,7 @@ pkginclude_HEADERS = \
 
 ## --- Things to put in the library ---
 
-libmLib_la_LDFLAGS = -version-info 2:0:0
+libmLib_la_LDFLAGS = -version-info 2:1:0
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
@@ -163,7 +172,7 @@ crc_mktab_SOURCES = crc-mktab.c mdwopt.c quis.c pquis.c report.c str.c
 noinst_PROGRAMS = da.t sym.t assoc.t bits.t
 
 check: \
-	da.test sym.test assoc.test bits.test
+	da.test sym.test assoc.test bits.test base64.test hex.test
 
 da_t_SOURCES = da-test.c
 da_t_LDADD = libmLib.la
@@ -173,8 +182,8 @@ da.in: $(srcdir)/da-gtest
 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; }
+	./da.t <da.in >da.out
+	cmp da.out da.ref
 	@echo "darray tested OK."
 
 sym_t_SOURCES = sym-test.c
@@ -185,16 +194,16 @@ sym.in: $(srcdir)/sym-gtest
 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; }
+	./sym.t <sym.in >sym.out
+	cmp sym.out sym.ref
 	@echo "sym tested OK."
 
 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; }
+	./assoc.t <sym.in >assoc.out
+	cmp assoc.out sym.ref
 	@echo "assoc tested OK."
 
 bits_t_SOURCES = bits.c
@@ -202,19 +211,42 @@ bits_t_LDADD = libmLib.la
 bits_t_LDFLAGS = -static
 bits.o: bits.c
 	$(COMPILE) -c -DSRCDIR="\"$(srcdir)\"" $(srcdir)/bits.c -o bits.o
-bits-test: bits.t
-	./bits.t -f $(srcdir)/bits.test
+bits.test: bits.t
+	./bits.t -f $(srcdir)/bits.in
+
+base64.to: base64.c
+	$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/base64.c -o base64.to
+base64.t: base64.to base64.o libmLib.la
+	$(CC) $(CFLAGS) $(LDFLAGS) base64.to .libs/libmLib.a $(LIBS) -o base64.t
+base64.test: base64.t base64.in base64.ref
+	./base64.t <$(srcdir)/base64.in >base64.out
+	cmp base64.out $(srcdir)/base64.ref
+	./base64.t -d <$(srcdir)/base64.ref >base64.out
+	cmp base64.out $(srcdir)/base64.in
+	@echo "base64 tested OK."
+
+hex.to: hex.c
+	$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/hex.c -o hex.to
+hex.t: hex.to hex.o libmLib.la
+	$(CC) $(CFLAGS) $(LDFLAGS) hex.to .libs/libmLib.a $(LIBS) -o hex.t
+hex.test: hex.t hex.in hex.ref
+	./hex.t <$(srcdir)/hex.in >hex.out
+	cmp hex.out $(srcdir)/hex.ref
+	./hex.t -d <$(srcdir)/hex.ref >hex.out
+	cmp hex.out $(srcdir)/hex.in
+	@echo "hex tested OK."
 
 TEST_CLEAN = \
-	da.in da.ref da.test \
-	sym.in sym.ref sym.test \
-	base64.test hex.test
+	*.t \
+	da.in da.ref da.out \
+	sym.in sym.ref sym.out \
+	base64.out hex.out 
 
 TEST_DIST = \
 	da-gtest da-ref \
 	sym-gtest sym-ref \
-	bits.test bits-testgen.c \
-	base64.in hex.in
+	bits.in bits-testgen.c \
+	base64.in base64.ref hex.in hex.ref
 
 ## --- Background resolver ---
 ##
@@ -234,9 +266,11 @@ bres.lo: $(srcdir)/bres.c
 
 install-man:
 	(cd man && $(MAKE) install-man)
+uninstall-man:
+	(cd man && $(MAKE) uninstall-man)
 
 CLEANFILES = $(TEST_CLEAN) crc32-tab.c
 DISTCLEANFILES = libtool
-EXTRA_DIST = $(TEST_DIST)
+EXTRA_DIST = $(TEST_DIST) maninst
 
 ##----- That's all, folks ---------------------------------------------------