X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/7b9799079255176c03537afd89a67ce7f6c2811d..78b1464e4a78dc364ecc8aebcfd5ec13b3f6bb07:/Makefile.am diff --git a/Makefile.am b/Makefile.am index fb317e7..0181434 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## -*-Makefile-*- ## -## $Id: Makefile.am,v 1.20 2000/06/17 10:39:43 mdw Exp $ +## $Id: Makefile.am,v 1.32 2001/03/03 12:20:23 mdw Exp $ ## ## Building the distribution ## @@ -29,12 +29,47 @@ ##----- Revision history ---------------------------------------------------- ## ## $Log: Makefile.am,v $ +## 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.19 1999/12/12 17:37:03 mdw -## Version bump. -## ## Revision 1.17 1999/11/11 18:47:33 mdw ## Use `libtool' to generate a shared library. ## @@ -44,43 +79,22 @@ ## 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. ## @@ -100,14 +114,17 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = man bin_SCRIPTS = mLib-config +bin_PROGRAMS = crc-mktab lib_LTLIBRARIES = libmLib.la -libexec_PROGRAMS = bres +pkglibexecdir = $(libexecdir)/$(PACKAGE) +pkglibexec_PROGRAMS = bres pkginclude_HEADERS = \ alloc.h arena.h bits.h exc.h quis.h report.h sub.h trace.h track.h \ - darray.h dstr.h dspool.h hash.h sym.h crc32.h \ - env.h fdflags.h lock.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 \ 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 @@ -121,45 +138,74 @@ libmLib_la_LDFLAGS = -version-info 2:0:0 libmLib_la_SOURCES = \ alloc.c arena.c exc.c quis.c pquis.c report.c sub.c trace.c \ traceopt.c track.c \ - darray.c dstr.c dputf.c dspool.c hash.c sym.c crc32.c \ - env.c fdflags.c lock.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 \ tv.c \ base64.c mdwopt.c str.c testrig.c url.c +BUILT_SOURCES = crc32-tab.c + +crc32-tab.c: crc-mktab + ./crc-mktab \ + -p0x04c11db7 -b32 -B8 -r \ + -c -scrc32_table -icrc32.h -tuint32 -ocrc32-tab.c + +crc_mktab_SOURCES = crc-mktab.c mdwopt.c quis.c pquis.c report.c str.c + ## --- Test code --- -noinst_PROGRAMS = da-test sym-test +noinst_PROGRAMS = da-test sym-test assoc-test bits.t -check: da-test.test sym-test.test +check: da-test.test sym-test.test assoc-test.test bits-test da_test_LDADD = libmLib.la -da-test.in: +da_test_LDFLAGS = -static +da-test.in: $(srcdir)/da-gtest perl $(srcdir)/da-gtest 10000 >da-test.in -da-test.ref: da-test.in +da-test.ref: da-test.in $(srcdir)/da-ref perl $(srcdir)/da-ref da-test.ref da-test.test: da-test da-test.in da-test.ref ./da-test da-test.test - cmp da-test.test da-test.ref + cmp da-test.test da-test.ref || { rm da-test.test; false; } @echo "darray tested OK." sym_test_LDADD = libmLib.la -sym-test.in: +sym_test_LDFLAGS = -static +sym-test.in: $(srcdir)/sym-gtest perl $(srcdir)/sym-gtest 10000 >sym-test.in -sym-test.ref: sym-test.in +sym-test.ref: sym-test.in $(srcdir)/sym-ref perl $(srcdir)/sym-ref sym-test.ref sym-test.test: sym-test sym-test.in sym-test.ref ./sym-test sym-test.test - cmp sym-test.test sym-test.ref + cmp sym-test.test sym-test.ref || { rm sym-test.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 assoc-test.test + cmp assoc-test.test sym-test.ref || { rm assoc-test.test; false; } + @echo "assoc tested OK." + +bits_t_SOURCES = bits.c +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 + 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 --- ## @@ -173,14 +219,15 @@ bres-stnd.o: $(srcdir)/bres.c $(COMPILE) -c -DBRES_STANDALONE -o bres-stnd.o $(srcdir)/bres.c bres.lo: $(srcdir)/bres.c - $(LTCOMPILE) -c -DBRES_SERVER="\"$(libexecdir)/`echo bres|sed '$(transform)'`\"" $(srcdir)/bres.c + $(LTCOMPILE) -c -DBRES_SERVER="\"$(libexecdir)/$(PACKAGE)/`echo bres|sed '$(transform)'`\"" $(srcdir)/bres.c ## --- Other useful rules --- install-man: - (cd man && make install-man) + (cd man && $(MAKE) install-man) -CLEANFILES = $(TEST_CLEAN) +CLEANFILES = $(TEST_CLEAN) crc32-tab.c +DISTCLEANFILES = libtool EXTRA_DIST = $(TEST_DIST) ##----- That's all, folks ---------------------------------------------------