X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/ccbfa044439145cfd602f25b46995c31afc0cf6b..152a2182891fe22eb16f2de6b05574d7b041df5f:/vars.am

diff --git a/vars.am b/vars.am
index 5780686e..f7d3eff8 100644
--- a/vars.am
+++ b/vars.am
@@ -38,19 +38,17 @@ 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.
+## Libraries 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
+libpriv = $(top_builddir)/priv/libpriv.a
 
 ## Substitute tags in files.
 confsubst = $(top_srcdir)/config/confsubst
@@ -63,11 +61,16 @@ SUBSTITUTIONS = \
 		libdir=$(libdir) includedir=$(includedir) \
 		bindir=$(bindir) sbindir=$(sbindir) \
 		configdir=$(configdir) socketdir=$(socketdir) \
-		initconfig=$(initconfig) \
+		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.
 
@@ -76,21 +79,20 @@ 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 $@
+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 .5.in.5 .7.in.7 .8.in.8:
+	$(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 --------------------------------------------------