[pkg-opensc-commit] [pkcs11-helper] 164/253: More distcheck/maintainer-clean fixups

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository pkcs11-helper.

commit ba133ce0bb13255481361f06eb7f660afafecdfb
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Fri Apr 11 13:05:58 2008 +0000

    More distcheck/maintainer-clean fixups
---
 Makefile.am       | 2 +-
 configure.ac      | 8 ++++++++
 lib/Makefile.am   | 8 +++++---
 tests/Makefile.am | 7 ++++++-
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 531b33b..57ce809 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,7 +59,7 @@ MAINTAINERCLEANFILES= \
 	$(srcdir)/install-sh $(srcdir)/ltmain.sh $(srcdir)/missing \
 	$(srcdir)/depcomp $(srcdir)/aclocal.m4 \
 	$(srcdir)/config.guess $(srcdir)/config.sub \
-	$(srcdir)/pkcs11-helper.spec
+	$(srcdir)/pkcs11-helper.spec $(srcdir)/config-w32-vc.h
 
 SUBDIRS=aclocal man include lib m4dir doc distro tests
 
diff --git a/configure.ac b/configure.ac
index da9b1fb..b7839f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,6 +205,13 @@ AC_ARG_ENABLE(
 	[enable_crypto_engine_win32="yes"]
 )
 
+AC_ARG_ENABLE(
+	[tests],
+	[AC_HELP_STRING([--enable-tests], [enable tests])],
+	,
+	[enable_tests="no"]
+)
+
 AC_ARG_WITH(
 	[apidocdir],
 	[AC_HELP_STRING([--with-apidocdir], [put API documents at this directory, default HTMLDIR/api])],
@@ -440,6 +447,7 @@ AM_CONDITIONAL([ENABLE_PKCS11H_DATA], [test "${enable_data}" = "yes"])
 AM_CONDITIONAL([ENABLE_PKCS11H_CERTIFICATE], [test "${enable_certificate}" = "yes"])
 AM_CONDITIONAL([ENABLE_PKCS11H_SLOTEVENT], [test "${enable_slotevent}" = "yes"])
 AM_CONDITIONAL([ENABLE_PKCS11H_OPENSSL], [test "${enable_openssl}" = "yes"])
+AM_CONDITIONAL([ENABLE_TESTS], [test "${enable_tests}" = "yes"])
 AC_CONFIG_FILES([
 	Makefile
 	config-w32-vc.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 733427b..6dc4011 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -49,10 +49,12 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
+MAINTAINERCLEANFILES=\
+	$(srcdir)/Makefile.in
+	$(srcdir)/versioninfo.rc
 CLEANFILES=pkcs11-helper.exports
 
-EXTRA_DIST= \
+dist_noinst_DATA= \
 	Makefile.w32-vc \
 	certificate.exports \
 	core.exports \
@@ -94,7 +96,7 @@ libpkcs11_helper_la_LDFLAGS= \
 if WIN32
 libpkcs11_helper_la_SOURCES+=versioninfo.rc
 else
-EXTRA_DIST+=versioninfo.rc
+dist_noinst_DATA+=versioninfo.rc
 endif
 
 pkcs11-helper.exports: \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5dd1bdb..eea2482 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -51,7 +51,12 @@
 
 MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
 
-SUBDIRS= \
+COMMON= \
 	test-basic \
 	test-certificate \
 	test-slotevent
+
+if ENABLE_TESTS
+SUBDIRS = $(COMMON)
+endif
+DIST_SUBDIRS = $(COMMON)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git