X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/ad61a8f85b8e2dc5b3bbfe0629480e635af8bd3f..d6cf7c44a1ff98293ce71cdf5d9d195c2b89caa6:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c583808..aa3aa1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-Makefile-*-
 ##
-## $Id: Makefile.am,v 1.41 2003/11/29 11:59:17 mdw Exp $
+## $Id$
 ##
 ## Building the distribution
 ##
@@ -26,112 +26,6 @@
 ## Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 ## MA 02111-1307, USA.
 
-##----- Revision history ----------------------------------------------------
-##
-## $Log: Makefile.am,v $
-## Revision 1.41  2003/11/29 11:59:17  mdw
-## Various stuff.
-##
-## Revision 1.40  2003/11/10 10:01:14  mdw
-## Various Debian fixes.
-##
-## Revision 1.39  2003/11/09 13:48:43  mdw
-## Debianization\!
-##
-## Revision 1.38  2003/10/12 14:54:18  mdw
-## Version bump.
-##
-## Revision 1.37  2003/10/12 14:44:46  mdw
-## Various fixes.
-##
-## 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.
-##
-## Revision 1.32  2001/03/03 12:20:23  mdw
-## New macros @DA_FIRST@ and @DA_LAST@ for stack/queue peeking.
-##
-## Revision 1.31  2001/02/03 18:43:56  mdw
-## New feature: watch a file for changes.
-##
-## Revision 1.30  2001/01/25 21:11:41  mdw
-## Use `$(MAKE)' in the `install-man' rule, so that the jobserver doesn't
-## whinge.
-##
-## Revision 1.29  2001/01/21 19:05:21  mdw
-## Add test driver for associations.
-##
-## Revision 1.28  2001/01/20 12:07:04  mdw
-## Put `bres' in a different place.
-##
-## Revision 1.27  2001/01/20 11:46:49  mdw
-## Add new files.
-##
-## Revision 1.26  2000/10/14 16:46:44  mdw
-## Make sure that the bits testcase gets its test vector from the source
-## directory.
-##
-## Revision 1.25  2000/10/08 11:20:57  mdw
-## Clean some more files.
-##
-## Revision 1.24  2000/10/08 11:08:25  mdw
-## (crc-mktab): now requires str.c.
-##
-## Revision 1.23  2000/07/29 10:06:10  mdw
-## Support `make -j' building.
-##
-## Revision 1.22  2000/07/21 19:01:33  mdw
-## Generate the CRC table rather than hardcoding it.
-##
-## Revision 1.21  2000/07/16 18:57:52  mdw
-## New files.  Test cases for `bits.h'.
-##
-## Revision 1.20  2000/06/17 10:39:43  mdw
-## Various new source files.
-##
-## Revision 1.17  1999/11/11 18:47:33  mdw
-## Use `libtool' to generate a shared library.
-##
-## Revision 1.16  1999/11/11 17:48:28  mdw
-## New configuration system for library clients.
-##
-## Revision 1.15  1999/10/22 22:40:49  mdw
-## New source files.  New testing system for sym and dynarray.
-##
-## Revision 1.11  1999/07/06 19:36:05  mdw
-## Various minor bugfixes.
-##
-## Revision 1.10  1999/07/06 19:18:47  mdw
-## Handle new manual page directory.
-##
-## Revision 1.8  1999/05/21 22:16:08  mdw
-## Reorder the source files again, in an attempt to make them slightly
-## logical.  It hasn't really succeeded, although it is an improvement.
-##
-## Revision 1.6  1999/05/15 10:33:53  mdw
-## Add simplified locking code.
-##
-## Revision 1.5  1999/05/14 21:01:28  mdw
-## Integrated `select' handling bits from the background resolver project.
-##
-## Revision 1.2  1998/11/25 23:30:30  mdw
-## Add `tv.c'and `tv.h' to the list.
-##
-## Revision 1.1.1.1  1998/06/17 23:44:42  mdw
-## Initial version of mLib
-##
-## Revision 1.5  1997/08/13 17:55:43  mdw
-## Add big GPL header.  General tidying up.
-##
-
 ## --- Options ---
 
 AUTOMAKE_OPTIONS = foreign
