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

build: Fix Makefiles for portability.

Browse Source 
* tests/gpg/Makefile.am: Don't allow target with '/'.
* tests/gpgsm/Makefile.am: Ditto.

--

BSD Make doesn't allow a target with '/'.  We still have such a target
in lang/python/Makefile.am, but it's for maintainer only, so,
assumption to GNU Make is OK there.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2018-02-14 17:34:28 +09:00
parent 5ec890b9c7
commit f1d8a7975b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/gpg/Makefile.am
View File

@ -46,7 +46,7 @@ TESTS = initial.test $(c_tests) final.test
CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \ CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf \
gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \ gpg-agent.conf pubring.kbx~ S.gpg-agent gpg.conf pubring.gpg~ \
random_seed S.gpg-agent .gpg-v21-migrated pubring-stamp \ random_seed S.gpg-agent .gpg-v21-migrated pubring-stamp \
tofu.db *.conf.gpgconf.bak gpg-sample.stamp tofu.db *.conf.gpgconf.bak
private_keys = \ private_keys = \
13CD0F3BDF24BE53FE192D62F18737256FF6E4FD \ 13CD0F3BDF24BE53FE192D62F18737256FF6E4FD \
@ -61,7 +61,7 @@ EXTRA_DIST = initial.test final.test \
geheim.txt pubkey-1.asc seckey-1.asc pinentry $(private_keys) geheim.txt pubkey-1.asc seckey-1.asc pinentry $(private_keys)
BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \ BUILT_SOURCES = gpg.conf gpg-agent.conf pubring-stamp \
private-keys-v1.d/gpg-sample.stamp gpg-sample.stamp
AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@ AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
AM_LDFLAGS = -no-install AM_LDFLAGS = -no-install
LDADD = ../../src/libgpgme.la LDADD = ../../src/libgpgme.la
@ -88,15 +88,15 @@ export GNUPGHOME := $(abs_builddir)
export GPG_AGENT_INFO := export GPG_AGENT_INFO :=
private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(private_keys) gpg-sample.stamp: $(srcdir)/$(private_keys)
-gpgconf --kill all -gpgconf --kill all
$(MKDIR_P) ./private-keys-v1.d $(MKDIR_P) ./private-keys-v1.d
for k in $(private_keys); do \ for k in $(private_keys); do \
cp $(srcdir)/$$k private-keys-v1.d/$$k.key; \ cp $(srcdir)/$$k private-keys-v1.d/$$k.key; \
done done
echo x > ./private-keys-v1.d/gpg-sample.stamp echo x > ./gpg-sample.stamp
pubring-stamp: $(srcdir)/pubdemo.asc private-keys-v1.d/gpg-sample.stamp pubring-stamp: $(srcdir)/pubdemo.asc gpg-sample.stamp
$(GPG) --batch --no-permission-warning \ $(GPG) --batch --no-permission-warning \
--import $(srcdir)/pubdemo.asc --import $(srcdir)/pubdemo.asc
-$(GPG) --batch --no-permission-warning \ -$(GPG) --batch --no-permission-warning \

10
tests/gpgsm/Makefile.am
View File

@ -46,7 +46,7 @@ noinst_PROGRAMS = $(c_tests) t-genkey cms-keylist cms-decrypt
key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939 key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
CLEANFILES = pubring-stamp pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \ CLEANFILES = pubring-stamp pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
random_seed S.gpg-agent random_seed S.gpg-agent gpg-sample.stamp
clean-local: clean-local:
-$(top_srcdir)/tests/start-stop-agent --stop -$(top_srcdir)/tests/start-stop-agent --stop
@ -57,9 +57,9 @@ export GNUPGHOME := $(abs_builddir)
export GPG_AGENT_INFO := export GPG_AGENT_INFO :=
BUILT_SOURCES = gpgsm.conf trustlist.txt pubring-stamp \ BUILT_SOURCES = gpgsm.conf trustlist.txt pubring-stamp \
private-keys-v1.d/gpg-sample.stamp gpg-sample.stamp
pubring-stamp: $(srcdir)/cert_g10code_test1.der private-keys-v1.d/gpg-sample.stamp pubring-stamp: $(srcdir)/cert_g10code_test1.der gpg-sample.stamp
$(GPGSM) --import $(srcdir)/cert_g10code_test1.der $(GPGSM) --import $(srcdir)/cert_g10code_test1.der
touch pubring-stamp touch pubring-stamp
@ -68,11 +68,11 @@ gpgsm.conf:
echo faked-system-time 1008241200 >> ./gpgsm.conf echo faked-system-time 1008241200 >> ./gpgsm.conf
echo "agent-program `which $(GPG_AGENT)`|--debug-quick-random" >> ./gpgsm.conf echo "agent-program `which $(GPG_AGENT)`|--debug-quick-random" >> ./gpgsm.conf
private-keys-v1.d/gpg-sample.stamp: $(srcdir)/$(key_id) gpg-sample.stamp: $(srcdir)/$(key_id)
-gpgconf --kill all -gpgconf --kill all
$(MKDIR_P) ./private-keys-v1.d $(MKDIR_P) ./private-keys-v1.d
cp $(srcdir)/$(key_id) private-keys-v1.d/$(key_id).key cp $(srcdir)/$(key_id) private-keys-v1.d/$(key_id).key
echo x > ./private-keys-v1.d/gpg-sample.stamp echo x > ./gpg-sample.stamp
trustlist.txt: trustlist.txt:
echo $(key_id) > ./trustlist.txt echo $(key_id) > ./trustlist.txt