From 173fa97102fec68670a46ae1b460231e2a183c81 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 8 Jun 2016 09:17:49 +0200 Subject: [PATCH] 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 --- dirmngr/Makefile.am | 9 ++++----- tools/Makefile.am | 16 ++++++++-------- 2 files changed, 12 insertions(+), 13 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) diff --git a/tools/Makefile.am b/tools/Makefile.am index 39c0f9c80..f9424fa74 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -91,12 +91,12 @@ gpgsplit_LDADD = $(common_libs) \ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ $(ZLIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) -gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c +gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c # common sucks in gpg-error, will they, nil they (some compilers # do not eliminate the supposed-to-be-unused-inline-functions). gpgconf_LDADD = $(maybe_commonpth_libs) $(opt_libassuan_libs) \ - $(LIBINTL) $(GPG_ERROR_LIBS) $(NETLIBS) \ + $(LIBINTL) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \ $(LIBICONV) $(W32SOCKLIBS) gpgconf_LDFLAGS = $(extra_bin_ldflags) @@ -111,10 +111,11 @@ symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \ watchgnupg_SOURCES = watchgnupg.c watchgnupg_LDADD = $(NETLIBS) -gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c -# FIXME: remove PTH_LIBS (why do we need them at all?) +gpg_connect_agent_SOURCES = gpg-connect-agent.c +# FIXME: remove NPTH_LIBS (why do we need them at all?) gpg_connect_agent_LDADD = ../common/libgpgrl.a $(common_libs) \ - $(LIBASSUAN_LIBS) $(NPTH_LIBS) $(GPG_ERROR_LIBS) \ + $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) \ + $(NPTH_LIBS) $(GPG_ERROR_LIBS) \ $(LIBREADLINE) $(LIBINTL) $(NETLIBS) $(LIBICONV) \ $(resource_objs) @@ -130,10 +131,9 @@ gpgtar_SOURCES = \ gpgtar.c gpgtar.h \ gpgtar-create.c \ gpgtar-extract.c \ - gpgtar-list.c \ - no-libgcrypt.c + gpgtar-list.c gpgtar_CFLAGS = $(GPG_ERROR_CFLAGS) -gpgtar_LDADD = $(libcommon) $(GPG_ERROR_LIBS) \ +gpgtar_LDADD = $(libcommon) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS)