diff options
| author | Werner Koch <wk@gnupg.org> | 2013-04-25 13:00:16 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2013-05-07 21:35:48 +0200 |
| commit | 88e24341e57c96e31a25e92e09d67989e64cc1c1 (patch) | |
| tree | c9a8b053f02d3143a8f881448610c3c1d8bc211a /tools/Makefile.am | |
| parent | doc: fix some Texinfo warnings. (diff) | |
| download | gnupg2-88e24341e57c96e31a25e92e09d67989e64cc1c1.tar.xz gnupg2-88e24341e57c96e31a25e92e09d67989e64cc1c1.zip | |
w32: Add icons and version information.
* common/gnupg.ico: New. Take from artwork/gnupg-favicon-1.ico.
* agent/gpg-agent-w32info.rc: New.
* g10/gpg-w32info.rc: New.
* scd/scdaemon-w32info.rc: New.
* sm/gpgsm-w32info.rc: New.
* tools/gpg-connect-agent-w32info.rc: New.
* common/w32info-rc.h.in: New.
* configure.ac (BUILD_REVISION, BUILD_FILEVERSION, BUILD_TIMESTAMP)
(BUILD_HOSTNAME): New.
(AC_CONFIG_FILES): Add w32info-rc.h.
* am/cmacros.am (.rc.o): New rule.
* agent/Makefile.am, common/Makefile.am, g10/Makefile.am
* scd/Makefile.am, sm/Makefile.am, tools/Makefile.am: Add stuff to
build resource files.
--
Signed-off-by: Werner Koch <wk@gnupg.org>
(cherry picked from commit 049b3d9ca0285d15c00c215ac9b533c994196ca4)
Solved conflicts in:
agent/Makefile.am
common/Makefile.am
g10/Makefile.am
scd/Makefile.am
sm/Makefile.am
tools/Makefile.am
Diffstat (limited to 'tools/Makefile.am')
| -rw-r--r-- | tools/Makefile.am | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 9d842748a..bc48eeaff 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -20,12 +20,16 @@ EXTRA_DIST = \ Manifest watchgnupg.c \ addgnupghome applygnupgdefaults gpgsm-gencert.sh \ lspgpot mail-signed-keys convert-from-106 sockprox.c \ - ccidmon.c ChangeLog-2011 + ccidmon.c ChangeLog-2011 gpg-connect-agent-w32info.rc AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common include $(top_srcdir)/am/cmacros.am +if HAVE_W32_SYSTEM +resource_objs += gpg-connect-agent-w32info.o +endif + AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(LIBASSUAN_CFLAGS) sbin_SCRIPTS = addgnupghome applygnupgdefaults @@ -113,7 +117,8 @@ gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c # FIXME: remove PTH_LIBS (why do we need them at all?) gpg_connect_agent_LDADD = ../common/libgpgrl.a $(common_libs) \ $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) \ - $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) + $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \ + $(resource_objs) if !HAVE_W32CE_SYSTEM gpgkey2ssh_SOURCES = gpgkey2ssh.c |