gnupg (6 files)

[cvs user wk]

    Date: Thursday, October 28, 2004 @ 20:57:50
  Author: wk
    Path: /cvs/gnupg/gnupg

Modified: g10/ChangeLog g10/Makefile.am keyserver/ChangeLog
          keyserver/Makefile.am tools/ChangeLog tools/Makefile.am

Inlcude LIBICONV


-----------------------+
 g10/ChangeLog         |    5 +++++
 g10/Makefile.am       |    3 ++-
 keyserver/ChangeLog   |    9 +++++++++
 keyserver/Makefile.am |   10 ++++++----
 tools/ChangeLog       |    5 +++++
 tools/Makefile.am     |   11 ++++++-----
 6 files changed, 33 insertions(+), 10 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.633 gnupg/g10/ChangeLog:1.634
--- gnupg/g10/ChangeLog:1.633	Thu Oct 28 11:06:50 2004
+++ gnupg/g10/ChangeLog	Thu Oct 28 20:57:50 2004
@@ -1,5 +1,10 @@
 2004-10-28  Werner Koch  <wk at g10code.com>
 
+	* Makefile.am (other_libs): New.  Also include LIBICONV.  Noted by
+	Tim Mooney.
+
+2004-10-28  Werner Koch  <wk at g10code.com>
+
 	* apdu.c (open_pcsc_reader): Removed bad free in error handler.
 
 2004-10-27  David Shaw  <dshaw at jabberwocky.com>
Index: gnupg/g10/Makefile.am
diff -u gnupg/g10/Makefile.am:1.86 gnupg/g10/Makefile.am:1.87
--- gnupg/g10/Makefile.am:1.86	Tue Apr 27 10:23:45 2004
+++ gnupg/g10/Makefile.am	Thu Oct 28 20:57:50 2004
@@ -28,6 +28,7 @@
 AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""
 endif
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
+other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
 
 #noinst_PROGRAMS = gpgd
 bin_PROGRAMS = gpg gpgv
@@ -131,7 +132,7 @@
 #	       ks-db.h \
 #	       $(common_source)
 
-LDADD =  $(needed_libs) @LIBINTL@ @CAPLIBS@ @ZLIBS@ @W32LIBS@
+LDADD =  $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@
 gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB_LIBS@
 
 $(PROGRAMS): $(needed_libs)
Index: gnupg/keyserver/ChangeLog
diff -u gnupg/keyserver/ChangeLog:1.89 gnupg/keyserver/ChangeLog:1.90
--- gnupg/keyserver/ChangeLog:1.89	Mon Oct 18 17:53:28 2004
+++ gnupg/keyserver/ChangeLog	Thu Oct 28 20:57:50 2004
@@ -1,3 +1,12 @@
+2004-10-28  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (other_libs): New.  Also include LIBICONV.  Noted by
+	Tim Mooney.
+
+2004-10-28  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (other_libs): 
+
 2004-10-18  David Shaw  <dshaw at jabberwocky.com>
 
 	* gpgkeys_hkp.c (send_key, get_key, search_key): Use "hkp" instead
Index: gnupg/keyserver/Makefile.am
diff -u gnupg/keyserver/Makefile.am:1.18 gnupg/keyserver/Makefile.am:1.19
--- gnupg/keyserver/Makefile.am:1.18	Fri Oct 15 11:55:38 2004
+++ gnupg/keyserver/Makefile.am	Thu Oct 28 20:57:50 2004
@@ -32,10 +32,12 @@
 gpgkeys_http_SOURCES = gpgkeys_http.c ksutil.c ksutil.h
 gpgkeys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h
 
-gpgkeys_ldap_LDADD = ../util/libutil.a @LDAPLIBS@ @NETLIBS@ @LIBINTL@ @CAPLIBS@ @GETOPT@ @W32LIBS@
-gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ @LIBINTL@ @CAPLIBS@ @GETOPT@ @W32LIBS@
-gpgkeys_http_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ @LIBINTL@ @CAPLIBS@ @GETOPT@ @W32LIBS@
-gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ @LIBINTL@ @CAPLIBS@ @GETOPT@ @W32LIBS@
+other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
+
+gpgkeys_ldap_LDADD = ../util/libutil.a @LDAPLIBS@ @NETLIBS@  $(other_libs) @GETOPT@ @W32LIBS@
+gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@  $(other_libs) @GETOPT@ @W32LIBS@
+gpgkeys_http_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@  $(other_libs) @GETOPT@ @W32LIBS@
+gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
 
 install-exec-hook:
 if GPGKEYS_LDAP
Index: gnupg/tools/ChangeLog
diff -u gnupg/tools/ChangeLog:1.30 gnupg/tools/ChangeLog:1.31
--- gnupg/tools/ChangeLog:1.30	Fri Oct  1 12:18:30 2004
+++ gnupg/tools/ChangeLog	Thu Oct 28 20:57:50 2004
@@ -1,3 +1,8 @@
+2004-10-28  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (other_libs): New.  Also include LIBICONV.  Noted by
+	Tim Mooney.
+
 2004-10-01  Werner Koch  <wk at g10code.com>
 
 	* bftest.c (i18n_init): Always use LC_ALL.
Index: gnupg/tools/Makefile.am
diff -u gnupg/tools/Makefile.am:1.31 gnupg/tools/Makefile.am:1.32
--- gnupg/tools/Makefile.am:1.31	Sat Oct 25 18:28:08 2003
+++ gnupg/tools/Makefile.am	Thu Oct 28 20:57:50 2004
@@ -20,14 +20,15 @@
 
 EXTRA_DIST = lspgpot ring-a-party mail-signed-keys convert-from-106
 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
-needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
+needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a 
+other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
 
 bin_PROGRAMS    = gpgsplit
 noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest
 
-gpgsplit_LDADD  = $(needed_libs) @LIBINTL@ @CAPLIBS@ @ZLIBS@
-mpicalc_LDADD   = $(needed_libs) @LIBINTL@ @CAPLIBS@ @W32LIBS@
-bftest_LDADD    = $(needed_libs) @LIBINTL@ @CAPLIBS@ @W32LIBS@ @DLLIBS@ @NETLIBS@
-shmtest_LDADD   = $(needed_libs) @LIBINTL@ @CAPLIBS@
+gpgsplit_LDADD  = $(needed_libs) $(other_libs) @ZLIBS@
+mpicalc_LDADD   = $(needed_libs) $(other_libs) @W32LIBS@
+bftest_LDADD    = $(needed_libs) $(other_libs) @W32LIBS@ @DLLIBS@ @NETLIBS@
+shmtest_LDADD   = $(needed_libs) $(other_libs)
 
 gpgsplit mpicalc bftest shmtest: $(needed_libs)