X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/471f9daa24ee9251730e234fe92ad65c1fa9dff3..6f444bda1b7deb31cf7fb2395cb0993c3e3b8c42:/Makefile.am?ds=sidebyside

diff --git a/Makefile.am b/Makefile.am
index 2c90910..32ef349 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-Makefile-*-
 ##
-## $Id: Makefile.am,v 1.40 2003/11/10 10:01:14 mdw Exp $
+## $Id: Makefile.am,v 1.45 2003/12/15 20:53:08 mdw Exp $
 ##
 ## Building the distribution
 ##
@@ -29,6 +29,21 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## Revision 1.45  2003/12/15 20:53:08  mdw
+## New program to make fixed tables for universal hashing.
+##
+## Revision 1.44  2003/12/14 14:56:57  mdw
+## Fix distribution.
+##
+## Revision 1.43  2003/12/14 14:45:30  mdw
+## Test universal hashing and fix bugs.
+##
+## Revision 1.42  2003/12/13 20:37:59  mdw
+## Add adns support in background resolver.
+##
+## 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.
 ##
@@ -138,40 +153,45 @@ 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 fwatch.h lock.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
 
 ## --- 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 \
-	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 \
+	unihash.c unihash-global.c \
+	env.c fdflags.c fdpass.c fwatch.c lock.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
+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
 	./crc-mktab \
@@ -179,14 +199,25 @@ crc32-tab.c: crc-mktab
 		-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
+	./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
+unihash_mkstatic_SOURCES = \
+	unihash-mkstatic.c \
+	mdwopt.c quis.c pquis.c report.c str.c unihash.c
 
 ## --- 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 \
+	unihash.test
 
 da_t_SOURCES = da-test.c
 da_t_LDADD = libmLib.la
@@ -233,9 +264,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
@@ -244,9 +277,11 @@ base64.test: base64.t base64.in base64.ref
 	@echo "base64 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
@@ -254,11 +289,23 @@ 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 unihash.in
+unihash.test: unihash.t unihash.in
+	./unihash.t -f 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 hex.out unihash.in
 
 TEST_DIST = \
 	da-gtest da-ref \
@@ -271,7 +318,7 @@ TEST_DIST = \
 ## I must (a) build the standalone version, and (b) inform the client library
 ## where the standalone version is.
 
-bres: bres-stnd.o
+bres$(EXEEXT): bres-stnd.o
 	$(LINK) -o bres bres-stnd.o $(LIBS)
 
 bres-stnd.o: $(srcdir)/bres.c