X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/4aee0550325e9d8d20666454bc638755b3604f24..6f444bda1b7deb31cf7fb2395cb0993c3e3b8c42:/Makefile.am diff --git a/Makefile.am b/Makefile.am index 8917915..32ef349 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## -*-Makefile-*- ## -## $Id: Makefile.am,v 1.24 2000/10/08 11:08:25 mdw Exp $ +## $Id: Makefile.am,v 1.45 2003/12/15 20:53:08 mdw Exp $ ## ## Building the distribution ## @@ -29,6 +29,71 @@ ##----- 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. +## +## 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. ## @@ -88,23 +153,26 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = man bin_SCRIPTS = mLib-config -bin_PROGRAMS = crc-mktab +bin_PROGRAMS = crc-mktab unihash-mkstatic lib_LTLIBRARIES = libmLib.la -libexec_PROGRAMS = bres +pkglibexecdir = $(libexecdir)/$(PACKAGE) +pkglibexec_PROGRAMS = @BRES_LIBEXEC@ +EXTRA_PROGRAMS = bres pkginclude_HEADERS = \ - alloc.h arena.h bits.h exc.h quis.h report.h sub.h trace.h track.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 \ - 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 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 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 --- -libmLib_la_LDFLAGS = -version-info 2:0: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. @@ -112,84 +180,164 @@ 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 \ - bres.c conn.c lbuf.c ident.c pkbuf.c sel.c selbuf.c selpk.c sig.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_SOURCE@.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 +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 \ -p0x04c11db7 -b32 -B8 -r \ - -c -scrc32_table -icrc32.h -tuint32 -ocrc32-tab.c + -c -scrc32_table -icrc32.h -tuint32 -ocrc32-tab.c.new + mv crc32-tab.c.new crc32-tab.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 +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-test sym-test bits.t +noinst_PROGRAMS = da.t sym.t assoc.t bits.t -check: da-test.test sym-test.test bits-test +check: \ + da.test sym.test assoc.test bits.test base64.test hex.test \ + unihash.test -da_test_LDADD = libmLib.la -da_test_LDFLAGS = -static -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 +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.new + mv da.in.new da.in +da.ref: da.in $(srcdir)/da-ref + perl $(srcdir)/da-ref da.ref.new + mv da.ref.new da.ref +da.test: da.t da.in da.ref + ./da.t da.out + cmp da.out da.ref @echo "darray tested OK." -sym_test_LDADD = libmLib.la -sym_test_LDFLAGS = -static -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.new + mv sym.in.new sym.in +sym.ref: sym.in $(srcdir)/sym-ref + perl $(srcdir)/sym-ref sym.ref.new + mv sym.ref.new sym.ref +sym.test: sym.t sym.in sym.ref + ./sym.t sym.out + cmp sym.out sym.ref @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.out + cmp assoc.out sym.ref + @echo "assoc tested OK." + bits_t_SOURCES = bits.c bits_t_LDADD = libmLib.la bits_t_LDFLAGS = -static -bits-test: bits.t - ./bits.t -f $(srcdir)/bits.test +bits.o: bits.c + $(COMPILE) -c -DSRCDIR="\"$(srcdir)\"" $(srcdir)/bits.c -o bits.o +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 +base64.t: base64.to base64.o libmLib.la + $(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 + ./base64.t -d <$(srcdir)/base64.ref >base64.out + cmp base64.out $(srcdir)/base64.in + @echo "base64 tested OK." + +hex.to: hex.c + $(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 +hex.test: hex.t hex.in hex.ref + ./hex.t <$(srcdir)/hex.in >hex.out + cmp hex.out $(srcdir)/hex.ref + ./hex.t -d <$(srcdir)/hex.ref >hex.out + 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 = \ - da-test.in da-test.ref da-test.test \ - sym-test.in sym-test.ref sym-test.test + *.t *.to \ + da.in da.ref da.out \ + sym.in sym.ref sym.out \ + base64.out hex.out unihash.in TEST_DIST = \ da-gtest da-ref \ sym-gtest sym-ref \ - bits.test bits-testgen.c + bits.in bits-testgen.c \ + base64.in base64.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 +bres$(EXEEXT): 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.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) -EXTRA_DIST = $(TEST_DIST) +CLEANFILES = $(TEST_CLEAN) crc32-tab.c +DISTCLEANFILES = libtool +EXTRA_DIST = \ + $(TEST_DIST) maninst \ + debian/rules debian/copyright debian/control debian/changelog ##----- That's all, folks ---------------------------------------------------