summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAndre Heinecke <aheinecke@gnupg.org>2020-11-04 13:41:07 +0100
committerAndre Heinecke <aheinecke@gnupg.org>2020-11-04 13:50:13 +0100
commite2659f4bf603693c43af0444239bc52744291edc (patch)
tree3491454bf35b9940955338228a21783a34d23e0c /tools
parentw32: Fix strftime problem on Windows. (diff)
downloadgnupg2-e2659f4bf603693c43af0444239bc52744291edc.tar.xz
gnupg2-e2659f4bf603693c43af0444239bc52744291edc.zip
w32: Add windows subsystem variant of gpgconf
* tools/Makefile.am (gpgconf-w32): New target. Builds gpgconf with subsystem windows. * build-aux/speedo/w32/wixlib.wxs: Package it. -- This allows us to create scripts that call gpgconf without opening a console. Using subsystem windows is better then to just close the console after start as it avoids the console flashing up. (cherry picked from commit c366e04958481382c3f7b50f169120053186069b)
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.am6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 27a416be3..81e8b43b2 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -54,6 +54,8 @@ libexec_PROGRAMS = gpg-wks-client
bin_PROGRAMS = gpgconf gpg-connect-agent gpg-card ${symcryptrun}
if !HAVE_W32_SYSTEM
bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server} gpgsplit
+else
+bin_PROGRAMS += gpgconf-w32
endif
libexec_PROGRAMS += gpg-check-pattern
@@ -106,6 +108,10 @@ gpgconf_LDADD = $(maybe_commonpth_libs) $(opt_libassuan_libs) \
$(LIBICONV) $(W32SOCKLIBS)
gpgconf_LDFLAGS = $(extra_bin_ldflags)
+gpgconf_w32_SOURCES = $(gpgconf_SOURCES)
+gpgconf_w32_LDADD = $(gpgconf_LDADD)
+gpgconf_w32_LDFLAGS = $(gpgconf_LDFLAGS) -Wl,-subsystem,windows
+
gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
gpgparsemail_LDADD =