[pkg-opensc-commit] [libp11] 09/27: Move libp11.map from srcdir to builddir

[Eric Dorland]

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

eric pushed a commit to branch master
in repository libp11.

commit b55e24dc025b9753dc8552da2b786fcd7848bc35
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Sat Jun 3 16:16:57 2017 +0200

    Move libp11.map from srcdir to builddir
---
 .gitignore      |  1 +
 configure.ac    | 25 +++++++++++++------------
 src/Makefile.am |  3 ++-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 665caea..d6b9a33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@ stamp-h*
 *.out
 *.exp
 *.obj
+*.map
 
 m4/ltoptions.m4
 m4/ltsugar.m4
diff --git a/configure.ac b/configure.ac
index 0bff13d..9febd10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,18 +235,6 @@ if test "${enable_strict}" = "yes"; then
 	CFLAGS="${CFLAGS} -Wall -Wextra"
 fi
 
-rm -f src/libp11.map
-echo "LIBP11_${LIBP11_LT_OLDEST}" > src/libp11.map
-echo "{" >> src/libp11.map
-echo "global:" >> src/libp11.map
-tr '\n' ';' <src/libp11.exports >>src/libp11.map
-echo "" >> src/libp11.map
-echo "local:" >> src/libp11.map
-echo '*;' >> src/libp11.map
-echo "};" >> src/libp11.map
-
-chmod ugo-w src/libp11.map
-
 AC_MSG_CHECKING([if libtool needs -no-undefined flag to build shared libraries])
 case "`uname`" in
   CYGWIN*|MSYS*|MINGW*|AIX*)
@@ -273,6 +261,19 @@ AC_CONFIG_FILES([
 ])
 AC_OUTPUT
 
+AC_MSG_NOTICE([creating src/libp11.map])
+# We do it *after* the src directory is created
+rm -f src/libp11.map
+echo "LIBP11_${LIBP11_LT_OLDEST}" >src/libp11.map
+echo "{" >>src/libp11.map
+echo "global:" >>src/libp11.map
+tr '\n' ';' <$srcdir/src/libp11.exports >>src/libp11.map
+echo "" >>src/libp11.map
+echo "local:" >>src/libp11.map
+echo '*;' >>src/libp11.map
+echo "};" >>src/libp11.map
+chmod ugo-w src/libp11.map
+
 cat <<EOF
 
 libp11 has been configured with the following options:
diff --git a/src/Makefile.am b/src/Makefile.am
index e415638..b74ea03 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,6 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 	$(srcdir)/config.h.in $(srcdir)/config.h.in~
+DISTCLEANFILES = libp11.map
 CLEANFILES = libp11.pc
 EXTRA_DIST = Makefile.mak libp11.rc.in pkcs11.rc.in
 
@@ -25,7 +26,7 @@ libp11_la_LDFLAGS = $(AM_LDFLAGS) \
 	-version-info @LIBP11_LT_CURRENT@:@LIBP11_LT_REVISION@:@LIBP11_LT_AGE@
 
 if HAVE_LD_VERSION_SCRIPT
-libp11_la_LDFLAGS += -Wl,--version-script="$(srcdir)/libp11.map"
+libp11_la_LDFLAGS += -Wl,--version-script=libp11.map
 if WIN32
 libp11_la_LDFLAGS += -export-symbols "$(srcdir)/libp11.exports"
 endif

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