[git] GPGME - branch, master, updated. gpgme-1.5.1-3-g488e44c

[by Werner Koch]

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 "GnuPG Made Easy".

The branch, master has been updated
       via  488e44cdb531035fa8813b95b212f9728abc7e62 (commit)
      from  e5ab11607281b9838da2728268a8f9f0daa2b04d (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 488e44cdb531035fa8813b95b212f9728abc7e62
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Aug 12 10:36:30 2014 +0200

    gpgme-tool: Install gpgme-tool.
    
    * src/Makefile.am (bin_PROGRAMS): New.  Add gpgme-tools.
    (noinst_PROGRAMS): Remove.

diff --git a/NEWS b/NEWS
index 0ea405b..af12743 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 Noteworthy changes in version 1.5.2 (unreleased) [C__/A__/R_]
 -------------------------------------------------------------
 
+ * gpgme-tool is now installed.
+
 
 Noteworthy changes in version 1.5.1 (2014-07-30) [C24/A13/R0]
 -------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 82f5327..b7ddbc1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@
 
 ## Process this file with automake to produce Makefile.in
 
-# Note: moc_kdpipeiodevice should actually be a dependcy below.
+# Note: moc_kdpipeiodevice should actually be a dependecy below.
 EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \
 	     gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp
 
@@ -27,6 +27,8 @@ m4datadir = $(datadir)/aclocal
 m4data_DATA = gpgme.m4
 nodist_include_HEADERS = gpgme.h
 
+bin_PROGRAMS = gpgme-tool
+
 if HAVE_PTHREAD
 ltlib_gpgme_pthread = libgpgme-pthread.la
 else
@@ -126,6 +128,9 @@ endif
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ @QT4_CORE_CFLAGS@
 AM_CFLAGS = @LIBASSUAN_CFLAGS@ @GLIB_CFLAGS@ @QT4_CORE_CFLAGS@
 
+gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@
+
+
 if HAVE_W32_SYSTEM
 # Windows provides us with an endless stream of Tough Love.  To spawn
 # processes with a controlled set of inherited handles, we need a
@@ -201,9 +206,6 @@ libgpgme_qt_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
 	@GPG_ERROR_LIBS@ @QT4_CORE_LIBS@
 endif
 
-noinst_PROGRAMS = gpgme-tool
-gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@
-
 install-data-local: install-def-file
 
 uninstall-local: uninstall-def-file

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

Summary of changes:
 NEWS            |    2 ++
 src/Makefile.am |   10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org