diff options
| author | Werner Koch <wk@gnupg.org> | 2016-06-08 09:17:49 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-06-08 09:17:49 +0200 |
| commit | 173fa97102fec68670a46ae1b460231e2a183c81 (patch) | |
| tree | 7c5bfd3bced479039c5dab32aec68fcd3d9398a4 /tools/Makefile.am | |
| parent | Do not try to remove the enclosing directory of sockets. (diff) | |
| download | gnupg2-173fa97102fec68670a46ae1b460231e2a183c81.tar.xz gnupg2-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 <wk@gnupg.org>
Diffstat (limited to 'tools/Makefile.am')
| -rw-r--r-- | tools/Makefile.am | 16 |
1 files changed, 8 insertions, 8 deletions
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) |