mirror of git://git.gnupg.org/gnupg.git
dirmngr: Removal of no-libgcrypt.o.
* dirmngr/Makefile.am (dirmngr_ldap_LDADD): Remove no-libgcrypt.o.
--
Thanks to Rainer Perske who located the issue.
GnuPG-bug-id: 2698
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This is a fix for the commit: 49829c29e5
This commit is contained in:
parent
98bc6f480a
commit
836b723631
|
@ -40,10 +40,6 @@ AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) $(LIBASSUAN_CFLAGS) \
|
|||
$(LIBGNUTLS_CFLAGS)
|
||||
|
||||
|
||||
BUILT_SOURCES = no-libgcrypt.c
|
||||
|
||||
CLEANFILES = no-libgcrypt.c
|
||||
|
||||
if HAVE_W32_SYSTEM
|
||||
ldap_url = ldap-url.h ldap-url.c
|
||||
else
|
||||
|
@ -93,7 +89,7 @@ if USE_LDAPWRAPPER
|
|||
dirmngr_ldap_SOURCES = dirmngr_ldap.c $(ldap_url)
|
||||
dirmngr_ldap_CFLAGS = $(GPG_ERROR_CFLAGS) $(LIBGCRYPT_CFLAGS)
|
||||
dirmngr_ldap_LDFLAGS =
|
||||
dirmngr_ldap_LDADD = $(libcommon) no-libgcrypt.o \
|
||||
dirmngr_ldap_LDADD = $(libcommon) \
|
||||
$(GPG_ERROR_LIBS) $(LIBGCRYPT_LIBS) $(LDAPLIBS) \
|
||||
$(LBER_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS)
|
||||
endif
|
||||
|
@ -104,9 +100,6 @@ dirmngr_client_LDADD = $(libcommon) \
|
|||
$(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) $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \
|
||||
|
|
Loading…
Reference in New Issue