@@ -141,55 +35,74 @@ AUTOMAKE_OPTIONS = foreign
 SUBDIRS = man
 
 bin_SCRIPTS = mLib-config
-bin_PROGRAMS = crc-mktab
+bin_PROGRAMS = crc-mktab unihash-mkstatic
 
 lib_LTLIBRARIES = libmLib.la
 pkglibexecdir = $(libexecdir)/$(PACKAGE)
-pkglibexec_PROGRAMS = bres
+pkglibexec_PROGRAMS = @BRES_LIBEXEC@
+EXTRA_PROGRAMS = bres
 
 pkginclude_HEADERS = \
-	align.h alloc.h arena.h bits.h exc.h quis.h report.h sub.h \
+	align.h alloc.h arena.h bits.h exc.h macros.h quis.h report.h sub.h \
 	trace.h track.h unihash.h \
 	pool.h \
 	atom.h assoc.h darray.h dstr.h dspool.h hash.h sym.h crc32.h \
 	env.h fdflags.h fdpass.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 hex.h mdwopt.h str.h testrig.h url.h
+	base64.h base32.h hex.h mdwopt.h str.h testrig.h url.h
 
 ## --- Things to put in the library ---
 
-libmLib_la_LDFLAGS = -version-info 2:2:0
+libmLib_la_LDFLAGS = -version-info 2:3:0
 ## Middle number is the patchlevel.  Final number is the minor version.  The
 ## difference between the first and last numbers is major version.
 
 libmLib_la_SOURCES = \
 	alloc.c arena.c exc.c quis.c pquis.c report.c sub.c trace.c \
-		traceopt.c track.c unihash.c \
+		traceopt.c track.c \
 	pool.c pool-file.c pool-sub.c \
 	atom.c assoc.c darray.c dstr.c dputf.c dspool.c hash.c sym.c \
 	crc32.c crc32-tab.c \
+	unihash.c unihash-global.c \
 	env.c fdflags.c fdpass.c fwatch.c lock.c \
-	bres.c conn.c lbuf.c ident.c pkbuf.c sel.c selbuf.c selpk.c sig.c \
+	@BRES_SOURCE@.c \
+	conn.c lbuf.c ident.c pkbuf.c sel.c selbuf.c selpk.c sig.c \
 	tv.c \
-	base64.c hex.c mdwopt.c str.c testrig.c url.c
+	base64.c base32.c hex.c mdwopt.c str.c testrig.c url.c
+EXTRA_libmLib_la_SOURCES = bres.c bres-adns.c
+libmLib_la_LIBADD = @DEPLIBS@
 
-BUILT_SOURCES = crc32-tab.c
+BUILT_SOURCES = crc32-tab.c unihash-global.c
 
-crc32-tab.c: crc-mktab
+crc32-tab.c: crc-mktab$(EXEEXT)
 	./crc-mktab \
 		-p0x04c11db7 -b32 -B8 -r \
 		-c -scrc32_table -icrc32.h -tuint32 -ocrc32-tab.c.new
 	mv crc32-tab.c.new crc32-tab.c
 
-crc_mktab_SOURCES = crc-mktab.c mdwopt.c quis.c pquis.c report.c str.c
+unihash-global.c: unihash-mkstatic$(EXEEXT)
+	./unihash-mkstatic \
+		-c -sunihash_global -iunihash.h -ounihash-global.c.new
+	mv unihash-global.c.new unihash-global.c
+
+crc_mktab_SOURCES = \
+	crc-mktab.c \
+	mdwopt.c quis.c pquis.c report.c str.c
+crc_mktab_CFLAGS = $(AM_CFLAGS)
+unihash_mkstatic_SOURCES = \
+	unihash-mkstatic.c \
+	mdwopt.c quis.c pquis.c report.c str.c unihash.c
+unihash_mkstatic_CFLAGS = $(AM_CFLAGS)
 
 ## --- Test code ---
 
 noinst_PROGRAMS = da.t sym.t assoc.t bits.t
 
 check: \
