From df79db51f12e8bd94d572c9d8f5584d8c5dc20c9 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Thu, 10 Jul 2003 12:32:57 +0000 Subject: [PATCH] * Makefile.am: Use W32LIBS where appropriate. --- keyserver/ChangeLog | 4 ++++ keyserver/Makefile.am | 4 ++-- tools/ChangeLog | 4 ++++ tools/Makefile.am | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index a22618f25..dbbb7ea4a 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,7 @@ +2003-07-10 David Shaw + + * Makefile.am: Use W32LIBS where appropriate. + 2003-05-30 David Shaw * gpgkeys_hkp.c, gpgkeys_ldap.c: #include if it is diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am index c595e42c1..8dc41c946 100644 --- a/keyserver/Makefile.am +++ b/keyserver/Makefile.am @@ -27,5 +27,5 @@ libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ libexec_SCRIPTS = @GPGKEYS_MAILTO@ noinst_SCRIPTS = gpgkeys_test -gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ @GETOPT@ -gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ @INTLLIBS@ @CAPLIBS@ @GETOPT@ +gpgkeys_ldap_LDADD = @LDAPLIBS@ @NETLIBS@ @GETOPT@ @W32LIBS@ +gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ @INTLLIBS@ @CAPLIBS@ @GETOPT@ @W32LIBS@ diff --git a/tools/ChangeLog b/tools/ChangeLog index bd07525d6..94e3e6089 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,7 @@ +2003-07-10 David Shaw + + * Makefile.am: Use W32LIBS where appropriate. + 2003-05-30 David Shaw * Makefile.am: Some cleanup, and use DLLIBS for -ldl. diff --git a/tools/Makefile.am b/tools/Makefile.am index 69fc96bdb..387348f6e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -26,8 +26,8 @@ bin_PROGRAMS = gpgsplit noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest gpgsplit_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @ZLIBS@ -mpicalc_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ -bftest_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @DLLIBS@ @EGDLIBS@ +mpicalc_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @W32LIBS@ +bftest_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ @W32LIBS@ @DLLIBS@ @EGDLIBS@ shmtest_LDADD = $(needed_libs) @INTLLIBS@ @CAPLIBS@ gpgsplit mpicalc bftest shmtest: $(needed_libs)