Include trace_custom.

[mLib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 179f763414ffbe7f91bb5b07e7e17d6c86ff45e6..e5f3753bdc9fb60529843fadeaf078a530414688 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## -*-Makefile-*-
 ##
-## $Id: Makefile.am,v 1.27 2001/01/20 11:46:49 mdw Exp $
+## $Id: Makefile.am,v 1.30 2001/01/25 21:11:41 mdw Exp $
 ##
 ## Building the distribution
 ##
@@ -29,6 +29,16 @@
 ##----- 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.
 ##
@@ -101,7 +111,8 @@ 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 \
@@ -140,9 +151,9 @@ 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 = libmLib.la
 da_test_LDFLAGS = -static
@@ -152,7 +163,7 @@ 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 = libmLib.la
@@ -163,14 +174,21 @@ 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 = libmLib.la
 bits_t_LDFLAGS = -static
 bits.o: bits.c
-       $(COMPILE) -c -DSRCDIR=\"$(srcdir)\" $(srcdir)/bits.c -o bits.o
+       $(COMPILE) -c -DSRCDIR="\"$(srcdir)\"" $(srcdir)/bits.c -o bits.o
 bits-test: bits.t
        ./bits.t -f $(srcdir)/bits.test
 
@@ -195,12 +213,12 @@ 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) crc32-tab.c
 DISTCLEANFILES = libtool