mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
Merge branch 'seckey-sync-work' into master
--
This commit is contained in:
commit
56022fb304
@ -509,6 +509,7 @@ AH_BOTTOM([
|
|||||||
#endif
|
#endif
|
||||||
#define GNUPG_PRIVATE_KEYS_DIR "private-keys-v1.d"
|
#define GNUPG_PRIVATE_KEYS_DIR "private-keys-v1.d"
|
||||||
#define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d"
|
#define GNUPG_OPENPGP_REVOC_DIR "openpgp-revocs.d"
|
||||||
|
#define GNUPG_CACHE_DIR "cache.d"
|
||||||
|
|
||||||
#define GNUPG_DEF_COPYRIGHT_LINE \
|
#define GNUPG_DEF_COPYRIGHT_LINE \
|
||||||
"Copyright (C) 2018 Free Software Foundation, Inc."
|
"Copyright (C) 2018 Free Software Foundation, Inc."
|
||||||
|
@ -46,7 +46,7 @@ else
|
|||||||
gpg_wks_server =
|
gpg_wks_server =
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libexec_PROGRAMS = gpg-wks-client
|
libexec_PROGRAMS = gpg-wks-client gpg-pair-tool
|
||||||
|
|
||||||
bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun}
|
bin_PROGRAMS = gpgconf gpg-connect-agent ${symcryptrun}
|
||||||
if !HAVE_W32_SYSTEM
|
if !HAVE_W32_SYSTEM
|
||||||
@ -168,6 +168,14 @@ gpg_wks_client_LDADD = $(libcommon) \
|
|||||||
$(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
|
$(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
|
||||||
$(LIBINTL) $(LIBICONV)
|
$(LIBINTL) $(LIBICONV)
|
||||||
|
|
||||||
|
gpg_pair_tool_SOURCES = \
|
||||||
|
gpg-pair-tool.c
|
||||||
|
|
||||||
|
gpg_pair_tool_CFLAGS = $(GPG_ERROR_CFLAGS) $(INCICONV)
|
||||||
|
gpg_pair_tool_LDADD = $(libcommon) \
|
||||||
|
$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
|
||||||
|
$(LIBINTL) $(LIBICONV)
|
||||||
|
|
||||||
|
|
||||||
# Make sure that all libs are build before we use them. This is
|
# Make sure that all libs are build before we use them. This is
|
||||||
# important for things like make -j2.
|
# important for things like make -j2.
|
||||||
|
2020
tools/gpg-pair-tool.c
Normal file
2020
tools/gpg-pair-tool.c
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user