X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/2171b19e5662e40fcbfef34da561e70265974e79..HEAD:/vars.am

diff --git a/vars.am b/vars.am
index 5a9938d6..6ef92b0b 100644
--- a/vars.am
+++ b/vars.am
@@ -9,19 +9,18 @@
 ###
 ### This file is part of Trivial IP Encryption (TrIPE).
 ###
-### TrIPE is free software; you can redistribute it and/or modify
-### it under the terms of the GNU General Public License as published by
-### the Free Software Foundation; either version 2 of the License, or
-### (at your option) any later version.
+### TrIPE is free software: you can redistribute it and/or modify it under
+### the terms of the GNU General Public License as published by the Free
+### Software Foundation; either version 3 of the License, or (at your
+### option) any later version.
 ###
-### TrIPE is distributed in the hope that it will be useful,
-### but WITHOUT ANY WARRANTY; without even the implied warranty of
-### MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-### GNU General Public License for more details.
+### TrIPE is distributed in the hope that it will be useful, but WITHOUT
+### ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+### FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+### for more details.
 ###
 ### You should have received a copy of the GNU General Public License
-### along with TrIPE; if not, write to the Free Software Foundation,
-### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+### along with TrIPE.  If not, see <https://www.gnu.org/licenses/>.
 
 ###--------------------------------------------------------------------------
 ### Initial values of common variables.
@@ -38,56 +37,55 @@ SUFFIXES		 =
 ### Include path.
 
 TRIPE_INCLUDES = \
-	-I$(top_builddir)/config.h \
 	-I$(top_srcdir)/common \
 	-I$(top_srcdir)/priv
 
-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
+libcommon		 = $(top_builddir)/common/libcommon.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) \
-		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_@AM_V@)
+V_SUBST_		 = $(V_SUBST_@AM_DEFAULT_V@)
+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
+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
+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_@AM_V@)
+V_MAN_			 = $(V_MAN_@AM_DEFAULT_V@)
+V_MAN_0			 = @echo "  MAN      $@";
 
-.1.in.1 .5.in.5 .7.in.7 .8.in.8:
+.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 '}' \