[pkg-opensc-commit] [pkcs11-helper] 162/253: Fix separate builddir issues

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

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

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

commit 183eff426a7f2c635477ada440b0e993cd0f2983
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Fri Apr 4 21:39:02 2008 +0000

    Fix separate builddir issues
---
 Makefile.am                           | 15 ++++++++------
 aclocal/Makefile.am                   |  2 +-
 configure.ac                          |  1 +
 distro/Makefile.am                    |  2 +-
 distro/debian/Makefile.am             |  4 ++--
 distro/debian/copyright.m4            |  2 +-
 distro/rpm/Makefile.am                |  2 +-
 doc/Makefile.am                       |  2 +-
 doc/api/{Doxyfile => Doxyfile.in}     |  8 ++++----
 doc/api/Makefile.am                   | 10 ++++-----
 include/Makefile.am                   |  2 +-
 include/pkcs11-helper-1.0/Makefile.am |  2 +-
 lib/Makefile.am                       | 38 +++++++++++++++++------------------
 m4dir/Makefile.am                     |  2 +-
 man/Makefile.am                       |  2 +-
 tests/Makefile.am                     |  2 +-
 tests/test-basic/Makefile.am          |  5 +++--
 tests/test-certificate/Makefile.am    |  5 +++--
 tests/test-slotevent/Makefile.am      |  5 +++--
 19 files changed, 59 insertions(+), 52 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3c5afcd..531b33b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,14 +49,17 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-AUTOMAKE_OPTIONS=foreign dist-bzip2
+AUTOMAKE_OPTIONS=foreign dist-bzip2 1.10
 ACLOCAL_AMFLAGS = -I aclocal
 
 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
+	config.log config.status \
+	$(srcdir)/Makefile.in \
+	$(srcdir)/config.h.in $(srcdir)/config.h.in~ $(srcdir)/configure \
+	$(srcdir)/install-sh $(srcdir)/ltmain.sh $(srcdir)/missing \
+	$(srcdir)/depcomp $(srcdir)/aclocal.m4 \
+	$(srcdir)/config.guess $(srcdir)/config.sub \
+	$(srcdir)/pkcs11-helper.spec
 
 SUBDIRS=aclocal man include lib m4dir doc distro tests
 
@@ -67,4 +70,4 @@ noinst_HEADERS=config-w32-vc.h
 # pkcs11-helper.spec must be on root for invalid RPM
 #
 dist-hook:
-	$(LN_S) distro/rpm/pkcs11-helper.spec "$(distdir)/pkcs11-helper.spec"
+	$(LN_S) "distro/rpm/pkcs11-helper.spec" "$(distdir)/pkcs11-helper.spec"
diff --git a/aclocal/Makefile.am b/aclocal/Makefile.am
index 7fdc543..444b398 100644
--- a/aclocal/Makefile.am
+++ b/aclocal/Makefile.am
@@ -49,6 +49,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-MAINTAINERCLEANFILES=Makefile.in
+MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
 
 dist_noinst_DATA=vararg.m4 size_t.m4
