diff options
| author | Werner Koch <wk@gnupg.org> | 2023-05-24 12:06:37 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2023-05-24 12:06:37 +0200 |
| commit | 3fbe10172f0a0d9fddad19c1e04a4f7870c88fbe (patch) | |
| tree | ef40dc22ca08e3d38cf65d91716ffb99dd7d9756 /g10/Makefile.am | |
| parent | common,w32: Set a proper error code when creating an output file. (diff) | |
| download | gnupg2-3fbe10172f0a0d9fddad19c1e04a4f7870c88fbe.tar.xz gnupg2-3fbe10172f0a0d9fddad19c1e04a4f7870c88fbe.zip | |
w32: Add missing manifests and set a requestedExecutionLevel.
* agent/gpg-agent.w32-manifest.in: New.
* dirmngr/dirmngr-client-w32info.rc: New.
* dirmngr/dirmngr-client.w32-manifest.in: New.
* dirmngr/dirmngr-w32info.rc: New.
* dirmngr/dirmngr.w32-manifest.in: New.
* dirmngr/dirmngr_ldap-w32info.rc: New.
* dirmngr/dirmngr_ldap.w32-manifest.in: New.
* g10/gpgv-w32info.rc: New.
* g10/gpgv.w32-manifest.in: New.
* kbx/keyboxd.w32-manifest.in: New.
* scd/scdaemon.w32-manifest.in: New.
* sm/gpgsm.w32-manifest.in: New.
--
This avoids the use of the VirtualStore uner Windows.
GnuPG-bug-id: 6503
Diffstat (limited to 'g10/Makefile.am')
| -rw-r--r-- | g10/Makefile.am | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/g10/Makefile.am b/g10/Makefile.am index 80b5b8919..c5691f551 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -1,3 +1,4 @@ +# Makefile.am - g10 # Copyright (C) 1998, 1999, 2000, 2001, 2002, # 2003, 2006, 2010 Free Software Foundation, Inc. # @@ -19,8 +20,9 @@ ## Process this file with automake to produce Makefile.in EXTRA_DIST = distsigkey.gpg \ - ChangeLog-2011 gpg-w32info.rc \ - gpg.w32-manifest.in test.c t-keydb-keyring.kbx \ + gpg-w32info.rc gpg.w32-manifest.in \ + gpgv-w32info.rc gpgv.w32-manifest.in \ + ChangeLog-2011 test.c t-keydb-keyring.kbx \ t-keydb-get-keyblock.gpg t-stutter-data.asc \ all-tests.scm @@ -83,10 +85,11 @@ endif if HAVE_W32_SYSTEM -resource_objs += gpg-w32info.o - -gpg-w32info.o : gpg.w32-manifest +gpg_rc_objs = gpg-w32info.o +gpgv_rc_objs = gpgv-w32info.o +gpg-w32info.o : gpg.w32-manifest ../common/w32info-rc.h +gpgv-w32info.o : gpgv.w32-manifest ../common/w32info-rc.h endif common_source = \ @@ -171,11 +174,11 @@ LDADD = $(needed_libs) ../common/libgpgrl.a \ $(ZLIBS) $(LIBINTL) $(CAPLIBS) gpg_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \ $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \ - $(LIBICONV) $(resource_objs) + $(LIBICONV) $(gpg_rc_objs) gpg_LDFLAGS = gpgv_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) \ $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \ - $(LIBICONV) $(resource_objs) + $(LIBICONV) $(gpgv_rc_objs) gpgv_LDFLAGS = |