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 /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 'am')
| -rw-r--r-- | am/cmacros.am | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/am/cmacros.am b/am/cmacros.am index 51f47c373..6ee428357 100644 --- a/am/cmacros.am +++ b/am/cmacros.am @@ -65,6 +65,12 @@ extra_sys_libs = extra_bin_ldflags = endif +if HAVE_W32_SYSTEM +.rc.o: + $(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@" + +endif +resource_objs = # Convenience macros libcommon = ../common/libcommon.a |