From 9ff18efe9a9fa301fc7a05074b448feb04b9537a Mon Sep 17 00:00:00 2001 Message-Id: <9ff18efe9a9fa301fc7a05074b448feb04b9537a.1714140780.git.mdw@distorted.org.uk> From: Mark Wooding Date: Thu, 26 May 2016 09:26:09 +0100 Subject: [PATCH] vars.am: Some reformatting. Organization: Straylight/Edgeware From: Mark Wooding --- vars.am | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/vars.am b/vars.am index 093e1728..fc00b875 100644 --- a/vars.am +++ b/vars.am @@ -41,35 +41,35 @@ TRIPE_INCLUDES = \ -I$(top_srcdir)/common \ -I$(top_srcdir)/priv -AM_CPPFLAGS += $(TRIPE_INCLUDES) +AM_CPPFLAGS += $(TRIPE_INCLUDES) ###-------------------------------------------------------------------------- ### Miscellanous useful definitions. ## Libraries of common code. -libtripe = $(top_builddir)/common/libtripe.a -libpriv = $(top_builddir)/priv/libpriv.a - -## Substitute tags in files. -confsubst = $(top_srcdir)/config/confsubst +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) 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) + 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. @@ -79,12 +79,12 @@ SUFFIXES += .5tripe .5.in SUFFIXES += .7tripe .7.in SUFFIXES += .8tripe .8.in -mandefs = $(top_srcdir)/common/defs.man -makesummary = $(top_srcdir)/common/make-summary +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 $@"; +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) -- [mdw]