diff options
Diffstat (limited to '')
| -rw-r--r-- | agent/ChangeLog | 4 | ||||
| -rw-r--r-- | agent/Makefile.am | 6 | ||||
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/Makefile.am | 6 | ||||
| -rw-r--r-- | tools/ChangeLog | 4 | ||||
| -rw-r--r-- | tools/Makefile.am | 7 |
6 files changed, 23 insertions, 8 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index ddee4e5c6..2a14bda64 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,7 @@ +2006-12-07 David Shaw <[email protected]> + + * Makefile.am: Link to iconv for jnlib dependency. + 2006-11-20 Werner Koch <[email protected]> * call-pinentry.c (agent_popup_message_stop): Use SIGKILL. diff --git a/agent/Makefile.am b/agent/Makefile.am index d8c56175f..6ec0068ca 100644 --- a/agent/Makefile.am +++ b/agent/Makefile.am @@ -53,7 +53,7 @@ pwquery_libs = ../common/libsimple-pwquery.a gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS) gpg_agent_LDADD = $(commonpth_libs) \ $(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \ - $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) + $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) gpg_protect_tool_SOURCES = \ protect-tool.c \ @@ -62,14 +62,14 @@ gpg_protect_tool_SOURCES = \ # Needs $(NETLIBS) for libsimple-pwquery.la. gpg_protect_tool_LDADD = $(pwquery_libs) $(common_libs) \ - $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) + $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) gpg_preset_passphrase_SOURCES = \ preset-passphrase.c # Needs $(NETLIBS) for libsimple-pwquery.la. gpg_preset_passphrase_LDADD = $(pwquery_libs) $(common_libs) \ - $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) + $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) # Make sure that all libs are build before we use them. This is diff --git a/g10/ChangeLog b/g10/ChangeLog index ed5b39947..4bc6b630d 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +2006-12-07 David Shaw <[email protected]> + + * Makefile.am: Link to iconv for jnlib dependency. + 2006-12-05 Werner Koch <[email protected]> * passphrase.c (passphrase_to_dek): Handle a Cancel request diff --git a/g10/Makefile.am b/g10/Makefile.am index a38e03bab..c3e5432e3 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -118,8 +118,10 @@ gpgv2_SOURCES = gpgv.c \ LDADD = $(needed_libs) ../common/libgpgrl.a \ $(ZLIBS) $(DNSLIBS) $(LIBREADLINE) \ $(LIBINTL) $(CAPLIBS) $(NETLIBS) -gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) -gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) +gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ + $(LIBICONV) +gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ + $(LIBICONV) $(PROGRAMS): $(needed_libs) ../common/libgpgrl.a diff --git a/tools/ChangeLog b/tools/ChangeLog index 1e695711d..ef51ad743 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,7 @@ +2006-12-07 David Shaw <[email protected]> + + * Makefile.am: Link to iconv for jnlib dependency. + 2006-11-23 Werner Koch <[email protected]> * Makefile.am (gpg_connect_agent_LDADD): Add NETLIBS. diff --git a/tools/Makefile.am b/tools/Makefile.am index 5e72f64cd..be492c056 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -54,13 +54,14 @@ noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit common_libs = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a pwquery_libs = ../common/libsimple-pwquery.a -gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(ZLIBS) +gpgsplit_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ + $(ZLIBS) $(LIBICONV) gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c # jnlib/common sucks in gpg-error, will they, nil they (some compilers # do not eliminate the supposed-to-be-unused-inline-functions). -gpgconf_LDADD = $(common_libs) $(LIBINTL) $(GPG_ERROR_LIBS) +gpgconf_LDADD = $(common_libs) $(LIBINTL) $(GPG_ERROR_LIBS) $(LIBICONV) gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h gpgparsemail_LDADD = @@ -74,7 +75,7 @@ watchgnupg_LDADD = $(NETLIBS) gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c gpg_connect_agent_LDADD = $(common_libs) $(LIBASSUAN_LIBS) \ - $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) + $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) gpgkey2ssh_SOURCES = gpgkey2ssh.c gpgkey2ssh_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) |