Changeset b674e95 in mod_gnutls for test/Makefile.am


Ignore:
Timestamp:
May 29, 2016, 3:38:07 PM (3 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, master, upstream
Children:
94cb972
Parents:
efe884e (diff), 086cea9 (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.
git-author:
Thomas Klute <thomas2.klute@…> (05/29/16 15:28:14)
git-committer:
Thomas Klute <thomas2.klute@…> (05/29/16 15:38:07)
Message:

Merge version 0.7.5 into ocsp branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    refe884e rb674e95  
    3434TESTS = $(dist_check_SCRIPTS)
    3535
     36check_PROGRAMS = pgpcrc
     37pgpcrc_SOURCES = pgpcrc.c
     38
    3639# build OCSP database tool
    3740if ENABLE_OCSP_TEST
    38 check_PROGRAMS = gen_ocsp_index
     41check_PROGRAMS += gen_ocsp_index
    3942gen_ocsp_index_SOURCES = gen_ocsp_index.c cert_helper.c
    4043noinst_HEADERS = cert_helper.h
     
    5356# Append strings after ":=" to each identity to generate a list of
    5457# necessary files
    55 pgp_tokens = $(pgp_identities:=/secring.gpg) $(pgp_identities:=/cert.pgp) \
     58pgp_tokens = $(pgp_identities:=/cert.pgp) \
    5659        $(pgp_identities:=/secret.pgp)
    5760x509_keys = $(x509_identities:=/secret.key)
     
    104107# one day, so regenerating them is both fast and frequently
    105108# necessary.
    106 MOSTLYCLEANFILES += */*.pgp */*.gpg */*.gpg~ */gpg.conf authority/lock
     109MOSTLYCLEANFILES += */*.pgp */*.pgp.raw */*.gpg */*.gpg~ */gpg.conf \
     110        authority/lock */*.kbx */*.kbx~ */S.gpg-agent */private-keys-v1.d/*
    107111# GnuPG random pool, no need to regenerate on every build
    108112CLEANFILES += authority/random_seed
     
    163167
    164168mostlyclean-local: clean-softhsm2-db
     169        -rmdir $(pgp_identities:=/private-keys-v1.d) || true
     170if USE_MSVA
     171        -rmdir $(msva_home)/private-keys-v1.d || true
     172endif
    165173
    166174clean-local:
     
    172180
    173181# Apache configuration and data files
    174 apache_data = base_apache.conf cgi_module.conf data/* mime.types ocsp_server.conf proxy_mods.conf
    175 
    176 EXTRA_DIST = $(apache_data) $(cert_templates) *.uid.in common.bash \
    177         proxy_backend.bash runtests server-crl.template softhsm.bash
     182apache_data = base_apache.conf cgi_module.conf data/dump.cgi data/ocsp.cgi \
     183        data/secret.txt data/test.txt mime.types ocsp_server.conf \
     184        proxy_mods.conf
     185
     186EXTRA_DIST = $(apache_data) $(cert_templates) $(shared_identities:=.uid.in) \
     187        common.bash proxy_backend.bash runtests server-crl.template \
     188        softhsm.bash
    178189
    179190# Lockfile for the main Apache process
Note: See TracChangeset for help on using the changeset viewer.