mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
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 <wk@gnupg.org>
This commit is contained in:
parent
0faf895154
commit
173fa97102
2 changed files with 12 additions and 13 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue