diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/Makefile.am | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index f43a6384c..2dadee08f 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,10 @@ 2004-10-28 Werner Koch <[email protected]> + * Makefile.am (other_libs): New. Also include LIBICONV. Noted by + Tim Mooney. + +2004-10-28 Werner Koch <[email protected]> + * apdu.c (open_pcsc_reader): Removed bad free in error handler. 2004-10-27 David Shaw <[email protected]> diff --git a/g10/Makefile.am b/g10/Makefile.am index 2c5d82020..a3f2ff6e9 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -28,6 +28,7 @@ if ! HAVE_DOSISH_SYSTEM 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 @@ gpgv_SOURCES = gpgv.c \ # 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) |