X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/b7580524f33ee21d3ddc49fe36a71e107e87df1b..c3b137c89815fa04d04abbad0badc779b99c12e8:/Makefile.am diff --git a/Makefile.am b/Makefile.am index 3fe766a..d1ff5ad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## -*-Makefile-*- ## -## $Id: Makefile.am,v 1.22 2000/07/21 19:01:33 mdw Exp $ +## $Id: Makefile.am,v 1.34 2003/04/23 12:51:03 mdw Exp $ ## ## Building the distribution ## @@ -29,6 +29,44 @@ ##----- Revision history ---------------------------------------------------- ## ## $Log: Makefile.am,v $ +## 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. ## @@ -85,16 +123,17 @@ 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 \ pool.h \ - darray.h dstr.h dspool.h hash.h sym.h crc32.h \ - env.h fdflags.h lock.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 + base64.h hex.h mdwopt.h str.h testrig.h url.h ## --- Things to put in the library --- @@ -106,11 +145,12 @@ 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 crc32-tab.c \ - env.c fdflags.c lock.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 + base64.c hex.c mdwopt.c str.c testrig.c url.c BUILT_SOURCES = crc32-tab.c @@ -119,47 +159,65 @@ crc32-tab.c: 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 +crc_mktab_SOURCES = crc-mktab.c mdwopt.c quis.c pquis.c report.c str.c ## --- Test code --- -noinst_PROGRAMS = da-test sym-test bits.t - -check: da-test.test sym-test.test bits-test - -da_test_LDADD = .libs/libmLib.a -da-test.in: - perl $(srcdir)/da-gtest 10000 >da-test.in -da-test.ref: da-test.in - 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 +noinst_PROGRAMS = da.t sym.t assoc.t bits.t + +check: \ + da.test sym.test assoc.test bits.test + +da_t_SOURCES = da-test.c +da_t_LDADD = libmLib.la +da_t_LDFLAGS = -static +da.in: $(srcdir)/da-gtest + perl $(srcdir)/da-gtest 10000 >da.in +da.ref: da.in $(srcdir)/da-ref + perl $(srcdir)/da-ref da.ref +da.test: da.t da.in da.ref + ./da.t da.test + cmp da.test da.ref || { rm da.test; false; } @echo "darray tested OK." -sym_test_LDADD = .libs/libmLib.a -sym-test.in: - perl $(srcdir)/sym-gtest 10000 >sym-test.in -sym-test.ref: sym-test.in - 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 +sym_t_SOURCES = sym-test.c +sym_t_LDADD = libmLib.la +sym_t_LDFLAGS = -static +sym.in: $(srcdir)/sym-gtest + perl $(srcdir)/sym-gtest 10000 >sym.in +sym.ref: sym.in $(srcdir)/sym-ref + perl $(srcdir)/sym-ref sym.ref +sym.test: sym.t sym.in sym.ref + ./sym.t sym.test + cmp sym.test sym.ref || { rm sym.test; false; } @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 assoc.test + cmp assoc.test sym.ref || { rm assoc.test; false; } + @echo "assoc tested OK." + bits_t_SOURCES = bits.c -bits_t_LDADD = .libs/libmLib.a +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 + da.in da.ref da.test \ + sym.in sym.ref sym.test \ + base64.test hex.test TEST_DIST = \ da-gtest da-ref \ sym-gtest sym-ref \ - bits.test bits-testgen.c + bits.test bits-testgen.c \ + base64.in hex.in ## --- Background resolver --- ## @@ -173,14 +231,17 @@ 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) +uninstall-man: + (cd man && $(MAKE) uninstall-man) -CLEANFILES = $(TEST_CLEAN) +CLEANFILES = $(TEST_CLEAN) crc32-tab.c +DISTCLEANFILES = libtool EXTRA_DIST = $(TEST_DIST) ##----- That's all, folks ---------------------------------------------------