Whitespace fixing.

[distorted-keys] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d10e7deacb1de55dab04ed193b30e968d81d60b1..c733758aba52f4b6e35dadea094ffe9874e6aa68 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,22 +7,27 @@
 
 ###----- Licensing notice ---------------------------------------------------
 ###
-### This program is free software; you can redistribute it and/or modify
+### This file is part of the distorted.org.uk key management suite.
+###
+### distorted-keys 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.
 ###
-### This program is distributed in the hope that it will be useful,
+### distorted-keys 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 this program; if not, write to the Free Software Foundation,
+### along with distorted-keys; if not, write to the Free Software Foundation,
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 bin_SCRIPTS             =
+sbin_SCRIPTS            =
 dist_pkglib_SCRIPTS     =
+dist_pkglib_DATA        =
+noinst_DATA             =
 pkglib_DATA             =
 noinst_SCRIPTS          =
 
@@ -37,11 +42,13 @@ confsubst = $(top_srcdir)/config/confsubst
 EXTRA_DIST             += config/confsubst
 
 SUBSTVARS = \
-        PACKAGE="$(PACKAGE)" VERSION="$(VERSION)" \
+       PACKAGE="$(PACKAGE)" VERSION="$(VERSION)" \
        PYTHON="$(PYTHON)" \
-       bindir="$(bindir)" \
+       bindir="$(bindir)" sbindir="$(sbindir)" \
        pkgconfdir="$(sysconfdir)/$(PACKAGE)" \
-       pkglibdir="$(pkglibdir)"
+       pkgstatedir="$(localstatedir)/$(PACKAGE)" \
+       pkglibdir="$(pkglibdir)" \
+       user="$(user)"
 
 SUBST = $(AM_V_GEN)$(confsubst)
 
@@ -56,6 +63,16 @@ shamir: shamir.in Makefile
        $(SUBST) $(srcdir)/shamir.in $(SUBSTVARS) >shamir.new && \
                chmod +x shamir.new && mv shamir.new shamir
 
+## Property expansion.
+bin_SCRIPTS            += extract-profile
+EXTRA_DIST             += extract-profile.in
+CLEANFILES             += extract-profile
+extract-profile: extract-profile.in Makefile
+       $(SUBST) $(srcdir)/extract-profile.in $(SUBSTVARS) \
+                       >extract-profile.new && \
+               chmod +x extract-profile.new && \
+               mv extract-profile.new extract-profile
+
 ###--------------------------------------------------------------------------
 ### Main driver program and commands.
 
@@ -76,9 +93,49 @@ keyfunc.sh: keyfunc.sh.in Makefile
                mv keyfunc.sh.new keyfunc.sh
 
 ## Commands.
-dist_pkglib_SCRIPTS    += keeper-cards
-dist_pkglib_SCRIPTS    += new-keeper
-dist_pkglib_SCRIPTS    += new-recov
-dist_pkglib_SCRIPTS    += reveal
+dist_pkglib_SCRIPTS    += keys.archive
+dist_pkglib_SCRIPTS    += keys.conceal
+dist_pkglib_SCRIPTS    += keys.keeper-cards
+dist_pkglib_SCRIPTS    += keys.new-keeper
+dist_pkglib_SCRIPTS    += keys.new-recov
+dist_pkglib_SCRIPTS    += keys.recover
+dist_pkglib_SCRIPTS    += keys.reveal
+dist_pkglib_SCRIPTS    += keys.stash
+
+###--------------------------------------------------------------------------
+### Crypto operations.
+
+## Main driver program.
+sbin_SCRIPTS           += cryptop
+EXTRA_DIST             += cryptop.in
+CLEANFILES             += cryptop
+cryptop: cryptop.in Makefile
+       $(SUBST) $(srcdir)/cryptop.in $(SUBSTVARS) >cryptop.new && \
+               chmod +x cryptop.new && mv cryptop.new cryptop
+
+## Key type libraries.
+dist_pkglib_DATA       += ktype.gnupg
+dist_pkglib_DATA       += ktype.seccure
+
+## Commands.
+dist_pkglib_SCRIPTS    += cryptop.genkey
+dist_pkglib_SCRIPTS    += cryptop.list
+dist_pkglib_SCRIPTS    += cryptop.delkey
+dist_pkglib_SCRIPTS    += cryptop.recover
+dist_pkglib_SCRIPTS    += cryptop.info
+dist_pkglib_SCRIPTS    += cryptop.public
+dist_pkglib_SCRIPTS    += cryptop.encrypt
+dist_pkglib_SCRIPTS    += cryptop.decrypt
+dist_pkglib_SCRIPTS    += cryptop.sign
+dist_pkglib_SCRIPTS    += cryptop.verify
+
+## Userv services configuration.
+noinst_DATA            += distorted-keys.userv
+EXTRA_DIST             += distorted-keys.userv.in
+CLEANFILES             += distorted-keys.userv
+distorted-keys.userv: distorted-keys.userv.in Makefile
+       $(SUBST) $(srcdir)/distorted-keys.userv.in $(SUBSTVARS) \
+                       >distorted-keys.userv.new && \
+               mv distorted-keys.userv.new distorted-keys.userv
 
 ###----- That's all, folks --------------------------------------------------