General build system spring-cleaning.

[mLib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 66185ee23f2d754b63acc4265adac104a1cab8af..5a11eb7b70b1407071b9bd5bf54aff35f2f81a2b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,8 @@ EXTRA_DIST            += mLib.pc.in
 CLEANFILES             += mLib.pc
 
 mLib.pc: mLib.pc.in Makefile
-       $(confsubst) $(srcdir)/mLib.pc.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/mLib.pc.in >$@.new \
+               $(SUBSTITUTIONS) && \
                mv $@.new $@
 
 ###--------------------------------------------------------------------------
@@ -98,9 +99,20 @@ libmLib_la_LIBADD    += test/libtest.la
 SUBDIRS                        += trace
 libmLib_la_LIBADD      += trace/libtrace.la
 
+###--------------------------------------------------------------------------
+### Testing.
+
+SUBDIRS                        += t
+
 ###--------------------------------------------------------------------------
 ### Distribution.
 
+## Make sure the precomputed tables are available.  Hang this off of any
+## distributed file.
+mLib.pc.in: ensure-precomp-libs
+ensure-precomp-libs:
+       for d in ui utils; do (cd $$d && $(MAKE) all) || exit 1; done
+
 ## Release number.
 dist-hook::
        echo $(VERSION) >$(distdir)/RELEASE