Changeset 855b295 in mod_gnutls for test/Makefile.am


Ignore:
Timestamp:
May 31, 2016, 2:09:04 PM (6 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports
Children:
96fc9d9
Parents:
370a657 (diff), ce12806 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge tag 'upstream/0.7.5' into debian

Upstream version 0.7.5

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    r370a657 r855b295  
    3333TESTS = $(dist_check_SCRIPTS)
    3434
     35check_PROGRAMS = pgpcrc
     36pgpcrc_SOURCES = pgpcrc.c
     37
    3538# Identities in the miniature CA, server, and client environment for
    3639# the test suite
     
    4245# Append strings after ":=" to each identity to generate a list of
    4346# necessary files
    44 pgp_tokens = $(pgp_identities:=/secring.gpg) $(pgp_identities:=/cert.pgp) \
     47pgp_tokens = $(pgp_identities:=/cert.pgp) \
    4548        $(pgp_identities:=/secret.pgp)
    4649x509_keys = $(x509_identities:=/secret.key)
     
    9396# one day, so regenerating them is both fast and frequently
    9497# necessary.
    95 MOSTLYCLEANFILES += */*.pgp */*.gpg */*.gpg~ */gpg.conf authority/lock
     98MOSTLYCLEANFILES += */*.pgp */*.pgp.raw */*.gpg */*.gpg~ */gpg.conf \
     99        authority/lock */*.kbx */*.kbx~ */S.gpg-agent */private-keys-v1.d/*
    96100# GnuPG random pool, no need to regenerate on every build
    97101CLEANFILES += authority/random_seed
     
    142146
    143147mostlyclean-local: clean-softhsm2-db
     148        -rmdir $(pgp_identities:=/private-keys-v1.d) || true
     149if USE_MSVA
     150        -rmdir $(msva_home)/private-keys-v1.d || true
     151endif
    144152
    145153clean-local:
     
    151159
    152160# Apache configuration and data files
    153 apache_data = base_apache.conf cgi_module.conf data/* mime.types proxy_mods.conf
    154 
    155 EXTRA_DIST = $(apache_data) $(cert_templates) *.uid.in common.bash \
    156         proxy_backend.bash runtests server-crl.template softhsm.bash
     161apache_data = base_apache.conf cgi_module.conf data/dump.cgi data/secret.txt data/test.txt mime.types proxy_mods.conf
     162
     163EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=.uid.in) \
     164        common.bash proxy_backend.bash runtests server-crl.template \
     165        softhsm.bash
    157166
    158167# Lockfile for the main Apache process
Note: See TracChangeset for help on using the changeset viewer.