gpgme-tool: Install gpgme-tool.

* src/Makefile.am (bin_PROGRAMS): New.  Add gpgme-tools.
(noinst_PROGRAMS): Remove.
This commit is contained in:
Werner Koch 2014-08-12 10:36:30 +02:00
parent e5ab116072
commit 488e44cdb5
2 changed files with 8 additions and 4 deletions

2
NEWS
View File

@ -1,6 +1,8 @@
Noteworthy changes in version 1.5.2 (unreleased) [C__/A__/R_] 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] Noteworthy changes in version 1.5.1 (2014-07-30) [C24/A13/R0]
------------------------------------------------------------- -------------------------------------------------------------

View File

@ -18,7 +18,7 @@
## Process this file with automake to produce Makefile.in ## 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 \ EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \
gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp
@ -27,6 +27,8 @@ m4datadir = $(datadir)/aclocal
m4data_DATA = gpgme.m4 m4data_DATA = gpgme.m4
nodist_include_HEADERS = gpgme.h nodist_include_HEADERS = gpgme.h
bin_PROGRAMS = gpgme-tool
if HAVE_PTHREAD if HAVE_PTHREAD
ltlib_gpgme_pthread = libgpgme-pthread.la ltlib_gpgme_pthread = libgpgme-pthread.la
else else
@ -126,6 +128,9 @@ endif
AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ @QT4_CORE_CFLAGS@ AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ @QT4_CORE_CFLAGS@
AM_CFLAGS = @LIBASSUAN_CFLAGS@ @GLIB_CFLAGS@ @QT4_CORE_CFLAGS@ AM_CFLAGS = @LIBASSUAN_CFLAGS@ @GLIB_CFLAGS@ @QT4_CORE_CFLAGS@
gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@
if HAVE_W32_SYSTEM if HAVE_W32_SYSTEM
# Windows provides us with an endless stream of Tough Love. To spawn # Windows provides us with an endless stream of Tough Love. To spawn
# processes with a controlled set of inherited handles, we need a # 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@ @GPG_ERROR_LIBS@ @QT4_CORE_LIBS@
endif endif
noinst_PROGRAMS = gpgme-tool
gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@
install-data-local: install-def-file install-data-local: install-def-file
uninstall-local: uninstall-def-file uninstall-local: uninstall-def-file