diff options
| author | Werner Koch <[email protected]> | 2016-06-08 07:17:49 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-06-08 07:17:49 +0000 |
| commit | 173fa97102fec68670a46ae1b460231e2a183c81 (patch) | |
| tree | 7c5bfd3bced479039c5dab32aec68fcd3d9398a4 /dirmngr | |
| parent | Do not try to remove the enclosing directory of sockets. (diff) | |
| download | gnupg-173fa97102fec68670a46ae1b460231e2a183c81.tar.gz gnupg-173fa97102fec68670a46ae1b460231e2a183c81.zip | |
Do not use no-libgcrypt dummy for tools
* tools/Makefile.am (gpgconf_SOURCES): Remove no-libgcrypt.c.
(gpgconf_LDADD): Add LIBGCRYPT_LIBS.
(gpg_connect_agent_LDADD): Ditto.
(gpgtar_LDADD): Ditto.
* dirmngr/Makefile.am (dirmngr_client_LDADD): Ditto.
(t_common_ldadd): Ditto. Remove no-libgcrypt.o.
--
We need this change so that a future code in common/ can use Libgcrypt
functions; in particular hashing.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | dirmngr/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am index cbc00906c..aaa905089 100644 --- a/dirmngr/Makefile.am +++ b/dirmngr/Makefile.am @@ -99,18 +99,17 @@ dirmngr_ldap_LDADD = $(libcommon) no-libgcrypt.o \ endif dirmngr_client_SOURCES = dirmngr-client.c -dirmngr_client_LDADD = $(libcommon) no-libgcrypt.o \ - $(LIBASSUAN_LIBS) \ - $(GPG_ERROR_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV) +dirmngr_client_LDADD = $(libcommon) \ + $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ + $(LIBGCRYPT_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV) dirmngr_client_LDFLAGS = $(extra_bin_ldflags) - no-libgcrypt.c : $(top_srcdir)/tools/no-libgcrypt.c cat $(top_srcdir)/tools/no-libgcrypt.c > no-libgcrypt.c t_common_src = t-support.h -t_common_ldadd = $(libcommon) no-libgcrypt.o $(LIBASSUAN_LIBS) \ +t_common_ldadd = $(libcommon) $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \ $(GPG_ERROR_LIBS) $(NETLIBS) \ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) \ $(DNSLIBS) $(LIBINTL) $(LIBICONV) |