diff options
author | Justus Winter <justus@g10code.com> | 2016-09-30 12:34:31 +0200 |
---|---|---|
committer | Justus Winter <justus@g10code.com> | 2016-09-30 17:45:59 +0200 |
commit | 6054e8aaecbd355bb7559697eecaadf2225189b8 (patch) | |
tree | 8dad3ead3f3f3b0043f1defc952b428414624016 /tools/Makefile.am | |
parent | agent: Enable restricted, browser, and ssh socket by default. (diff) | |
download | gnupg2-6054e8aaecbd355bb7559697eecaadf2225189b8.tar.xz gnupg2-6054e8aaecbd355bb7559697eecaadf2225189b8.zip |
build: Fix build against libiconv.
* agent/Makefile.am: Add INCICONV and LIBICONV.
* common/Makefile.am: Likewise.
* tools/Makefile.am: Likewise.
Signed-off-by: Justus Winter <justus@g10code.com>
Diffstat (limited to 'tools/Makefile.am')
-rw-r--r-- | tools/Makefile.am | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index b2a274f0a..42b023fbb 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -131,9 +131,10 @@ gpg_connect_agent_LDADD = ../common/libgpgrl.a $(common_libs) \ if !DISABLE_REGEX gpg_check_pattern_SOURCES = gpg-check-pattern.c -gpg_check_pattern_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) +gpg_check_pattern_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV) gpg_check_pattern_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ - $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) + $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) \ + $(LIBICONV) endif gpgtar_SOURCES = \ @@ -155,8 +156,9 @@ gpg_wks_server_SOURCES = \ mime-maker.c mime-maker.h \ send-mail.c send-mail.h -gpg_wks_server_CFLAGS = $(GPG_ERROR_CFLAGS) -gpg_wks_server_LDADD = $(libcommon) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) +gpg_wks_server_CFLAGS = $(GPG_ERROR_CFLAGS) $(INCICONV) +gpg_wks_server_LDADD = $(libcommon) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ + $(LIBICONV) gpg_wks_client_SOURCES = \ gpg-wks-client.c \ @@ -169,9 +171,10 @@ gpg_wks_client_SOURCES = \ send-mail.c send-mail.h \ call-dirmngr.c call-dirmngr.h -gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) +gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV) gpg_wks_client_LDADD = $(libcommon) \ - $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) + $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ + $(LIBICONV) # Make sure that all libs are build before we use them. This is |