-	da.test sym.test assoc.test bits.test base64.test hex.test
+	da.test sym.test assoc.test bits.test base64.test hex.test \
+	base32.test \
+	unihash.test
 
 da_t_SOURCES = da-test.c
 da_t_LDADD = libmLib.la
@@ -236,9 +149,11 @@ 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
+	$(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
+	$(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
@@ -246,10 +161,25 @@ base64.test: base64.t base64.in base64.ref
 	cmp base64.out $(srcdir)/base64.in
 	@echo "base64 tested OK."
 
+base32.to: base32.c
+	$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" \
+		$(srcdir)/base32.c -o base32.to
+base32.t: base32.to base32.o libmLib.la
+	$(CC) $(CFLAGS) $(LDFLAGS) \
+		base32.to .libs/libmLib.a $(LIBS) -o base32.t
+base32.test: base32.t base32.in base32.ref
+	./base32.t <$(srcdir)/base32.in >base32.out
+	cmp base32.out $(srcdir)/base32.ref
+	./base32.t -d <$(srcdir)/base32.ref >base32.out
+	cmp base32.out $(srcdir)/base32.in
+	@echo "base32 tested OK."
+
 hex.to: hex.c
-	$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" $(srcdir)/hex.c -o hex.to
+	$(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
+	$(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
@@ -257,28 +187,38 @@ hex.test: hex.t hex.in hex.ref
 	cmp hex.out $(srcdir)/hex.in
 	@echo "hex tested OK."
 
+unihash.to: unihash.c
+	$(COMPILE) -c -DTEST_RIG -DSRCDIR=\"$(srcdir)\" \
+		$(srcdir)/unihash.c -o unihash.to
+unihash.t: unihash.to libmLib.la
+	$(CC) $(CFLAGS) $(LDFLAGS) \
+		unihash.to .libs/libmLib.a $(LIBS) -o unihash.t
+unihash.in: unihash-check.pl
+	perl $(srcdir)/unihash-check.pl >unihash.in.new
+	mv unihash.in.new $(srcdir)/unihash.in
+unihash.test: unihash.t unihash.in
+	./unihash.t -f $(srcdir)/unihash.in
+
 TEST_CLEAN = \
-	*.t \
+	*.t *.to \
 	da.in da.ref da.out \
 	sym.in sym.ref sym.out \
-	base64.out hex.out 
+	base64.out base32.out hex.out unihash.in
 
 TEST_DIST = \
 	da-gtest da-ref \
 	sym-gtest sym-ref \
 	bits.in bits-testgen.c \
-	base64.in base64.ref hex.in hex.ref
+	unihash-check.pl unihash.in \
+	base64.in base64.ref base32.in base32.ref hex.in hex.ref
 
 ## --- Background resolver ---
 ##
 ## I must (a) build the standalone version, and (b) inform the client library
 ## where the standalone version is.
 
-bres: bres-stnd.o
-	$(LINK) -o bres bres-stnd.o $(LIBS)
-
-bres-stnd.o: $(srcdir)/bres.c
-	$(COMPILE) -c -DBRES_STANDALONE -o bres-stnd.o $(srcdir)/bres.c
+bres_SOURCES = bres.c
+bres_CFLAGS = -DBRES_STANDALONE
 
 bres.lo: $(srcdir)/bres.c
 	$(LTCOMPILE) -c -DBRES_SERVER="\"$(libexecdir)/$(PACKAGE)/`echo bres|sed '$(transform)'`\"" $(srcdir)/bres.c