diff --git a/tools/ChangeLog b/tools/ChangeLog index 39665526a..c62d7efe9 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,8 @@ +2002-04-23 David Shaw + + * Makefile.am: Do not list libraries in -lxxx format in a + dependency line. + 2002-01-02 Stefan Bellon * gpgsplit.c [__riscos__]: Added RISC OS specific file name diff --git a/tools/Makefile.am b/tools/Makefile.am index 793fc1b90..769e30c48 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -20,8 +20,7 @@ EXTRA_DIST = lspgpot ring-a-party mail-signed-keys INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl -needed_libs = ../cipher/libcipher.a \ - ../mpi/libmpi.a ../util/libutil.a @INTLLIBS@ +needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a bin_PROGRAMS = gpgsplit noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest @@ -37,14 +36,10 @@ shmtest_SOURCES = shmtest.c gpgsplit_SOURCES = gpgsplit.c -mpicalc_LDADD = $(needed_libs) -bftest_LDADD = $(needed_libs) +mpicalc_LDADD = $(needed_libs) @INTLLIBS@ +bftest_LDADD = $(needed_libs) @INTLLIBS@ -shmtest_LDADD = $(needed_libs) -gpgsplit_LDADD = @ZLIBS@ $(needed_libs) +shmtest_LDADD = $(needed_libs) @INTLLIBS@ +gpgsplit_LDADD = @ZLIBS@ $(needed_libs) @INTLLIBS@ mpicalc bftest shmtest gpgsplit: $(needed_libs) - - - -