Bug fixes: restore signals to their default dispositions, and set up the

[mLib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3fe766a8551a0ace70008176d8636567aa9a6dea..e5f3753bdc9fb60529843fadeaf078a530414688 100644 (file)
--- 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.30 2001/01/25 21:11:41 mdw Exp $
 ##
 ## Building the distribution
 ##
@@ -29,6 +29,32 @@
 ##----- Revision history ----------------------------------------------------
 ##
 ## $Log: Makefile.am,v $
+## 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,12 +111,13 @@ 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 \
+       atom.h assoc.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 pkbuf.h sel.h selbuf.h selpk.h sig.h \
        tv.h \
@@ -106,7 +133,8 @@ 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 \
+       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 lock.c \
        bres.c conn.c lbuf.c ident.c pkbuf.c sel.c selbuf.c selpk.c sig.c \
        tv.c \
@@ -119,36 +147,48 @@ 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
+noinst_PROGRAMS = da-test sym-test assoc-test bits.t
 
-check: da-test.test sym-test.test bits-test
+check: da-test.test sym-test.test assoc-test.test bits-test
 
-da_test_LDADD = .libs/libmLib.a
+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.in >da-test.ref
 da-test.test: da-test da-test.in da-test.ref
        ./da-test <da-test.in >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 = .libs/libmLib.a
+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.in >sym-test.ref
 sym-test.test: sym-test sym-test.in sym-test.ref
        ./sym-test <sym-test.in >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 <sym-test.in >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 = .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
 
@@ -173,14 +213,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 ---------------------------------------------------