diff --git a/configure.ac b/configure.ac
index 24cbf0c..da9b1fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -450,6 +450,7 @@ AC_CONFIG_FILES([
 	man/Makefile
 	doc/Makefile
 	doc/api/Makefile
+	doc/api/Doxyfile
 	lib/Makefile
 	lib/libpkcs11-helper-1.pc
 	lib/versioninfo.rc
diff --git a/distro/Makefile.am b/distro/Makefile.am
index cd4ab4c..f0ab667 100644
--- a/distro/Makefile.am
+++ b/distro/Makefile.am
@@ -49,6 +49,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-MAINTAINERCLEANFILES=Makefile.in
+MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
 
 SUBDIRS=rpm debian
diff --git a/distro/debian/Makefile.am b/distro/debian/Makefile.am
index 9a509e8..7835e40 100644
--- a/distro/debian/Makefile.am
+++ b/distro/debian/Makefile.am
@@ -50,7 +50,7 @@
 #
 
 SUFFIXES=.m4
-MAINTAINERCLEANFILES=Makefile.in
+MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
 CLEANFILES=copyright
 BUILT_SOURCES=copyright
 
@@ -67,4 +67,4 @@ dist_noinst_DATA= \
 	libpkcs11-helper1.install
 
 .m4:
-	$(M4) $^ > $@
+	$(M4) -Dtop_srcdir="$(top_srcdir)" "$^" > "$@"
diff --git a/distro/debian/copyright.m4 b/distro/debian/copyright.m4
index ff8b91e..aa8f88d 100644
--- a/distro/debian/copyright.m4
+++ b/distro/debian/copyright.m4
@@ -7,7 +7,7 @@ Upstream Author: Alon Bar-Lev <alon.barlev at gmail.com>
 
 Copyright: Copyright (c) 2005-2006 Alon Bar-Lev
 
-include(../../COPYING)
+include(top_srcdir/COPYING)
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'. 
diff --git a/distro/rpm/Makefile.am b/distro/rpm/Makefile.am
index b567852..fef0354 100644
--- a/distro/rpm/Makefile.am
+++ b/distro/rpm/Makefile.am
@@ -49,6 +49,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-MAINTAINERCLEANFILES=Makefile.in
+MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
 
 dist_noinst_DATA=pkcs11-helper.spec
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c70f986..dfab09b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -49,6 +49,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-MAINTAINERCLEANFILES=Makefile.in
+MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
 
 SUBDIRS=api
diff --git a/doc/api/Doxyfile b/doc/api/Doxyfile.in
similarity index 99%
rename from doc/api/Doxyfile
rename to doc/api/Doxyfile.in
index 4d43e75..fef60b5 100644
--- a/doc/api/Doxyfile
+++ b/doc/api/Doxyfile.in
@@ -113,7 +113,7 @@ FULL_PATH_NAMES        = YES
 # If left blank the directory from which doxygen is run is used as the 
 # path to strip.
 
-STRIP_FROM_PATH        = ../../include
+STRIP_FROM_PATH        = @top_srcdir@/include @srcdir@
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
 # the path mentioned in the documentation of a class, which tells 
@@ -462,7 +462,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = ../../include .
+INPUT                  = @top_srcdir@/include @srcdir@
 
 # This tag can be used to specify the character encoding of the source files that 
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
@@ -517,7 +517,7 @@ EXCLUDE_SYMBOLS        =
 # directories that contain example code fragments that are included (see 
 # the \include command).
 
-EXAMPLE_PATH           = ../..
+EXAMPLE_PATH           = @top_srcdir@
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the 
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@@ -673,7 +673,7 @@ HTML_HEADER            =
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER            = Doxyfile_footer.html
+HTML_FOOTER            = @srcdir@/Doxyfile_footer.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
index cd1b7b0..4128e53 100644
--- a/doc/api/Makefile.am
+++ b/doc/api/Makefile.am
@@ -49,9 +49,9 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-MAINTAINERCLEANFILES=Makefile.in
+MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
 
-dist_noinst_DATA=Doxyfile Doxyfile_footer.html *.dox *.gif
+dist_noinst_DATA=Doxyfile $(srcdir)/Doxyfile_footer.html $(srcdir)/*.dox $(srcdir)/*.gif
 
 if ENABLE_DOC
 
@@ -59,11 +59,11 @@ apidoc_DATA=api.out/html/*
 
 api.out/html/*: \
 		$(EXTRA_DIST) \
-		../../include/pkcs11-helper-1.0/*.h \
-		*.gif
+		$(top_srcdir)/include/pkcs11-helper-1.0/*.h \
+		$(srcdir)/*.gif
 	-rm -fr api.out
 	$(DOXYGEN)
-	cp *.gif api.out/html
+	cp "$(srcdir)"/*.gif api.out/html
 
 endif
 
diff --git a/include/Makefile.am b/include/Makefile.am
index 74e2697..bca99f6 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -49,6 +49,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-MAINTAINERCLEANFILES=Makefile.in
+MAINTAINERCLEANFILES=$(srcdir)/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 533b67f..5ec5ecf 100644
--- a/include/pkcs11-helper-1.0/Makefile.am
+++ b/include/pkcs11-helper-1.0/Makefile.am
@@ -49,7 +49,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-MAINTAINERCLEANFILES=Makefile.in
+MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
 
 pkcs11hinclude_HEADERS= \
 	pkcs11.h \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d6d3ee4..733427b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -49,7 +49,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-MAINTAINERCLEANFILES=Makefile.in
+MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
 CLEANFILES=pkcs11-helper.exports
 
 EXTRA_DIST= \
@@ -66,7 +66,8 @@ pkgconfig_DATA=libpkcs11-helper-1.pc
 lib_LTLIBRARIES=libpkcs11-helper.la
 
 INCLUDES= \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include
 
 nodist_libpkcs11_helper_la_SOURCES= \
 	pkcs11-helper.exports
@@ -88,7 +89,7 @@ libpkcs11_helper_la_SOURCES= \
 libpkcs11_helper_la_LDFLAGS= \
 	$(AM_LDFLAGS) \
 	-version-info @LIBPKCS11_HELPER_LT_CURRENT@:@LIBPKCS11_HELPER_LT_REVISION@:@LIBPKCS11_HELPER_LT_AGE@ \
-	-export-symbols pkcs11-helper.exports \
+	-export-symbols "pkcs11-helper.exports" \
 	-no-undefined
 if WIN32
 libpkcs11_helper_la_SOURCES+=versioninfo.rc
@@ -97,28 +98,28 @@ EXTRA_DIST+=versioninfo.rc
 endif
 
 pkcs11-helper.exports: \
-		../config.h \
-		certificate.exports \
-		core.exports \
-		data.exports \
-		openssl.exports \
-		slotevent.exports \
-		token.exports
-	cat core.exports > pkcs11-helper.exports
+		$(top_builddir)/config.h \
+		$(srcdir)/certificate.exports \
+		$(srcdir)/core.exports \
+		$(srcdir)/data.exports \
+		$(srcdir)/openssl.exports \
+		$(srcdir)/slotevent.exports \
+		$(srcdir)/token.exports
+	cat "$(srcdir)/core.exports" > pkcs11-helper.exports
 if ENABLE_PKCS11H_CERTIFICATE
-	cat certificate.exports >> pkcs11-helper.exports
+	cat "$(srcdir)/certificate.exports" >> pkcs11-helper.exports
 endif
 if ENABLE_PKCS11H_DATA
-	cat data.exports >> pkcs11-helper.exports
+	cat "$(srcdir)/data.exports" >> pkcs11-helper.exports
 endif
 if ENABLE_PKCS11H_OPENSSL
-	cat openssl.exports >> pkcs11-helper.exports
+	cat "$(srcdir)/openssl.exports" >> pkcs11-helper.exports
 endif
 if ENABLE_PKCS11H_SLOTEVENT
-	cat slotevent.exports >> pkcs11-helper.exports
+	cat "$(srcdir)/slotevent.exports" >> pkcs11-helper.exports
 endif
 if ENABLE_PKCS11H_TOKEN
-	cat token.exports >> pkcs11-helper.exports
+	cat "$(srcdir)/token.exports" >> pkcs11-helper.exports
 endif
 
 if WIN32
@@ -132,8 +133,7 @@ RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
 
 .rc.lo:
-	$(LTRCCOMPILE) -i $< -o $@
+	$(LTRCCOMPILE) -i "$<" -o "$@"
 
 .rc.o:
-	$(RCCOMPILE) -i $< -o $@
-
+	$(RCCOMPILE) -i "$<" -o "$@"
diff --git a/m4dir/Makefile.am b/m4dir/Makefile.am
index 24d64a7..7755800 100644
--- a/m4dir/Makefile.am
+++ b/m4dir/Makefile.am
@@ -49,6 +49,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-MAINTAINERCLEANFILES=Makefile.in
+MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
 
 dist_m4_DATA=pkcs11-helper-1.m4
diff --git a/man/Makefile.am b/man/Makefile.am
index f90dd91..7b1e0a3 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -49,7 +49,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-MAINTAINERCLEANFILES=Makefile.in
+MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
 CLEANFILES=pkcs11-helper-1.8.html
 
 if WIN32
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 75924e3..5dd1bdb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -49,7 +49,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-MAINTAINERCLEANFILES=Makefile.in
+MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
 
 SUBDIRS= \
 	test-basic \
diff --git a/tests/test-basic/Makefile.am b/tests/test-basic/Makefile.am
index 549c12a..644dcb0 100644
--- a/tests/test-basic/Makefile.am
+++ b/tests/test-basic/Makefile.am
@@ -49,13 +49,14 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-MAINTAINERCLEANFILES=Makefile.in
+MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
 
 TESTS=test-basic
 noinst_PROGRAMS=test-basic
 
 INCLUDES= \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include
 LDADD= \
 	$(top_builddir)/lib/libpkcs11-helper.la
 
diff --git a/tests/test-certificate/Makefile.am b/tests/test-certificate/Makefile.am
index fcc7cbf..b52560f 100644
--- a/tests/test-certificate/Makefile.am
+++ b/tests/test-certificate/Makefile.am
@@ -49,13 +49,14 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-MAINTAINERCLEANFILES=Makefile.in
+MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
 
 TESTS=test-certificate
 noinst_PROGRAMS=test-certificate
 
 INCLUDES= \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include
 LDADD= \
 	$(top_builddir)/lib/libpkcs11-helper.la
 
diff --git a/tests/test-slotevent/Makefile.am b/tests/test-slotevent/Makefile.am
index aa12d23..9ac24ee 100644
--- a/tests/test-slotevent/Makefile.am
+++ b/tests/test-slotevent/Makefile.am
@@ -49,13 +49,14 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-MAINTAINERCLEANFILES=Makefile.in
+MAINTAINERCLEANFILES=$(srcdir)/Makefile.in
 
 TESTS=test-slotevent
 noinst_PROGRAMS=test-slotevent
 
 INCLUDES= \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir)/include \
+	-I$(top_builddir)/include
 LDADD= \
 	$(top_builddir)/lib/libpkcs11-helper.la
 

-- 
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