X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/blobdiff_plain/18c831dcd0ae4d660c70ccac69d27ed2a97851be..a89dcc03c98d7659c53f30a4f0544fe2b424b458:/vars.am

diff --git a/vars.am b/vars.am
index c6f7884..8d34b68 100644
--- a/vars.am
+++ b/vars.am
@@ -25,26 +25,49 @@
 ### MA 02111-1307, USA.
 
 ###--------------------------------------------------------------------------
-### Installation directories.
+### Miscellaneous useful definitions.
+
+## Some convenient abbreviations for file suffixes.
+e			 = $(EXEEXT)
+o			 = $(OBJEXT)
+t			 = t$e
 
+## Installation directories.
 pkglibexecdir		 = $(libexecdir)/$(PACKAGE)
 
 ###--------------------------------------------------------------------------
 ### Initial values for common variables.
 
+EXTRA_DIST		 =
+CLEANFILES		 =
+DISTCLEANFILES		 =
+MAINTAINERCLEANFILES	 =
+BUILT_SOURCES		 =
+
 bin_PROGRAMS		 =
 check_PROGRAMS		 =
 pkginclude_HEADERS	 =
+
 PROGMANS		 =
 LIBMANS			 =
-EXTRA_DIST		 = $(LIBMANS) $(PROGMANS)
-CLEANFILES		 =
-MAINTAINERCLEANFILES	 = 
+EXTRA_DIST		+= $(PROGMANS) $(LIBMANS)
+
+###--------------------------------------------------------------------------
+### Machinery for precomputations.
+
+## Location of precomputed tables.
+precomp			 = $(top_srcdir)/precomp
+
+## Precomputed source code files.
+PRECOMPS		 =
+EXTRA_DIST		+= $(PRECOMPS)
+BUILT_SOURCES		+= $(PRECOMPS)
+MAINTAINERCLEANFILES	+= $(PRECOMPS)
 
 ###--------------------------------------------------------------------------
 ### Include path.
 
-MLIB_INCLUDES = \
+MLIB_INCLUDES		 = \
 	-I$(top_srcdir)/buf \
 	-I$(top_srcdir)/codec \
 	-I$(top_srcdir)/hash \
@@ -57,10 +80,10 @@ MLIB_INCLUDES = \
 	-I$(top_srcdir)/ui \
 	-I$(top_srcdir)/utils
 
-CPPFLAGS += $(MLIB_INCLUDES)
+AM_CPPFLAGS		 = $(MLIB_INCLUDES)
 
 ###--------------------------------------------------------------------------
-### Miscellaneous useful definitions.
+### Standard configuration substitutions.
 
 ## Substitute tags in files.
 confsubst		 = $(top_srcdir)/config/confsubst
@@ -71,6 +94,11 @@ SUBSTITUTIONS = \
 	bindir=$(bindir) sbindir=$(sbindir) \
 	PACKAGE=$(PACKAGE) VERSION=$(VERSION)
 
+V_SUBST = $(V_SUBST_$(V))
+V_SUBST_ = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
+V_SUBST_0 = @echo "  SUBST  $@";
+SUBST = $(V_SUBST)$(confsubst)
+
 ###--------------------------------------------------------------------------
 ### Building utilities.
 
@@ -79,13 +107,6 @@ UTIL_LIBS = \
 	$(top_builddir)/ui/libui.la \
 	$(top_builddir)/utils/libutils.la
 
-## Making sure they're built properly.  Without this, `make dist' on a bare
-## source tree fails hopelessly.
-build_util_libs = \
-	for i in ui utils; do \
-	  (cd $(top_builddir)/$$i && $(MAKE) lib$$i.la) || exit 1; \
-	done
-
 ###--------------------------------------------------------------------------
 ### Testing.
 
@@ -95,6 +116,9 @@ LDADD			 = $(top_builddir)/libmLib.la
 check: tests
 .PHONY: check tests
 
+tests::;
+.PHONY: tests
+
 ###--------------------------------------------------------------------------
 ### Manual.