aboutsummaryrefslogtreecommitdiffstats
path: root/checks/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'checks/Makefile.am')
-rw-r--r--checks/Makefile.am36
1 files changed, 21 insertions, 15 deletions
diff --git a/checks/Makefile.am b/checks/Makefile.am
index 6406390a0..6583def88 100644
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@@ -16,9 +16,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-## Process this file with automake to create Makefile.in
+# Process this file with automake to create Makefile.in
-GPG_DEARMOR = ../g10/gpg --no-options --no-greeting --batch --quiet --yes --dearmor
GPG_IMPORT = ../g10/gpg --homedir . --quiet --yes --import
TESTS = version.test mds.test \
@@ -40,11 +39,12 @@ TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
DATA_FILES = data-500 data-9000 data-32000 data-80000 plain-large
-EXTRA_DIST = defs.inc run-gpg run-gpg.patterns $(TESTS) $(TEST_FILES) \
+EXTRA_DIST = defs.inc $(TESTS) $(TEST_FILES) \
mkdemodirs signdemokey
CLEANFILES = prepared.stamp x y yy z out err $(DATA_FILES) \
- plain-1 plain-2 plain-3 options trustdb.gpg *.lock .\#lk* \
- pubring.gpg secring.gpg pubring.pkr secring.skr options
+ plain-1 plain-2 plain-3 trustdb.gpg *.lock .\#lk* \
+ *.test.log options gpg_dearmor \
+ pubring.gpg secring.gpg pubring.pkr secring.skr
DISTCLEANFILES = pubring.gpg~
@@ -54,34 +54,40 @@ distclean-local:
./mkdemodirs --clean
prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
- ./pubring.pkr ./secring.skr ./options $(DATA_FILES)
+ ./pubring.pkr ./secring.skr ./options ./gpg_dearmor \
+ $(DATA_FILES)
$(GPG_IMPORT) $(srcdir)/pubdemo.asc
echo timestamp >./prepared.stamp
./options: $(srcdir)/options.in
cat $(srcdir)/options.in >./options
-./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc
- $(GPG_DEARMOR) -o ./pubring.gpg $(srcdir)/pubring.asc
+./gpg_dearmor:
+ echo '#!/bin/sh' >./gpg_dearmor
+ echo "$(srcdir)/../g10/gpg --no-options --no-greeting \
+ --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
+ chmod 755 ./gpg_dearmor
+
+./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc ./gpg_dearmor
+ ./gpg_dearmor > ./pubring.gpg < $(srcdir)/pubring.asc
./secring.gpg: $(srcdir)/secring.asc
- $(GPG_DEARMOR) -o ./secring.gpg $(srcdir)/secring.asc
+ ./gpg_dearmor > ./secring.gpg < $(srcdir)/secring.asc
./pubring.pkr: $(srcdir)/pubring.pkr.asc
- $(GPG_DEARMOR) -o ./pubring.pkr $(srcdir)/pubring.pkr.asc
+ ./gpg_dearmor > ./pubring.pkr < $(srcdir)/pubring.pkr.asc
./secring.skr: $(srcdir)/secring.skr.asc
- $(GPG_DEARMOR) -o ./secring.skr $(srcdir)/secring.skr.asc
+ ./gpg_dearmor > ./secring.skr < $(srcdir)/secring.skr.asc
./plain-1: $(srcdir)/plain-1o.asc
- $(GPG_DEARMOR) -o ./plain-1 $(srcdir)/plain-1o.asc
+ ./gpg_dearmor > ./plain-1 < $(srcdir)/plain-1o.asc
./plain-2: $(srcdir)/plain-2o.asc
- $(GPG_DEARMOR) -o ./plain-2 $(srcdir)/plain-2o.asc
+ ./gpg_dearmor > ./plain-2 < $(srcdir)/plain-2o.asc
./plain-3: $(srcdir)/plain-3o.asc
- $(GPG_DEARMOR) -o ./plain-3 $(srcdir)/plain-3o.asc
-
+ ./gpg_dearmor > ./plain-3 < $(srcdir)/plain-3o.asc
data-500: