[pkg-opensc-commit] [pkcs11-helper] 30/44: Build cleanups

Eric Dorland eric at moszumanska.debian.org
Fri Jan 6 23:40:15 UTC 2017 

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

eric pushed a commit to tag pkcs11-helper-1.06
in repository pkcs11-helper.

commit 1661500db38ac9f8719d50c3881e2dc4ab0b5e2a
Author: alonbl <alonbl at 485eb718-1723-0410-b8a9-88cf21a28c35>
Date:   Sat Mar 29 20:20:34 2008 +0000

    Build cleanups
---
 .svnignore                            |  1 +
 Makefile.am                           | 11 +++++--
 {m4dir => aclocal}/Makefile.am        |  4 +--
 aclocal/size_t.m4                     | 22 +++++++++++++
 acinclude.m4 => aclocal/vararg.m4     | 23 -------------
 configure.ac                          | 62 +++++++++++++++++++----------------
 distro/Makefile.am                    |  2 ++
 distro/debian/Makefile.am             |  1 +
 distro/rpm/Makefile.am                |  2 ++
 doc/Makefile.am                       |  2 ++
 doc/api/Makefile.am                   |  2 ++
 include/Makefile.am                   |  2 ++
 include/pkcs11-helper-1.0/Makefile.am | 15 ++++-----
 lib/Makefile.am                       |  8 ++---
 m4dir/Makefile.am                     |  4 +--
 man/Makefile.am                       |  1 +
 tests/Makefile.am                     |  2 ++
 tests/test-basic/Makefile.am          |  2 ++
 tests/test-certificate/Makefile.am    |  2 ++
 tests/test-slotevent/Makefile.am      |  2 ++
 20 files changed, 100 insertions(+), 70 deletions(-)

diff --git a/.svnignore b/.svnignore
index 4495ba5..7df34f2 100644
--- a/.svnignore
+++ b/.svnignore
@@ -39,6 +39,7 @@ pkcs11h-version.h
 config-w32-vc.h
 pkcs11-helper.exports
 libpkcs11-helper-1.pc
+versioninfo.rc
 
 copyright
 pkcs11-helper.spec
diff --git a/Makefile.am b/Makefile.am
index ba0227d..e3cc6f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,11 +49,16 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-# This option prevents autoreconf from overriding our COPYING and
-# INSTALL targets:
 AUTOMAKE_OPTIONS=foreign dist-bzip2
+ACLOCAL_AMFLAGS = -I aclocal
 
-SUBDIRS=man include lib m4dir doc distro tests
+MAINTAINERCLEANFILES = \
+	Makefile.in config.h.in config.h.in~ configure \
+	install-sh ltmain.sh missing mkinstalldirs \
+	compile depcomp config.log config.status \
+	config.guess config.sub acinclude.m4 aclocal.m4
+
+SUBDIRS=aclocal man include lib m4dir doc distro tests
 
 dist_doc_DATA=README COPYING.GPL COPYING.BSD COPYING
 noinst_HEADERS=config-w32-vc.h
diff --git a/m4dir/Makefile.am b/aclocal/Makefile.am
similarity index 97%
copy from m4dir/Makefile.am
copy to aclocal/Makefile.am
index 2fd05e1..7fdc543 100644
--- a/m4dir/Makefile.am
+++ b/aclocal/Makefile.am
@@ -49,6 +49,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-m4dir = $(datadir)/aclocal
-dist_m4_DATA = pkcs11-helper-1.m4
+MAINTAINERCLEANFILES=Makefile.in
 
+dist_noinst_DATA=vararg.m4 size_t.m4
diff --git a/aclocal/size_t.m4 b/aclocal/size_t.m4
new file mode 100644
index 0000000..151f955
--- /dev/null
+++ b/aclocal/size_t.m4
@@ -0,0 +1,22 @@
+dnl @synopsis AX_SIZE_T_PRINTF
+dnl
+dnl Test if %zx is supported by printf.
+dnl
+dnl @version
+dnl @author <alon.barlev at gmail.com>
+AC_DEFUN([AX_SIZE_T_PRINTF], [dnl
+	AC_TYPE_SIZE_T dnl
+	AC_CHECK_SIZEOF([size_t])dnl
+	AC_MSG_CHECKING([size_t printf format])
+	if test ${ac_cv_sizeof_size_t} = 4; then
+		ax_cv_printf_z_format="%08x"
+	else
+		ax_cv_printf_z_format="%016lx"
+	fi
+	AC_MSG_RESULT([${ax_cv_printf_z_format}])dnl
+	AC_DEFINE_UNQUOTED(
+		[PRINTF_Z_FORMAT],dnl
+		["${ax_cv_printf_z_format}"],dnl
+		[Define printf format for size_t]dnl
+	)dnl
+])
diff --git a/acinclude.m4 b/aclocal/vararg.m4
similarity index 74%
rename from acinclude.m4
rename to aclocal/vararg.m4
index 876fff5..fb8b4a7 100644
--- a/acinclude.m4
+++ b/aclocal/vararg.m4
@@ -41,26 +41,3 @@ AC_DEFUN([AX_CPP_VARARG_MACRO_ISO], [dnl
     fi
     AS_VAR_POPDEF([VAR])dnl
 ])
-
-dnl @synopsis AX_SIZE_T_PRINTF
-dnl
-dnl Test if %zx is supported by printf.
-dnl
-dnl @version
-dnl @author <alon.barlev at gmail.com>
-AC_DEFUN([AX_SIZE_T_PRINTF], [dnl
-	AC_TYPE_SIZE_T dnl
-	AC_CHECK_SIZEOF([size_t])dnl
-	AC_MSG_CHECKING([size_t printf format])
-	if test ${ac_cv_sizeof_size_t} = 4; then
-		ax_cv_printf_z_format="%08lx"
-	else
-		ax_cv_printf_z_format="%016lx"
-	fi
-	AC_MSG_RESULT([${ax_cv_printf_z_format}])dnl
-	AC_DEFINE_UNQUOTED(
-		[PRINTF_Z_FORMAT],dnl
-		["${ax_cv_printf_z_format}"],dnl
-		[Define printf format for size_t]dnl
-	)dnl
-])
diff --git a/configure.ac b/configure.ac
index 6260324..24cbf0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,19 +50,21 @@
 #
 
 AC_PREREQ([2.60])
-AC_INIT([pkcs11-helper], [1.06_beta1])
-AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
+
+define([PACKAGE_VERSION_MAJOR], [1])
+define([PACKAGE_VERSION_MINOR], [06])
+define([PACKAGE_VERSION_FIX], [0])
+
+AC_INIT([pkcs11-helper], [PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR-beta1])
+AC_CONFIG_AUX_DIR([.])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_SRCDIR([lib/common.h])
+AM_INIT_AUTOMAKE([${PACKAGE_NAME}], [${PACKAGE_VERSION}])
 
-T="${PACKAGE_VERSION}"
-PKCS11H_VERSION_MAJOR="${T%%.*}"
-T="${T#*.}"
-PKCS11H_VERSION_MINOR="${T%%_*}"
-T="${T#*_}"
-PKCS11H_VERSION_FIX=0
+PKCS11H_VERSION_MAJOR="PACKAGE_VERSION_MAJOR"
+PKCS11H_VERSION_MINOR="PACKAGE_VERSION_MINOR"
+PKCS11H_VERSION_FIX="PACKAGE_VERSION_FIX"
 
-PKCS11H_VERSION_MINOR="${PKCS11H_VERSION_MINOR#0}"
 AC_SUBST([PKCS11H_VERSION_MAJOR])
 AC_SUBST([PKCS11H_VERSION_MINOR])
 AC_SUBST([PKCS11H_VERSION_FIX])
@@ -76,7 +78,7 @@ AC_CANONICAL_HOST
 
 AC_ARG_WITH(
 	[cygwin-native],
-	[AC_HELP_STRING([--with-cygwin-native], [Compile native win32])],
+	[AC_HELP_STRING([--with-cygwin-native], [compile native win32])],
 	,
 	[with_cygwin_native="no"]
 )
@@ -107,119 +109,119 @@ esac
 
 AC_ARG_ENABLE(
 	[doc],
-	[AC_HELP_STRING([--enable-doc], [Enable documantation])],
+	[AC_HELP_STRING([--enable-doc], [enable documantation])],
 	,
 	[enable_doc="no"]
 )
 
 AC_ARG_ENABLE(
 	[debug],
-	[AC_HELP_STRING([--disable-debug], [Disable debug support])],
+	[AC_HELP_STRING([--disable-debug], [disable debug support])],
 	,
 	[enable_debug="yes"]
 )
 
 AC_ARG_ENABLE(
 	[threading],
-	[AC_HELP_STRING([--disable-threading], [Disable threading])],
+	[AC_HELP_STRING([--disable-threading], [disable threading])],
 	,
 	[enable_threading="yes"]
 )
 
 AC_ARG_ENABLE(
 	[token],
-	[AC_HELP_STRING([--disable-token], [Disable token support])],
+	[AC_HELP_STRING([--disable-token], [disable token support])],
 	,
 	[enable_token="yes"]
 )
 
 AC_ARG_ENABLE(
 	[data],
-	[AC_HELP_STRING([--disable-data], [Disable data objects support])],
+	[AC_HELP_STRING([--disable-data], [disable data objects support])],
 	,
 	[enable_data="yes"]
 )
 
 AC_ARG_ENABLE(
 	[certificate],
-	[AC_HELP_STRING([--disable-certificate], [Disable certificate support])],
+	[AC_HELP_STRING([--disable-certificate], [disable certificate support])],
 	,
 	[enable_certificate="yes"]
 )
 
 AC_ARG_ENABLE(
 	[slotevent],
-	[AC_HELP_STRING([--disable-slotevent], [Disable slotevent support])],
+	[AC_HELP_STRING([--disable-slotevent], [disable slotevent support])],
 	,
 	[enable_slotevent="yes"]
 )
 
 AC_ARG_ENABLE(
 	[openssl],
-	[AC_HELP_STRING([--disable-openssl], [Disable openssl interface])],
+	[AC_HELP_STRING([--disable-openssl], [disable openssl interface])],
 	,
 	[enable_openssl="yes"]
 )
 
 AC_ARG_ENABLE(
 	[strict],
-	[AC_HELP_STRING([--enable-strict], [Enable strict compiler warnings])],
+	[AC_HELP_STRING([--enable-strict], [enable strict compiler warnings])],
 	,
 	[enable_strict="no"]
 )
 
 AC_ARG_ENABLE(
 	[pedantic],
-	[AC_HELP_STRING([--enable-pedantic], [Enable pedantic compiler warnings])],
+	[AC_HELP_STRING([--enable-pedantic], [enable pedantic compiler warnings])],
 	,
 	[enable_pedantic="no"]
 )
 
 AC_ARG_ENABLE(
 	[crypto-engine-openssl],
-	[AC_HELP_STRING([--disable-crypto-engine-openssl], [Disable OpenSSL crypto engine)])],
+	[AC_HELP_STRING([--disable-crypto-engine-openssl], [disable OpenSSL crypto engine)])],
 	,
 	[enable_crypto_engine_openssl="yes"]
 )
 
 AC_ARG_ENABLE(
 	[crypto-engine-gnutls],
-	[AC_HELP_STRING([--disable-crypto-engine-gnutls], [Disable GnuTLS crypto engine])],
+	[AC_HELP_STRING([--disable-crypto-engine-gnutls], [disable GnuTLS crypto engine])],
 	,
 	[enable_crypto_engine_gnutls="yes"]
 )
 
 AC_ARG_ENABLE(
 	[crypto-engine-nss],
-	[AC_HELP_STRING([--disable-crypto-engine-nss], [Disable NSS crypto engine])],
+	[AC_HELP_STRING([--disable-crypto-engine-nss], [disable NSS crypto engine])],
 	,
 	[enable_crypto_engine_nss="yes"]
 )
 
 AC_ARG_ENABLE(
 	[crypto-engine-win32],
-	[AC_HELP_STRING([--disable-crypto-engine-win32], [Disable win32 native crypto engine on win32 systems])],
+	[AC_HELP_STRING([--disable-crypto-engine-win32], [disable win32 native crypto engine on win32 systems])],
 	,
 	[enable_crypto_engine_win32="yes"]
 )
 
 AC_ARG_WITH(
 	[apidocdir],
-	[AC_HELP_STRING([--with-apidocdir], [Put API documents at this directory, default HTMLDIR/api])],
+	[AC_HELP_STRING([--with-apidocdir], [put API documents at this directory, default HTMLDIR/api])],
 	[apidocdir="${with_apidocdir}"],
 	[apidocdir="\$(htmldir)/api"]
 )
 
 AC_ARG_WITH(
 	[test-provider],
-	[AC_HELP_STRING([--with-test-provider=lib], [Specify providers for test phase])],
+	[AC_HELP_STRING([--with-test-provider=lib], [specify providers for test phase])],
 	[AC_DEFINE_UNQUOTED([TEST_PROVIDER], ["${withval}"], [Test provider])],
 	[AC_DEFINE_UNQUOTED([TEST_PROVIDER], ["/usr/lib/pkcs11/provider.so"], [Test provider])]
 )
 
 AC_ARG_WITH(
 	[test-log-level],
-	[AC_HELP_STRING([--with-test-log-level=level], [Specify log level for test phase])],
+	[AC_HELP_STRING([--with-test-log-level=level], [specify log level for test phase])],
 	[AC_DEFINE_UNQUOTED([TEST_LOG_LEVEL], [${withval}], [Test log level])],
 	[AC_DEFINE_UNQUOTED([TEST_LOG_LEVEL], [3], [Test log level])]
 )
@@ -418,8 +420,12 @@ if test \
 fi
 
 pkgconfigdir="\$(libdir)/pkgconfig"
+m4dir="\$(datadir)/aclocal"
+pkcs11hincludedir="\$(includedir)/pkcs11-helper-1.0"
 AC_SUBST([apidocdir])
 AC_SUBST([pkgconfigdir])
+AC_SUBST([m4dir])
+AC_SUBST([pkcs11hincludedir])
 AC_SUBST([LIBPKCS11_HELPER_LT_CURRENT])
 AC_SUBST([LIBPKCS11_HELPER_LT_REVISION])
 AC_SUBST([LIBPKCS11_HELPER_LT_AGE])
@@ -440,6 +446,7 @@ AC_CONFIG_FILES([
 	include/Makefile
 	include/pkcs11-helper-1.0/Makefile
 	include/pkcs11-helper-1.0/pkcs11h-version.h
+	aclocal/Makefile
 	man/Makefile
 	doc/Makefile
 	doc/api/Makefile
@@ -457,4 +464,3 @@ AC_CONFIG_FILES([
 	tests/test-slotevent/Makefile
 ])
 AC_OUTPUT
-
diff --git a/distro/Makefile.am b/distro/Makefile.am
index 9fbcb2f..cd4ab4c 100644
--- a/distro/Makefile.am
+++ b/distro/Makefile.am
@@ -49,4 +49,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+MAINTAINERCLEANFILES=Makefile.in
+
 SUBDIRS=rpm debian
diff --git a/distro/debian/Makefile.am b/distro/debian/Makefile.am
index e93de3c..9a509e8 100644
--- a/distro/debian/Makefile.am
+++ b/distro/debian/Makefile.am
@@ -50,6 +50,7 @@
 #
 
 SUFFIXES=.m4
+MAINTAINERCLEANFILES=Makefile.in
 CLEANFILES=copyright
 BUILT_SOURCES=copyright
 
diff --git a/distro/rpm/Makefile.am b/distro/rpm/Makefile.am
index b0c1e04..b567852 100644
--- a/distro/rpm/Makefile.am
+++ b/distro/rpm/Makefile.am
@@ -49,4 +49,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+MAINTAINERCLEANFILES=Makefile.in
+
 dist_noinst_DATA=pkcs11-helper.spec
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f5a948f..c70f986 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -49,4 +49,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+MAINTAINERCLEANFILES=Makefile.in
+
 SUBDIRS=api
diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
index 49e2f93..cd1b7b0 100644
--- a/doc/api/Makefile.am
+++ b/doc/api/Makefile.am
@@ -49,6 +49,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+MAINTAINERCLEANFILES=Makefile.in
+
 dist_noinst_DATA=Doxyfile Doxyfile_footer.html *.dox *.gif
 
 if ENABLE_DOC
diff --git a/include/Makefile.am b/include/Makefile.am
index 743c8bc..74e2697 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -49,4 +49,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+MAINTAINERCLEANFILES=Makefile.in
+
 SUBDIRS=pkcs11-helper-1.0
diff --git a/include/pkcs11-helper-1.0/Makefile.am b/include/pkcs11-helper-1.0/Makefile.am
index 0fba1da..533b67f 100644
--- a/include/pkcs11-helper-1.0/Makefile.am
+++ b/include/pkcs11-helper-1.0/Makefile.am
@@ -49,9 +49,9 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-myincdir=$(includedir)/pkcs11-helper-1.0
+MAINTAINERCLEANFILES=Makefile.in
 
-myinc_HEADERS= \
+pkcs11hinclude_HEADERS= \
 	pkcs11.h \
 	pkcs11h-def.h \
 	pkcs11h-engines.h \
@@ -62,26 +62,25 @@ noinst_HEADERS=
 # For win32 vc, add this into
 # dist as well
 #
-myinc_HEADERS+=pkcs11h-version.h
+pkcs11hinclude_HEADERS+=pkcs11h-version.h
 
 if ENABLE_PKCS11H_CERTIFICATE
-myinc_HEADERS+=pkcs11h-certificate.h
+pkcs11hinclude_HEADERS+=pkcs11h-certificate.h
 else
 noinst_HEADERS+=pkcs11h-certificate.h
 endif
 if ENABLE_PKCS11H_DATA
-myinc_HEADERS+=pkcs11h-data.h
+pkcs11hinclude_HEADERS+=pkcs11h-data.h
 else
 noinst_HEADERS+=pkcs11h-data.h
 endif
 if ENABLE_PKCS11H_OPENSSL
-myinc_HEADERS+=pkcs11h-openssl.h
+pkcs11hinclude_HEADERS+=pkcs11h-openssl.h
 else
 noinst_HEADERS+=pkcs11h-openssl.h
 endif
 if ENABLE_PKCS11H_TOKEN
-myinc_HEADERS+=pkcs11h-token.h
+pkcs11hinclude_HEADERS+=pkcs11h-token.h
 else
 noinst_HEADERS+=pkcs11h-token.h
 endif
-
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9194ab3..d6d3ee4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -49,6 +49,9 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+MAINTAINERCLEANFILES=Makefile.in
+CLEANFILES=pkcs11-helper.exports
+
 EXTRA_DIST= \
 	Makefile.w32-vc \
 	certificate.exports \
@@ -57,13 +60,10 @@ EXTRA_DIST= \
 	openssl.exports \
 	slotevent.exports \
 	token.exports
-CLEANFILES= \
-	pkcs11-helper.exports
 
+BUILT_SOURCES=pkcs11-helper.exports
 pkgconfig_DATA=libpkcs11-helper-1.pc
-
 lib_LTLIBRARIES=libpkcs11-helper.la
-BUILT_SOURCES=pkcs11-helper.exports
 
 INCLUDES= \
 	-I$(top_srcdir)/include
diff --git a/m4dir/Makefile.am b/m4dir/Makefile.am
index 2fd05e1..24d64a7 100644
--- a/m4dir/Makefile.am
+++ b/m4dir/Makefile.am
@@ -49,6 +49,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-m4dir = $(datadir)/aclocal
-dist_m4_DATA = pkcs11-helper-1.m4
+MAINTAINERCLEANFILES=Makefile.in
 
+dist_m4_DATA=pkcs11-helper-1.m4
diff --git a/man/Makefile.am b/man/Makefile.am
index 222b502..f90dd91 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -49,6 +49,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+MAINTAINERCLEANFILES=Makefile.in
 CLEANFILES=pkcs11-helper-1.8.html
 
 if WIN32
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c9e2605..75924e3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -49,6 +49,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+MAINTAINERCLEANFILES=Makefile.in
+
 SUBDIRS= \
 	test-basic \
 	test-certificate \
diff --git a/tests/test-basic/Makefile.am b/tests/test-basic/Makefile.am
index f3b3b9c..549c12a 100644
--- a/tests/test-basic/Makefile.am
+++ b/tests/test-basic/Makefile.am
@@ -49,6 +49,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+MAINTAINERCLEANFILES=Makefile.in
+
 TESTS=test-basic
 noinst_PROGRAMS=test-basic
 
diff --git a/tests/test-certificate/Makefile.am b/tests/test-certificate/Makefile.am
index 4c7705d..fcc7cbf 100644
--- a/tests/test-certificate/Makefile.am
+++ b/tests/test-certificate/Makefile.am
@@ -49,6 +49,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+MAINTAINERCLEANFILES=Makefile.in
+
 TESTS=test-certificate
 noinst_PROGRAMS=test-certificate
 
diff --git a/tests/test-slotevent/Makefile.am b/tests/test-slotevent/Makefile.am
index a464322..aa12d23 100644
--- a/tests/test-slotevent/Makefile.am
+++ b/tests/test-slotevent/Makefile.am
@@ -49,6 +49,8 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+MAINTAINERCLEANFILES=Makefile.in
+
 TESTS=test-slotevent
 noinst_PROGRAMS=test-slotevent
 

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

More information about the pkg-opensc-commit mailing list