From bc682cbd3e2708c1a591e3424ac999c907621713 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Tue, 15 Jan 2013 12:36:08 +0100 Subject: [PATCH] tests/Makefile.am: remove wildcard usage in EXTRA_DIST --- tests/Makefile.am | 7 ++-- tests/certs/Makefile.am | 65 +++++++++++++++++++++++++++++++++ tests/certs/scripts/Makefile.am | 28 ++++++++++++++ 3 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 tests/certs/Makefile.am create mode 100644 tests/certs/scripts/Makefile.am diff --git a/tests/Makefile.am b/tests/Makefile.am index d8c3e18ab..65a618ea6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -26,9 +26,8 @@ PDFPAGES = testcurl.pdf runtests.pdf EXTRA_DIST = ftpserver.pl httpserver.pl secureserver.pl runtests.pl getpart.pm \ FILEFORMAT README stunnel.pem memanalyze.pl testcurl.pl valgrind.pm ftp.pm \ sshserver.pl sshhelp.pm testcurl.1 runtests.1 $(HTMLPAGES) $(PDFPAGES) \ - CMakeLists.txt certs/scripts/*.sh certs/Server* certs/EdelCurlRoot* \ serverhelp.pm tftpserver.pl rtspserver.pl directories.pm symbol-scan.pl \ - certs/srp-verifier-conf certs/srp-verifier-db mem-include-scan.pl + CMakeLists.txt mem-include-scan.pl # we have two variables here to make sure DIST_SUBDIRS won't get 'unit' # added twice as then targets such as 'distclean' misbehave and try to @@ -41,7 +40,7 @@ BUILD_UNIT = DIST_UNIT = unit endif -SUBDIRS = data server libtest $(BUILD_UNIT) +SUBDIRS = certs data server libtest $(BUILD_UNIT) DIST_SUBDIRS = $(SUBDIRS) $(DIST_UNIT) PERLFLAGS = -I$(srcdir) diff --git a/tests/certs/Makefile.am b/tests/certs/Makefile.am new file mode 100644 index 000000000..ef4626889 --- /dev/null +++ b/tests/certs/Makefile.am @@ -0,0 +1,65 @@ +#*************************************************************************** +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ +# \___|\___/|_| \_\_____| +# +# Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://curl.haxx.se/docs/copyright.html. +# +# You may opt to use, copy, modify, merge, publish, distribute and/or sell +# copies of the Software, and permit persons to whom the Software is +# furnished to do so, under the terms of the COPYING file. +# +# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +# KIND, either express or implied. +# +########################################################################### + +SUBDIRS = scripts + +CERTFILES = \ + EdelCurlRoot-ca.cacert \ + EdelCurlRoot-ca.cnf \ + EdelCurlRoot-ca.crt \ + EdelCurlRoot-ca.csr \ + EdelCurlRoot-ca.der \ + EdelCurlRoot-ca.key \ + EdelCurlRoot-ca.prm \ + Server-localhost-sv.crl \ + Server-localhost-sv.crt \ + Server-localhost-sv.csr \ + Server-localhost-sv.der \ + Server-localhost-sv.dhp \ + Server-localhost-sv.key \ + Server-localhost-sv.p12 \ + Server-localhost-sv.pem \ + Server-localhost-sv.prm \ + Server-localhost.nn-sv.crl \ + Server-localhost.nn-sv.crt \ + Server-localhost.nn-sv.csr \ + Server-localhost.nn-sv.der \ + Server-localhost.nn-sv.dhp \ + Server-localhost.nn-sv.key \ + Server-localhost.nn-sv.pem \ + Server-localhost.nn-sv.prm \ + Server-localhost0h-sv.crl \ + Server-localhost0h-sv.crt \ + Server-localhost0h-sv.csr \ + Server-localhost0h-sv.der \ + Server-localhost0h-sv.dhp \ + Server-localhost0h-sv.key \ + Server-localhost0h-sv.p12 \ + Server-localhost0h-sv.pem \ + Server-localhost0h-sv.prm + +SRPFILES = \ + srp-verifier-conf \ + srp-verifier-db + +EXTRA_DIST = $(CERTFILES) $(SRPFILES) + diff --git a/tests/certs/scripts/Makefile.am b/tests/certs/scripts/Makefile.am new file mode 100644 index 000000000..ff6983caa --- /dev/null +++ b/tests/certs/scripts/Makefile.am @@ -0,0 +1,28 @@ +#*************************************************************************** +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ +# \___|\___/|_| \_\_____| +# +# Copyright (C) 1998 - 2013, Daniel Stenberg, , et al. +# +# This software is licensed as described in the file COPYING, which +# you should have received as part of this distribution. The terms +# are also available at http://curl.haxx.se/docs/copyright.html. +# +# You may opt to use, copy, modify, merge, publish, distribute and/or sell +# copies of the Software, and permit persons to whom the Software is +# furnished to do so, under the terms of the COPYING file. +# +# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +# KIND, either express or implied. +# +########################################################################### + +SCRIPTFILES = \ + genroot.sh \ + genserv.sh + +EXTRA_DIST = $(SCRIPTFILES) +