[git] Scute - branch, master, updated. scute-1.3.0-32-gdc22111

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PKCS#11 token on top of gpg-agent".

The branch, master has been updated
       via  dc2211179ea7f63434d726eefbc425390c4c6427 (commit)
      from  adac592b19c5e5f2add57c9ffdbfbfa849c7973e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dc2211179ea7f63434d726eefbc425390c4c6427
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Dec 21 02:39:15 2015 +0000

    Apply patch from Debian.
    
    * src/Makefile.am (lib_LTLIBRARIES): Rename from libscute.
    * tests/Makefile.am (LDADD): Follow the change.
    
    --
    
    Shared module (for plug-in to an application) is not a library and it
    shouldn't have version number in the pathname.

diff --git a/src/Makefile.am b/src/Makefile.am
index 677a61c..43fa086 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,7 +68,7 @@ scute_version_script_cmd =
 endif
 
 
-lib_LTLIBRARIES = libscute.la
+lib_LTLIBRARIES = scute.la
 
 if HAVE_W32_SYSTEM
 
@@ -121,15 +121,15 @@ scute_libadd =
 
 endif
 
-libscute_la_LDFLAGS = $(scute_res_ldflag) $(no_undefined) $(export_symbols) \
+scute_la_LDFLAGS = $(scute_res_ldflag) $(no_undefined) -module -avoid-version $(export_symbols) \
 	$(scute_version_script_cmd) -version-info \
 	@LIBSCUTE_LT_CURRENT@:@LIBSCUTE_LT_REVISION@:@LIBSCUTE_LT_AGE@
-libscute_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libscute.vers $(scute_deps)
+scute_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libscute.vers $(scute_deps)
 # scute_libadd must come BEFORE libassuan and gpg-error, because we
 # override it on Windows targets.
-libscute_la_LIBADD = $(scute_libadd) \
+scute_la_LIBADD = $(scute_libadd) \
 	@LTLIBOBJS@ @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
 
-libscute_la_CPPFLAGS = -I$(srcdir)/../include \
+scute_la_CPPFLAGS = -I$(srcdir)/../include \
 	@LIBASSUAN_CFLAGS@ @GPG_ERROR_CFLAGS@
-libscute_la_SOURCES = $(sources)
+scute_la_SOURCES = $(sources)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a487c7d..c7b5f00 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -38,4 +38,4 @@ TESTS = t-link t-getfunctionlist t-initialize t-getinfo t-getslotlist \
 noinst_PROGRAMS = $(TESTS)
 
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src
-LDADD = ../src/libscute.la
+LDADD = ../src/scute.la

-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am   | 12 ++++++------
 tests/Makefile.am |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
PKCS#11 token on top of gpg-agent
http://git.gnupg.org