X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/7cf5c72a6d353ed5a7e340562c11e54c21c85e5e..fbc7337cd60bcad9c8df6d7294835ece78cee630:/vars.am

diff --git a/vars.am b/vars.am
index 3c65370..9870cef 100644
--- a/vars.am
+++ b/vars.am
@@ -25,27 +25,44 @@
 ### MA 02111-1307, USA.
 
 ###--------------------------------------------------------------------------
-### Installation directories.
+### Miscellaneous useful definitions.
 
+## Installation directories.
 pkglibexecdir		 = $(libexecdir)/$(PACKAGE)
 
 ###--------------------------------------------------------------------------
 ### Initial values for common variables.
 
+EXTRA_DIST		 =
+CLEANFILES		 =
+DISTCLEANFILES		 =
+MAINTAINERCLEANFILES	 =
+BUILT_SOURCES		 =
+
 bin_PROGRAMS		 =
 check_PROGRAMS		 =
 pkginclude_HEADERS	 =
-PRECOMPS		 =
+
 PROGMANS		 =
 LIBMANS			 =
-EXTRA_DIST		 = $(PRECOMPS) $(LIBMANS) $(PROGMANS)
-CLEANFILES		 =
-MAINTAINERCLEANFILES	 = $(PRECOMPS)
+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 \
@@ -58,10 +75,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
@@ -70,10 +87,13 @@ SUBSTITUTIONS = \
 	prefix=$(prefix) exec_prefix=$(exec_prefix) \
 	libdir=$(libdir) includedir=$(includedir) \
 	bindir=$(bindir) sbindir=$(sbindir) \
-	PACKAGE=$(PACKAGE) VERSION=$(VERSION)
+	PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
+	MLIB_LIBS="$(MLIB_LIBS)"
 
-## Location of precomputed tables.
-precomp			= $(top_srcdir)/precomp
+V_SUBST			 = $(V_SUBST_@AM_V@)
+V_SUBST_		 = $(V_SUBST_@AM_DEFAULT_V@)
+V_SUBST_0		 = @echo "  SUBST    $@";
+SUBST			 = $(V_SUBST)$(confsubst)
 
 ###--------------------------------------------------------------------------
 ### Building utilities.
@@ -83,13 +103,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.