summaryrefslogtreecommitdiffstats
path: root/dirmngr/Makefile.am
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2016-09-27 07:21:08 +0200
committerNIIBE Yutaka <gniibe@fsij.org>2016-09-27 07:21:08 +0200
commit836b72363168cbb0051fc2356f61788468db211c (patch)
tree1e4b7b319cf43ff260b103652540d92ed0f0e0de /dirmngr/Makefile.am
parentagent: Allow only specific digest size for ECDSA. (diff)
downloadgnupg2-836b72363168cbb0051fc2356f61788468db211c.tar.xz
gnupg2-836b72363168cbb0051fc2356f61788468db211c.zip
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: 49829c29e541546084950b8a153067db371d101a
Diffstat (limited to '')
-rw-r--r--dirmngr/Makefile.am9
1 files changed, 1 insertions, 8 deletions
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index b7bc21d4a..5a2fd36b2 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -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) \