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

diff --git a/Makefile.am b/Makefile.am
index 21a6309..0f8155d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-Makefile-*-
 ##
-## $Id: Makefile.am,v 1.16 1999/11/11 17:48:28 mdw Exp $
+## $Id: Makefile.am,v 1.21 2000/07/16 18:57:52 mdw Exp $
 ##
 ## Building the distribution
 ##
@@ -29,49 +29,37 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## 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.14  1999/10/04 21:47:12  mdw
-## Lots of new source files.
-##
-## Revision 1.13  1999/08/02 14:47:21  mdw
-## Distribute new `hash' module.
-##
-## Revision 1.12  1999/07/26 23:19:44  mdw
-## New source files.
-##
 ## 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.9  1999/06/01 09:46:36  mdw
-## Make all the new bits.
-##
 ## 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.7  1999/05/17 20:34:44  mdw
-## More files added.  Slight rearrangement of the ordering.
-##
 ## 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.4  1999/05/06 19:51:35  mdw
-## Reformatted the LGPL notice a little bit.
-##
-## Revision 1.3  1999/05/05 18:50:30  mdw
-## Change licensing conditions to LGPL.
-##
 ## Revision 1.2  1998/11/25 23:30:30  mdw
 ## Add `tv.c'and `tv.h' to the list.
 ##
@@ -92,35 +80,41 @@ SUBDIRS = man
 
 bin_SCRIPTS = mLib-config
 
-lib_LIBRARIES = libmLib.a
+lib_LTLIBRARIES = libmLib.la
 libexec_PROGRAMS = bres
 
 pkginclude_HEADERS = \
-	alloc.h bits.h exc.h quis.h report.h sub.h trace.h track.h \
+	alloc.h arena.h bits.h exc.h quis.h report.h sub.h trace.h track.h \
+	pool.h \
 	darray.h dstr.h dspool.h hash.h sym.h crc32.h \
 	env.h fdflags.h lock.h \
-	bres.h conn.h lbuf.h ident.h sel.h selbuf.h sig.h tv.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
 
 ## --- Things to put in the library ---
 
-## libmLib_la_LDFLAGS = -version-info 1:0
+libmLib_la_LDFLAGS = -version-info 2:0:0
+## Middle number is the patchlevel.  Final number is the minor version.  The
+## difference between the first and last numbers is major version.
 
-libmLib_a_SOURCES = \
-	alloc.c exc.c quis.c pquis.c report.c sub.c trace.c traceopt.c \
-		track.c \
+libmLib_la_SOURCES = \
+	alloc.c arena.c exc.c quis.c pquis.c report.c sub.c trace.c \
+		traceopt.c track.c \
+	pool.c pool-file.c pool-sub.c \
 	darray.c dstr.c dputf.c dspool.c hash.c sym.c crc32.c \
 	env.c fdflags.c lock.c \
-	bres.c conn.c lbuf.c ident.c sel.c selbuf.c sig.c tv.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
 
 ## --- Test code ---
 
-noinst_PROGRAMS = da-test sym-test
+noinst_PROGRAMS = da-test sym-test bits.t
 
-check: da-test.test sym-test.test
+check: da-test.test sym-test.test bits-test
 
-da_test_LDADD = libmLib.a
+da_test_LDADD = .libs/libmLib.a
 da-test.in:
 	perl $(srcdir)/da-gtest 10000 >da-test.in
 da-test.ref: da-test.in
@@ -130,7 +124,7 @@ da-test.test: da-test da-test.in da-test.ref
 	cmp da-test.test da-test.ref
 	@echo "darray tested OK."
 
-sym_test_LDADD = libmLib.a
+sym_test_LDADD = .libs/libmLib.a
 sym-test.in:
 	perl $(srcdir)/sym-gtest 10000 >sym-test.in
 sym-test.ref: sym-test.in
@@ -140,13 +134,19 @@ sym-test.test: sym-test sym-test.in sym-test.ref
 	cmp sym-test.test sym-test.ref
 	@echo "sym tested OK."
 
+bits_t_SOURCES = bits.c
+bits_t_LDADD = .libs/libmLib.a
+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
 
 TEST_DIST = \
 	da-gtest da-ref \
-	sym-gtest sym-ref
+	sym-gtest sym-ref \
+	bits.test bits-testgen.c
 
 ## --- Background resolver ---
 ##
@@ -159,8 +159,8 @@ bres: bres-stnd.o
 bres-stnd.o: $(srcdir)/bres.c
 	$(COMPILE) -c -DBRES_STANDALONE -o bres-stnd.o $(srcdir)/bres.c
 
-bres.o: $(srcdir)/bres.c
-	$(COMPILE) -c -DBRES_SERVER="\"$(libexecdir)/`echo bres|sed '$(transform)'`\"" $(srcdir)/bres.c
+bres.lo: $(srcdir)/bres.c
+	$(LTCOMPILE) -c -DBRES_SERVER="\"$(libexecdir)/`echo bres|sed '$(transform)'`\"" $(srcdir)/bres.c
 
 ## --- Other useful rules ---