diff options
| author | Werner Koch <[email protected]> | 2014-08-12 08:36:30 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-08-12 15:51:38 +0000 |
| commit | 488e44cdb531035fa8813b95b212f9728abc7e62 (patch) | |
| tree | d3493ad9d1c0a459d305ff745c9d0447672e64e5 | |
| parent | gpgme-tool: Fix segv for external key listing. (diff) | |
| download | gpgme-488e44cdb531035fa8813b95b212f9728abc7e62.tar.gz gpgme-488e44cdb531035fa8813b95b212f9728abc7e62.zip | |
gpgme-tool: Install gpgme-tool.
* src/Makefile.am (bin_PROGRAMS): New. Add gpgme-tools.
(noinst_PROGRAMS): Remove.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 10 |
2 files changed, 8 insertions, 4 deletions
@@ -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 82f5327a..b7ddbc13 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 |