X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/fc916a0942e6ef8f63aefb96119d0e4fd7c7efbb..75ed082dd96059e3949491d43544d0353f1502ad:/vars.am

diff --git a/vars.am b/vars.am
index 2e680025..fc00b875 100644
--- a/vars.am
+++ b/vars.am
@@ -38,58 +38,61 @@ SUFFIXES		 =
 ### Include path.
 
 TRIPE_INCLUDES = \
-	-I$(top_builddir)/config.h \
-	-I$(top_srcdir)/common
+	-I$(top_srcdir)/common \
+	-I$(top_srcdir)/priv
 
-CPPFLAGS += $(TRIPE_INCLUDES)
+AM_CPPFLAGS		+= $(TRIPE_INCLUDES)
 
 ###--------------------------------------------------------------------------
 ### Miscellanous useful definitions.
 
-## Library of common code.
-libtripe = $(top_builddir)/common/libtripe.a
-
-## Create a directory if it doesn't exist.
-mkdir_p = $(top_srcdir)/config/install-sh -d
-
-## Substitute tags in files.
-confsubst = $(top_srcdir)/config/confsubst
+## Libraries of common code.
+libtripe		 = $(top_builddir)/common/libtripe.a
+libpriv			 = $(top_builddir)/priv/libpriv.a
 
 ###--------------------------------------------------------------------------
 ### Standard configuration substitutions.
 
+## Substitute tags in files.
+confsubst		 = $(top_srcdir)/config/confsubst
+
 SUBSTITUTIONS = \
-		prefix=$(prefix) exec_prefix=$(exec_prefix) \
-		libdir=$(libdir) includedir=$(includedir) \
-		bindir=$(bindir) sbindir=$(sbindir) \
-		configdir=$(configdir) socketdir=$(socketdir) \
-		initconfig=$(initconfig) \
-		pidfile=$(pidfile) logfile=$(logfile) \
-		PYTHON=$(PYTHON)
+	prefix=$(prefix) exec_prefix=$(exec_prefix) \
+	libdir=$(libdir) includedir=$(includedir) \
+	bindir=$(bindir) sbindir=$(sbindir) \
+	configdir=$(configdir) socketdir=$(socketdir) \
+	initconfig=$(initconfig) pkglibdir=$(pkglibdir) \
+	pidfile=$(pidfile) logfile=$(logfile) \
+	PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
+	PYTHON=$(PYTHON)
+
+V_SUBST			 = $(V_SUBST_$(V))
+V_SUBST_		 = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
+V_SUBST_0		 = @echo "  SUBST  $@";
+SUBST			 = $(V_SUBST)$(confsubst)
 
 ###--------------------------------------------------------------------------
 ### Manpage substitutions.
 
-SUFFIXES		+= .1 .1.in
-SUFFIXES		+= .5 .5.in
-SUFFIXES		+= .7 .7.in
-SUFFIXES		+= .8 .8.in
-
-mandefs = $(top_builddir)/defs.man
-
-mansubst = sed \
-	-e '/@@@PRE@@@/ {' \
-	-e   'r$(mandefs)' \
-	-e   'd' \
-	-e '}'
-
-.1.in.1 .5.in.5 .7.in.7 .8.in.8: $(mandefs)
-	$(mansubst) $< >$@.new && mv $@.new $@
-
-$(mandefs): $(top_srcdir)/defs.man.in Makefile
-	$(confsubst) $(top_srcdir)/defs.man.in >$@.new $(SUBSTITUTIONS)
-	sed '/^\.$$/ d; /^\.\\"/ d' $@.new >$@.new2
-	rm -f $@.new
-	mv $@.new2 $@
+SUFFIXES		+= .1tripe .1.in .1
+SUFFIXES		+= .5tripe .5.in
+SUFFIXES		+= .7tripe .7.in
+SUFFIXES		+= .8tripe .8.in
+
+mandefs			 = $(top_srcdir)/common/defs.man
+makesummary		 = $(top_srcdir)/common/make-summary
+
+V_MAN			 = $(V_MAN_$(V))
+V_MAN_			 = $(V_MAN_$(AM_DEFAULT_VERBOSITY))
+V_MAN_0			 = @echo "  MAN    $@";
+
+.1.in.1 .1.in.1tripe .5.in.5tripe .7.in.7tripe .8.in.8tripe:
+	$(V_MAN)
+	$(AM_V_at)sed '/^\.$$/ d; /^\.\\"/ d' $(mandefs) >$@.defs
+	$(AM_V_at)sed -e '/@@@PRE@@@/ {' -e 'r$@.defs' -e 'd' -e '}' \
+		$< >$@.merge
+	$(AM_V_at)$(confsubst) $@.merge >$@.subst $(SUBSTITUTIONS)
+	$(AM_V_at)awk -f $(makesummary) $@.subst >$@.new
+	$(AM_V_at)rm -f $@.defs $@.merge $@.subst && mv $@.new $@
 
 ###----- That's all, folks --------------------------------------------------