GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Specify --with-gpg.

Browse Source 
* gpg/Makefile.am (EXTRA_DIST): Replaced mkdemodirs with mkdemodirs.in.
(mkdemodirs): New target.
(clean-local): Added command for removing mkdemodirs script.
(./Alpha/Secret.gpg): Added dependency on mkdemodirs.

* gpg/mkdemodirs: Renamed to ...
* gpg/mkdemodirs.in: ... here.
* gpg/mkdemodirs.in (GPG): Derive value from @GPG@ instead of hard-coding "gpg".
This commit is contained in:
Moritz Schulte 2009-04-19 18:03:49 +00:00
parent 2dce8370e7
commit edf19bbf8f
5 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2009-04-19 Moritz <moritz@gnu.org>
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Specify --with-gpg.
2009-03-06 Marcus Brinkmann <marcus@g10code.de> 2009-03-06 Marcus Brinkmann <marcus@g10code.de>
* assuan/: Update to libassuan SVN 2009-03-06. * assuan/: Update to libassuan SVN 2009-03-06.

4
Makefile.am
View File

@ -1,6 +1,6 @@
# Makefile.am - Top level Makefile for GPGME. # Makefile.am - Top level Makefile for GPGME.
# Copyright (C) 2000 Werner Koch (dd9jn) # Copyright (C) 2000 Werner Koch (dd9jn)
# Copyright (C) 2001, 2002, 2004, 2005, 2008 g10 Code GmbH # Copyright (C) 2001, 2002, 2004, 2005, 2008, 2009 g10 Code GmbH
# #
# This file is part of GPGME. # This file is part of GPGME.
# #
@ -22,6 +22,8 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-bzip2 AUTOMAKE_OPTIONS = dist-bzip2
DISTCHECK_CONFIGURE_FLAGS = --with-gpg="@GPG@"
EXTRA_DIST = gpgme.spec.in autogen.sh EXTRA_DIST = gpgme.spec.in autogen.sh
if BUILD_ASSUAN if BUILD_ASSUAN

11
tests/ChangeLog
View File

@ -1,3 +1,14 @@
2009-04-19 Moritz <moritz@gnu.org>
* gpg/Makefile.am (EXTRA_DIST): Replaced mkdemodirs with mkdemodirs.in.
(mkdemodirs): New target.
(clean-local): Added command for removing mkdemodirs script.
(./Alpha/Secret.gpg): Added dependency on mkdemodirs.
* gpg/mkdemodirs: Renamed to ...
* gpg/mkdemodirs.in: ... here.
* gpg/mkdemodirs.in (GPG): Derive value from @GPG@ instead of hard-coding "gpg".
2009-02-24 Werner Koch <wk@g10code.com> 2009-02-24 Werner Koch <wk@g10code.com>
* opassuan/t-command.c: Adjust for changed new op_assuan interface. * opassuan/t-command.c: Adjust for changed new op_assuan interface.

15
tests/gpg/Makefile.am
View File

@ -1,5 +1,5 @@
# Copyright (C) 2000 Werner Koch (dd9jn) # Copyright (C) 2000 Werner Koch (dd9jn)
# Copyright (C) 2001, 2004, 2005 g10 Code GmbH # Copyright (C) 2001, 2004, 2005, 2009 g10 Code GmbH
# #
# This file is part of GPGME. # This file is part of GPGME.
# #
@ -40,7 +40,7 @@ TESTS = t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers \
CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf
DISTCLEANFILES = pubring.gpg~ pubring.kbx~ random_seed gpg.conf gpg-agent.conf DISTCLEANFILES = pubring.gpg~ pubring.kbx~ random_seed gpg.conf gpg-agent.conf
EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \ EXTRA_DIST = mkdemodirs.in pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
geheim.txt pubkey-1.asc seckey-1.asc pinentry geheim.txt pubkey-1.asc seckey-1.asc pinentry
INCLUDES = -I$(top_builddir)/src INCLUDES = -I$(top_builddir)/src
@ -52,8 +52,13 @@ t_thread1_LDADD = ../../src/libgpgme-pthread.la
# We don't run t-genkey in the test suite, because it takes too long # We don't run t-genkey in the test suite, because it takes too long
noinst_PROGRAMS = $(TESTS) t-genkey noinst_PROGRAMS = $(TESTS) t-genkey
mkdemodirs: mkdemodirs.in Makefile
sed -e 's,[@]GPG[@],$(GPG),g' < $(srcdir)/mkdemodirs.in > mkdemodirs
chmod +x mkdemodirs
clean-local: clean-local:
$(srcdir)/mkdemodirs --clean -./mkdemodirs --clean
-rm -f mkdemodirs
all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf
@ -62,8 +67,8 @@ all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf
$(GPG) --homedir . --allow-secret-key-import \ $(GPG) --homedir . --allow-secret-key-import \
--import Alpha/Secret.gpg Zulu/Secret.gpg --import Alpha/Secret.gpg Zulu/Secret.gpg
./Alpha/Secret.gpg: secdemo.asc ./Alpha/Secret.gpg: mkdemodirs secdemo.asc
srcdir=$(srcdir) $(srcdir)/mkdemodirs srcdir=$(srcdir) ./mkdemodirs
./gpg.conf: ./gpg.conf:
# This is required for t-sig-notations. # This is required for t-sig-notations.

2
tests/gpg/mkdemodirs → tests/gpg/mkdemodirs.in
View File

@ -19,7 +19,7 @@
set -e set -e
GPG="gpg --batch --quiet --no-secmem-warning" GPG="@GPG@ --batch --quiet --no-secmem-warning"
NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India
Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo
Sierra Tango Uniform Victor Whisky XRay Yankee Zulu' Sierra Tango Uniform Victor Whisky XRay Yankee Zulu'