diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ChangeLog | 5 | ||||
| -rw-r--r-- | tools/Makefile.am | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog index f8299725a..186ac9a40 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,8 @@ +2004-10-28 Werner Koch <[email protected]> + + * Makefile.am (other_libs): New. Also include LIBICONV. Noted by + Tim Mooney. + 2004-10-01 Werner Koch <[email protected]> * bftest.c (i18n_init): Always use LC_ALL. diff --git a/tools/Makefile.am b/tools/Makefile.am index e52d49d36..4cb7e74a4 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -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) |