diff --git a/bin/check/Makefile.in b/bin/check/Makefile.in
index f159f398ad..2a033ff6e4 100644
--- a/bin/check/Makefile.in
+++ b/bin/check/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.20 2002/02/20 03:32:48 marka Exp $
+# $Id: Makefile.in,v 1.21 2002/12/27 03:29:29 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -44,7 +44,7 @@ LIBS =		@LIBS@
 SUBDIRS =
 
 # Alphabetically
-TARGETS =	named-checkconf named-checkzone
+TARGETS =	named-checkconf@EXEEXT@ named-checkzone@EXEEXT@
 
 # Alphabetically
 SRCS =		named-checkconf.c named-checkzone.c check-tool.c
@@ -65,11 +65,11 @@ named-checkzone.@O@: named-checkzone.c
 	${LIBTOOL} ${CC} ${ALL_CFLAGS} -DVERSION=\"${VERSION}\" \
 		-c ${srcdir}/named-checkzone.c
 
-named-checkconf: named-checkconf.@O@ check-tool.@O@ ${ISCDEPLIBS} ${ISCCFGDEPLIBS} ${BIND9DEPLIBS}
+named-checkconf@EXEEXT@: named-checkconf.@O@ check-tool.@O@ ${ISCDEPLIBS} ${ISCCFGDEPLIBS} ${BIND9DEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ named-checkconf.@O@ \
 	check-tool.@O@ ${BIND9LIBS} ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} ${LIBS}
 
-named-checkzone: named-checkzone.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+named-checkzone@EXEEXT@: named-checkzone.@O@ check-tool.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ named-checkzone.@O@ \
 	check-tool.@O@ ${DNSLIBS} ${ISCLIBS} ${LIBS}
 
@@ -82,9 +82,9 @@ installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
-install:: named-checkconf named-checkzone installdirs
-	${LIBTOOL} ${INSTALL_PROGRAM} named-checkconf ${DESTDIR}${sbindir}
-	${LIBTOOL} ${INSTALL_PROGRAM} named-checkzone ${DESTDIR}${sbindir}
+install:: named-checkconf@EXEEXT@ named-checkzone@EXEEXT@ installdirs
+	${LIBTOOL} ${INSTALL_PROGRAM} named-checkconf@EXEEXT@ ${DESTDIR}${sbindir}
+	${LIBTOOL} ${INSTALL_PROGRAM} named-checkzone@EXEEXT@ ${DESTDIR}${sbindir}
 	for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done
 
 clean distclean::
diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index 959fcda8bf..c33ac74d50 100644
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.30 2002/08/13 01:59:31 marka Exp $
+# $Id: Makefile.in,v 1.31 2002/12/27 03:29:30 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -49,7 +49,7 @@ LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCLIBS} \
 
 SUBDIRS =
 
-TARGETS =	dig host nslookup
+TARGETS =	dig@EXEEXT@ host@EXEEXT@ nslookup@EXEEXT@
 
 OBJS =		dig.@O@ dighost.@O@ host.@O@ nslookup.@O@
 
@@ -65,13 +65,13 @@ MANOBJS =	${MANPAGES} ${HTMLPAGES}
 
 @BIND9_MAKE_RULES@
 
-dig: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
+dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ dig.@O@ dighost.@O@ ${UOBJS} ${LIBS}
 
-host: host.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
+host@EXEEXT@: host.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ host.@O@ dighost.@O@ ${UOBJS} ${LIBS}
 
-nslookup: nslookup.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
+nslookup@EXEEXT@: nslookup.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ nslookup.@O@ dighost.@O@ ${UOBJS} ${LIBS}
 
 doc man:: ${MANOBJS}
@@ -86,8 +86,8 @@ installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man1
 
-install:: dig host nslookup installdirs
-	${LIBTOOL} ${INSTALL_PROGRAM} dig ${DESTDIR}${bindir}
-	${LIBTOOL} ${INSTALL_PROGRAM} host ${DESTDIR}${bindir}
-	${LIBTOOL} ${INSTALL_PROGRAM} nslookup ${DESTDIR}${bindir}
+install:: dig@EXEEXT@ host@EXEEXT@ nslookup@EXEEXT@ installdirs
+	${LIBTOOL} ${INSTALL_PROGRAM} dig@EXEEXT@ ${DESTDIR}${bindir}
+	${LIBTOOL} ${INSTALL_PROGRAM} host@EXEEXT@ ${DESTDIR}${bindir}
+	${LIBTOOL} ${INSTALL_PROGRAM} nslookup@EXEEXT@ ${DESTDIR}${bindir}
 	for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man1; done
diff --git a/bin/dnssec/Makefile.in b/bin/dnssec/Makefile.in
index 2234d99e10..26bd016bba 100644
--- a/bin/dnssec/Makefile.in
+++ b/bin/dnssec/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.23 2002/12/03 05:01:34 marka Exp $
+# $Id: Makefile.in,v 1.24 2002/12/27 03:29:30 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -39,7 +39,7 @@ DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}
 LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
 
 # Alphabetically
-TARGETS =	dnssec-keygen dnssec-signzone
+TARGETS =	dnssec-keygen@EXEEXT@ dnssec-signzone@EXEEXT@
 
 OBJS =		dnssectool.@O@
 
@@ -53,13 +53,13 @@ MANOBJS =	${MANPAGES} ${HTMLPAGES}
 
 @BIND9_MAKE_RULES@
 
-dnssec-keygen: dnssec-keygen.@O@ ${OBJS} ${DEPLIBS}
+dnssec-keygen@EXEEXT@: dnssec-keygen.@O@ ${OBJS} ${DEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ dnssec-keygen.@O@ ${OBJS} ${LIBS}
 
 dnssec-signzone.@O@: dnssec-signzone.c
 	${LIBTOOL} ${PURIFY} ${CC} ${ALL_CFLAGS} -c $<
 
-dnssec-signzone: dnssec-signzone.@O@ ${OBJS} ${DEPLIBS}
+dnssec-signzone@EXEEXT@: dnssec-signzone.@O@ ${OBJS} ${DEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ dnssec-signzone.@O@ ${OBJS} ${LIBS}
 
 doc man:: ${MANOBJS}
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 039c5e7f72..a0e2fae6da 100644
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.77 2001/11/20 01:14:55 gson Exp $
+# $Id: Makefile.in,v 1.78 2002/12/27 03:29:30 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -61,7 +61,7 @@ LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} \
 
 SUBDIRS =	unix
 
-TARGETS =	named lwresd
+TARGETS =	named@EXEEXT@ lwresd@EXEEXT@
 
 OBJS =		aclconf.@O@ builtin.@O@ client.@O@ config.@O@ control.@O@ \
 		controlconf.@O@ interfacemgr.@O@ \
@@ -103,12 +103,12 @@ config.@O@: config.c
 		-DNS_LOCALSTATEDIR=\"${localstatedir}\" \
 		-c ${srcdir}/config.c
 
-named: ${OBJS} ${UOBJS} ${DEPLIBS}
+named@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ ${OBJS} ${UOBJS} ${LIBS}
 
-lwresd: named
-	rm -f lwresd
-	@LN@ named lwresd
+lwresd@EXEEXT@: named@EXEEXT@
+	rm -f lwresd@EXEEXT@
+	@LN@ named@EXEEXT@ lwresd@EXEEXT@
 
 doc man:: ${MANOBJS}
 
@@ -122,7 +122,7 @@ installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
-install:: named lwresd installdirs
-	${LIBTOOL} ${INSTALL_PROGRAM} named ${DESTDIR}${sbindir}
-	(cd ${DESTDIR}${sbindir}; rm -f lwresd; @LN@ named lwresd)
+install:: named@EXEEXT@ lwresd@EXEEXT@ installdirs
+	${LIBTOOL} ${INSTALL_PROGRAM} named@EXEEXT@ ${DESTDIR}${sbindir}
+	(cd ${DESTDIR}${sbindir}; rm -f lwresd@EXEEXT@; @LN@ named@EXEEXT@ lwresd@EXEEXT@)
 	for m in ${MANPAGES}; do ${INSTALL_DATA} ${srcdir}/$$m ${DESTDIR}${mandir}/man8; done
diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index bf57287229..87ce42cafb 100644
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.19 2001/11/21 02:19:01 gson Exp $
+# $Id: Makefile.in,v 1.20 2002/12/27 03:29:31 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -47,7 +47,7 @@ LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCLIBS} ${ISCCFGLIBS} @LIBS@
 
 SUBDIRS =
 
-TARGETS =	nsupdate
+TARGETS =	nsupdate@EXEEXT@
 
 OBJS =		nsupdate.@O@
 
@@ -63,7 +63,7 @@ MANOBJS =	${MANPAGES} ${HTMLPAGES}
 
 @BIND9_MAKE_RULES@
 
-nsupdate: nsupdate.@O@ ${UOBJS} ${DEPLIBS}
+nsupdate@EXEEXT@: nsupdate.@O@ ${UOBJS} ${DEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ nsupdate.@O@ ${UOBJS} ${LIBS}
 
 doc man:: ${MANOBJS}
@@ -78,6 +78,6 @@ installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${bindir}
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 
-install:: nsupdate installdirs
-	${LIBTOOL} ${INSTALL_PROGRAM} nsupdate ${DESTDIR}${bindir}
+install:: nsupdate@EXEEXT@ installdirs
+	${LIBTOOL} ${INSTALL_PROGRAM} nsupdate@EXEEXT@ ${DESTDIR}${bindir}
 	${INSTALL_DATA} ${srcdir}/nsupdate.8 ${DESTDIR}${mandir}/man8
diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index c6eebd8411..c8a2c03e98 100644
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.37 2001/11/21 02:19:02 gson Exp $
+# $Id: Makefile.in,v 1.38 2002/12/27 03:29:31 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -49,7 +49,7 @@ CONFDEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}
 
 SUBDIRS =	unix
 
-TARGETS =	rndc rndc-confgen
+TARGETS =	rndc@EXEEXT@ rndc-confgen@EXEEXT@
 
 MANPAGES =	rndc.8 rndc-confgen.8 rndc.conf.5
 
@@ -73,11 +73,11 @@ rndc-confgen.@O@: rndc-confgen.c
 		-DRNDC_KEYFILE=\"${sysconfdir}/rndc.key\" \
 		-c ${srcdir}/rndc-confgen.c
 
-rndc: rndc.@O@ util.@O@ ${RNDCDEPLIBS}
+rndc@EXEEXT@: rndc.@O@ util.@O@ ${RNDCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ rndc.@O@ util.@O@ \
 		${RNDCLIBS}
 
-rndc-confgen: rndc-confgen.@O@ util.@O@ ${UOBJS} ${CONFDEPLIBS} 
+rndc-confgen@EXEEXT@: rndc-confgen.@O@ util.@O@ ${UOBJS} ${CONFDEPLIBS} 
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ rndc-confgen.@O@ util.@O@ \
 		${UOBJS} ${CONFLIBS}
 
@@ -91,9 +91,9 @@ installdirs:
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man5
 
-install:: rndc installdirs
-	${LIBTOOL} ${INSTALL_PROGRAM} rndc ${DESTDIR}${sbindir}
-	${LIBTOOL} ${INSTALL_PROGRAM} rndc-confgen ${DESTDIR}${sbindir}
+install:: rndc@EXEEXT@ rndc-confgen@EXEEXT@ installdirs
+	${LIBTOOL} ${INSTALL_PROGRAM} rndc@EXEEXT@ ${DESTDIR}${sbindir}
+	${LIBTOOL} ${INSTALL_PROGRAM} rndc-confgen@EXEEXT@ ${DESTDIR}${sbindir}
 	${INSTALL_DATA} ${srcdir}/rndc.8 ${DESTDIR}${mandir}/man8
 	${INSTALL_DATA} ${srcdir}/rndc-confgen.8 ${DESTDIR}${mandir}/man8
 	${INSTALL_DATA} ${srcdir}/rndc.conf.5 ${DESTDIR}${mandir}/man5
diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in
index 12296f633c..5ff6936876 100644
--- a/bin/tests/Makefile.in
+++ b/bin/tests/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.116 2001/11/06 20:05:05 bwelling Exp $
+# $Id: Makefile.in,v 1.117 2002/12/27 03:29:32 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -46,48 +46,48 @@ SUBDIRS = db dst master mem names net rbt sockaddr tasks timers system
 # genrandom is needed by the system tests
 
 # Alphabetically
-TARGETS =	cfg_test \
-		genrandom
+TARGETS =	cfg_test@EXEEXT@ \
+		genrandom@EXEEXT@
 
 # All the other tests are optional and not built by default.
 
 # Alphabetically
-XTARGETS =	adb_test \
-		byaddr_test \
-		byname_test \
-		compress_test \
-		db_test \
-		entropy_test \
-		entropy2_test \
-		gxba_test \
-		gxbn_test \
-		hash_test \
-		fsaccess_test \
-		inter_test \
-		journalprint \
-		keyboard_test \
-		lex_test \
-		lfsr_test \
-		log_test \
-		lwres_test \
-		lwresconf_test \
-		master_test \
-		mempool_test \
-		name_test \
-		nxtify \
-		ratelimiter_test \
-		rbt_test \
-		rdata_test \
-		rwlock_test \
-		serial_test \
-		shutdown_test \
-		sig0_test \
-		sock_test \
-		sym_test \
-		task_test \
-		timer_test \
-		wire_test \
-		zone_test
+XTARGETS =	adb_test@EXEEXT@ \
+		byaddr_test@EXEEXT@ \
+		byname_test@EXEEXT@ \
+		compress_test@EXEEXT@ \
+		db_test@EXEEXT@ \
+		entropy_test@EXEEXT@ \
+		entropy2_test@EXEEXT@ \
+		gxba_test@EXEEXT@ \
+		gxbn_test@EXEEXT@ \
+		hash_test@EXEEXT@ \
+		fsaccess_test@EXEEXT@ \
+		inter_test@EXEEXT@ \
+		journalprint@EXEEXT@ \
+		keyboard_test@EXEEXT@ \
+		lex_test@EXEEXT@ \
+		lfsr_test@EXEEXT@ \
+		log_test@EXEEXT@ \
+		lwres_test@EXEEXT@ \
+		lwresconf_test@EXEEXT@ \
+		master_test@EXEEXT@ \
+		mempool_test@EXEEXT@ \
+		name_test@EXEEXT@ \
+		nxtify@EXEEXT@ \
+		ratelimiter_test@EXEEXT@ \
+		rbt_test@EXEEXT@ \
+		rdata_test@EXEEXT@ \
+		rwlock_test@EXEEXT@ \
+		serial_test@EXEEXT@ \
+		shutdown_test@EXEEXT@ \
+		sig0_test@EXEEXT@ \
+		sock_test@EXEEXT@ \
+		sym_test@EXEEXT@ \
+		task_test@EXEEXT@ \
+		timer_test@EXEEXT@ \
+		wire_test@EXEEXT@ \
+		zone_test@EXEEXT@
 
 # Alphabetically
 SRCS =		adb_test.c \
@@ -132,154 +132,154 @@ SRCS =		adb_test.c \
 
 all_tests: ${XTARGETS}
 
-genrandom: genrandom.@O@
+genrandom@EXEEXT@: genrandom.@O@
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ genrandom.@O@
 
-adb_test: adb_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+adb_test@EXEEXT@: adb_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ adb_test.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-nxtify: nxtify.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+nxtify@EXEEXT@: nxtify.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ nxtify.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-byaddr_test: byaddr_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+byaddr_test@EXEEXT@: byaddr_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ byaddr_test.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-byname_test: byname_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+byname_test@EXEEXT@: byname_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ byname_test.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-lex_test: lex_test.@O@ ${ISCDEPLIBS}
+lex_test@EXEEXT@: lex_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ lex_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-lfsr_test: lfsr_test.@O@ ${ISCDEPLIBS}
+lfsr_test@EXEEXT@: lfsr_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ lfsr_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-log_test: log_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+log_test@EXEEXT@: log_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ log_test.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-name_test: name_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+name_test@EXEEXT@: name_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ name_test.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-hash_test: hash_test.@O@ ${ISCDEPLIBS}
+hash_test@EXEEXT@: hash_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ hash_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-entropy_test: entropy_test.@O@ ${ISCDEPLIBS}
+entropy_test@EXEEXT@: entropy_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ entropy_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-entropy2_test: entropy2_test.@O@ ${ISCDEPLIBS}
+entropy2_test@EXEEXT@: entropy2_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ entropy2_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-sock_test: sock_test.@O@ ${ISCDEPLIBS}
+sock_test@EXEEXT@: sock_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ sock_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-sym_test: sym_test.@O@ ${ISCDEPLIBS}
+sym_test@EXEEXT@: sym_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ sym_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-task_test: task_test.@O@ ${ISCDEPLIBS}
+task_test@EXEEXT@: task_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ task_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-shutdown_test: shutdown_test.@O@ ${ISCDEPLIBS}
+shutdown_test@EXEEXT@: shutdown_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ shutdown_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-timer_test: timer_test.@O@ ${ISCDEPLIBS}
+timer_test@EXEEXT@: timer_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ timer_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-ratelimiter_test: ratelimiter_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+ratelimiter_test@EXEEXT@: ratelimiter_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ ratelimiter_test.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-rbt_test: rbt_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+rbt_test@EXEEXT@: rbt_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ rbt_test.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-rdata_test: rdata_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+rdata_test@EXEEXT@: rdata_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ rdata_test.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-rwlock_test: rwlock_test.@O@ ${ISCDEPLIBS}
+rwlock_test@EXEEXT@: rwlock_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ rwlock_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-wire_test: wire_test.@O@ printmsg.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+wire_test@EXEEXT@: wire_test.@O@ printmsg.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ wire_test.@O@ printmsg.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-master_test: master_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+master_test@EXEEXT@: master_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ master_test.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-db_test: db_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+db_test@EXEEXT@: db_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ db_test.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-compress_test: compress_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+compress_test@EXEEXT@: compress_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ compress_test.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-mempool_test: mempool_test.@O@ ${ISCDEPLIBS}
+mempool_test@EXEEXT@: mempool_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ mempool_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-serial_test: serial_test.@O@ ${ISCDEPLIBS}
+serial_test@EXEEXT@: serial_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ serial_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-zone_test: zone_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+zone_test@EXEEXT@: zone_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ zone_test.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-fsaccess_test: fsaccess_test.@O@ ${ISCDEPLIBS}
+fsaccess_test@EXEEXT@: fsaccess_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ fsaccess_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-inter_test: inter_test.@O@ ${ISCDEPLIBS}
+inter_test@EXEEXT@: inter_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ inter_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-keyboard_test: keyboard_test.@O@ ${ISCDEPLIBS}
+keyboard_test@EXEEXT@: keyboard_test.@O@ ${ISCDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ keyboard_test.@O@ \
 		${ISCLIBS} ${LIBS}
 
-lwresconf_test: lwresconf_test.@O@ ${ISCDEPLIBS} ${LWRESDEPLIBS}
+lwresconf_test@EXEEXT@: lwresconf_test.@O@ ${ISCDEPLIBS} ${LWRESDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ lwresconf_test.@O@ \
 		${LWRESLIBS} ${ISCLIBS} ${LIBS}
 
-lwres_test: lwres_test.@O@ ${ISCDEPLIBS} ${LWRESDEPLIBS}
+lwres_test@EXEEXT@: lwres_test.@O@ ${ISCDEPLIBS} ${LWRESDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ lwres_test.@O@ \
 		${LWRESLIBS} ${ISCLIBS} ${LIBS}
 
-gxbn_test: gxbn_test.@O@ ${LWRESDEPLIBS}
+gxbn_test@EXEEXT@: gxbn_test.@O@ ${LWRESDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ gxbn_test.@O@ \
 		${LWRESLIBS} ${ISCLIBS} ${LIBS}
 
-gxba_test: gxba_test.@O@ ${LWRESDEPLIBS}
+gxba_test@EXEEXT@: gxba_test.@O@ ${LWRESDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ gxba_test.@O@ \
 		${LWRESLIBS} ${ISCLIBS} ${LIBS}
 
-sig0_test: sig0_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+sig0_test@EXEEXT@: sig0_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ sig0_test.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-journalprint: journalprint.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+journalprint@EXEEXT@: journalprint.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ journalprint.@O@ \
 		${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-cfg_test: cfg_test.@O@ ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
+cfg_test@EXEEXT@: cfg_test.@O@ ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
 	${LIBTOOL} ${CC} ${CFLAGS} -o $@ cfg_test.@O@ \
 		${ISCCFGLIBS} ${ISCLIBS} ${LIBS}
 
diff --git a/bin/tests/db/Makefile.in b/bin/tests/db/Makefile.in
index b984a2fb10..b88224220f 100644
--- a/bin/tests/db/Makefile.in
+++ b/bin/tests/db/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.23 2001/11/06 20:05:06 bwelling Exp $
+# $Id: Makefile.in,v 1.24 2002/12/27 03:29:32 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -40,15 +40,15 @@ TLIB =		../../../lib/tests/libt_api.@A@
 
 SRCS =		t_db.c
 
-TARGETS =	t_db
+TARGETS =	t_db@EXEEXT@
 
 @BIND9_MAKE_RULES@
 
-t_db: t_db.@O@ ${DEPLIBS} ${TLIB}
+t_db@EXEEXT@: t_db.@O@ ${DEPLIBS} ${TLIB}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ t_db.@O@ ${TLIB} ${LIBS}
 
-test: t_db
-	-@./t_db -c @top_srcdir@/t_config -b @srcdir@ -a
+test: t_db@EXEEXT@
+	-@./t_db@EXEEXT@ -c @top_srcdir@/t_config -b @srcdir@ -a
 
 testhelp:
 	@./t_db -h
diff --git a/bin/tests/dst/Makefile.in b/bin/tests/dst/Makefile.in
index 35347d137e..01c2db73c2 100644
--- a/bin/tests/dst/Makefile.in
+++ b/bin/tests/dst/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.32 2001/11/06 20:05:07 bwelling Exp $
+# $Id: Makefile.in,v 1.33 2002/12/27 03:29:32 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -38,21 +38,21 @@ LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@
 
-TARGETS =	dst_test t_dst
+TARGETS =	dst_test@EXEEXT@ t_dst@EXEEXT@
 
 SRCS =		dst_test.c t_dst.c
 
 @BIND9_MAKE_RULES@
 
-dst_test: dst_test.@O@ ${DEPLIBS}
+dst_test@EXEEXT@: dst_test.@O@ ${DEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ dst_test.@O@ ${LIBS}
 
-t_dst: t_dst.@O@ ${DEPLIBS} ${TLIB}
+t_dst@EXEEXT@: t_dst.@O@ ${DEPLIBS} ${TLIB}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ t_dst.@O@  ${TLIB} ${LIBS}
 
-test: t_dst
-	../genrandom 100 randomfile
-	-@ ./t_dst -b @srcdir@ -q 1800 -a
+test: t_dst@EXEEXT@
+	../genrandom@EXEEXT@ 100 randomfile
+	-@ ./t_dst@EXEEXT@ -b @srcdir@ -q 1800 -a
 
 clean distclean::
 	rm -f ${TARGETS} randomfile
diff --git a/bin/tests/master/Makefile.in b/bin/tests/master/Makefile.in
index d76fb57e78..c0b257a25f 100644
--- a/bin/tests/master/Makefile.in
+++ b/bin/tests/master/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.22 2001/11/06 20:05:09 bwelling Exp $
+# $Id: Makefile.in,v 1.23 2002/12/27 03:29:33 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -39,20 +39,20 @@ LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@
 
-TARGETS =	t_master
+TARGETS =	t_master@EXEEXT@
 
 SRCS =		t_master.c
 
 @BIND9_MAKE_RULES@
 
-t_master: t_master.@O@ ${DEPLIBS} ${TLIB}
+t_master@EXEEXT@: t_master.@O@ ${DEPLIBS} ${TLIB}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ t_master.@O@ ${TLIB} ${LIBS}
 
-test: t_master
-	-@ ./t_master -c @top_srcdir@/t_config -b @srcdir@ -a
+test: t_master@EXEEXT@
+	-@ ./t_master@EXEEXT@ -c @top_srcdir@/t_config -b @srcdir@ -a
 
 testhelp:
-	@ ./t_master -h
+	@ ./t_master@EXEEXT@ -h
 
 clean distclean::
 	rm -f ${TARGETS}
diff --git a/bin/tests/mem/Makefile.in b/bin/tests/mem/Makefile.in
index 6a3563b7fe..c5ab19723b 100644
--- a/bin/tests/mem/Makefile.in
+++ b/bin/tests/mem/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.26 2001/09/20 15:16:37 marka Exp $
+# $Id: Makefile.in,v 1.27 2002/12/27 03:29:33 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -36,20 +36,20 @@ DEPLIBS =	${TAPIDEPLIBS} ${ISCDEPLIBS}
 
 LIBS =		${TAPILIBS} ${ISCLIBS} @LIBS@
 
-TARGETS =	t_mem
+TARGETS =	t_mem@EXEEXT@
 
 SRCS =		t_mem.c
 
 @BIND9_MAKE_RULES@
 
-t_mem: t_mem.@O@ ${DEPLIBS}
+t_mem@EXEEXT@: t_mem.@O@ ${DEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ t_mem.@O@ ${LIBS}
 
-test: t_mem
-	-@./t_mem -b @srcdir@ -q 300 -a
+test: t_mem@EXEEXT@
+	-@./t_mem@EXEEXT@ -b @srcdir@ -q 300 -a
 
 testhelp:
-	@./t_mem -h
+	@./t_mem@EXEEXT@ -h
 
 clean distclean::
 	rm -f ${TARGETS}
diff --git a/bin/tests/names/Makefile.in b/bin/tests/names/Makefile.in
index 1a30c0483b..5d6abbf916 100644
--- a/bin/tests/names/Makefile.in
+++ b/bin/tests/names/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.22 2001/11/06 20:05:10 bwelling Exp $
+# $Id: Makefile.in,v 1.23 2002/12/27 03:29:33 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -39,20 +39,20 @@ LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@
 
-TARGETS =	t_names
+TARGETS =	t_names@EXEEXT@
 
 SRCS =		t_names.c
 
 @BIND9_MAKE_RULES@
 
-t_names: t_names.@O@ ${DEPLIBS} ${TLIB}
+t_names@EXEEXT@: t_names.@O@ ${DEPLIBS} ${TLIB}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ t_names.@O@ ${TLIB} ${LIBS}
 
-test: t_names
-	-@./t_names -c @top_srcdir@/t_config -b @srcdir@ -a
+test: t_names@EXEEXT@
+	-@./t_names@EXEEXT@ -c @top_srcdir@/t_config -b @srcdir@ -a
 
 testhelp:
-	@./t_names -h
+	@./t_names@EXEEXT@ -h
 
 clean distclean::
 	rm -f ${TARGETS}
diff --git a/bin/tests/net/Makefile.in b/bin/tests/net/Makefile.in
index 4864c8082e..9c727fcc18 100644
--- a/bin/tests/net/Makefile.in
+++ b/bin/tests/net/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.10 2001/09/20 15:16:40 marka Exp $
+# $Id: Makefile.in,v 1.11 2002/12/27 03:29:34 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -34,7 +34,7 @@ DEPLIBS =	${ISCDEPLIBS}
 
 LIBS =		${ISCLIBS} @LIBS@
 
-TARGETS =	t_net
+TARGETS =	t_net@EXEEXT@
 
 SRCS =		driver.c netaddr_multicast.c sockaddr_multicast.c
 
@@ -42,11 +42,11 @@ OBJS =		driver.@O@ netaddr_multicast.@O@ sockaddr_multicast.@O@
 
 @BIND9_MAKE_RULES@
 
-t_net: ${OBJS} ${DEPLIBS} ${TLIB}
+t_net@EXEEXT@: ${OBJS} ${DEPLIBS} ${TLIB}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ ${OBJS} ${TLIB} ${LIBS}
 
-test: t_net
-	-@./t_net
+test: t_net@EXEEXT@
+	-@./t_net@EXEEXT@
 
 clean distclean::
 	rm -f ${TARGETS}
diff --git a/bin/tests/rbt/Makefile.in b/bin/tests/rbt/Makefile.in
index dc0a0a6b98..19d3c7f538 100644
--- a/bin/tests/rbt/Makefile.in
+++ b/bin/tests/rbt/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.22 2001/11/06 20:05:11 bwelling Exp $
+# $Id: Makefile.in,v 1.23 2002/12/27 03:29:34 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -39,20 +39,20 @@ LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@
 
-TARGETS =	t_rbt
+TARGETS =	t_rbt@EXEEXT@
 
 SRCS =		t_rbt.c
 
 @BIND9_MAKE_RULES@
 
-t_rbt: t_rbt.@O@ ${DEPLIBS} ${TLIB}
+t_rbt@EXEEXT@: t_rbt.@O@ ${DEPLIBS} ${TLIB}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ t_rbt.@O@ ${TLIB} ${LIBS}
 
-test: t_rbt
-	-@./t_rbt -c @top_srcdir@/t_config -b @srcdir@ -a
+test: t_rbt@EXEEXT@
+	-@./t_rbt@EXEEXT@ -c @top_srcdir@/t_config -b @srcdir@ -a
 
 testhelp:
-	@./t_rbt -h
+	@./t_rbt@EXEEXT@ -h
 
 clean distclean::
 	rm -f ${TARGETS}
diff --git a/bin/tests/sockaddr/Makefile.in b/bin/tests/sockaddr/Makefile.in
index 4463ed9a02..014356e069 100644
--- a/bin/tests/sockaddr/Makefile.in
+++ b/bin/tests/sockaddr/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.15 2001/09/20 15:16:42 marka Exp $
+# $Id: Makefile.in,v 1.16 2002/12/27 03:29:34 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -36,20 +36,20 @@ DEPLIBS =	${TAPIDEPLIBS} ${ISCDEPLIBS}
 
 LIBS =		${TAPILIBS} ${ISCLIBS} @LIBS@
 
-TARGETS =	t_sockaddr
+TARGETS =	t_sockaddr@EXEEXT@
 
 SRCS =		t_sockaddr.c
 
 @BIND9_MAKE_RULES@
 
-t_sockaddr: t_sockaddr.@O@ ${DEPLIBS}
+t_sockaddr@EXEEXT@: t_sockaddr.@O@ ${DEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ t_sockaddr.@O@ ${LIBS}
 
-test: t_sockaddr
-	-@./t_sockaddr -b @srcdir@ -a
+test: t_sockaddr@EXEEXT@
+	-@./t_sockaddr@EXEEXT@ -b @srcdir@ -a
 
 testhelp:
-	@./t_sockaddr -h
+	@./t_sockaddr@EXEEXT@ -h
 
 clean distclean::
 	rm -f ${TARGETS}
diff --git a/bin/tests/system/lwresd/Makefile.in b/bin/tests/system/lwresd/Makefile.in
index affc8a1f65..b2c1a93f9e 100644
--- a/bin/tests/system/lwresd/Makefile.in
+++ b/bin/tests/system/lwresd/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.13 2001/09/20 15:16:45 marka Exp $
+# $Id: Makefile.in,v 1.14 2002/12/27 03:29:35 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -38,7 +38,7 @@ DEPLIBS =	${LWRESDEPLIBS} ${ISCDEPLIBS}
 
 LIBS =		${LWRESLIBS} ${ISCLIBS} @LIBS@
 
-TARGETS =	lwtest
+TARGETS =	lwtest@EXEEXT@
 
 OBJS =		lwtest.@O@
 
@@ -46,9 +46,9 @@ SRCS =		lwtest.c
 
 @BIND9_MAKE_RULES@
 
-all: lwtest
+all: lwtest@EXEEXT@
 
-lwtest: ${OBJS} ${DEPLIBS}
+lwtest@EXEEXT@: ${OBJS} ${DEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ ${OBJS} ${LIBS}
 
 clean distclean::
diff --git a/bin/tests/system/tkey/Makefile.in b/bin/tests/system/tkey/Makefile.in
index 7c63f0dcd4..ebab0d6fc1 100644
--- a/bin/tests/system/tkey/Makefile.in
+++ b/bin/tests/system/tkey/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.5 2001/11/06 20:05:13 bwelling Exp $
+# $Id: Makefile.in,v 1.6 2002/12/27 03:29:35 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -38,7 +38,7 @@ DEPLIBS =	${DNSDEPLIBS} ${ISCDEPLIBS}
 
 LIBS =		${DNSLIBS} ${ISCLIBS} @LIBS@
 
-TARGETS =	keycreate keydelete
+TARGETS =	keycreate@EXEEXT@ keydelete@EXEEXT@
 
 CREATEOBJS =	keycreate.@O@
 DELETEOBJS =	keydelete.@O@
@@ -47,12 +47,12 @@ SRCS =		keycreate.c keydelete.c
 
 @BIND9_MAKE_RULES@
 
-all: keycreate keydelete
+all: keycreate@EXEEXT@ keydelete@EXEEXT@
 
-keycreate: ${CREATEOBJS} ${DEPLIBS}
+keycreate@EXEEXT@: ${CREATEOBJS} ${DEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ ${CREATEOBJS} ${LIBS}
 
-keydelete: ${DELETEOBJS} ${DEPLIBS}
+keydelete@EXEEXT@: ${DELETEOBJS} ${DEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ ${DELETEOBJS} ${LIBS}
 
 clean distclean::
diff --git a/bin/tests/tasks/Makefile.in b/bin/tests/tasks/Makefile.in
index 9154b87c98..9aba3395d9 100644
--- a/bin/tests/tasks/Makefile.in
+++ b/bin/tests/tasks/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.24 2001/09/20 15:16:48 marka Exp $
+# $Id: Makefile.in,v 1.25 2002/12/27 03:29:36 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -36,20 +36,20 @@ DEPLIBS =	${TAPIDEPLIBS} ${ISCDEPLIBS}
 
 LIBS =		${TAPILIBS} ${ISCLIBS} @LIBS@
 
-TARGETS =	t_tasks
+TARGETS =	t_tasks@EXEEXT@
 
 SRCS =		t_tasks.c
 
 @BIND9_MAKE_RULES@
 
-t_tasks: t_tasks.@O@ ${DEPLIBS}
+t_tasks@EXEEXT@: t_tasks.@O@ ${DEPLIBS}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ t_tasks.@O@ ${LIBS}
 
-test: t_tasks
-	-@./t_tasks -c @top_srcdir@/t_config -b @srcdir@ -a
+test: t_tasks@EXEEXT@
+	-@./t_tasks@EXEEXT@ -c @top_srcdir@/t_config -b @srcdir@ -a
 
 testhelp:
-	@./t_tasks -h
+	@./t_tasks@EXEEXT@ -h
 
 clean distclean::
 	rm -f ${TARGETS}
diff --git a/bin/tests/timers/Makefile.in b/bin/tests/timers/Makefile.in
index 09ed2ab83b..8fe8e68078 100644
--- a/bin/tests/timers/Makefile.in
+++ b/bin/tests/timers/Makefile.in
@@ -13,7 +13,7 @@
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.22 2001/09/20 15:16:49 marka Exp $
+# $Id: Makefile.in,v 1.23 2002/12/27 03:29:37 marka Exp $
 
 srcdir =	@srcdir@
 VPATH =		@srcdir@
@@ -36,20 +36,20 @@ LIBS =		${ISCLIBS} @LIBS@
 
 TLIB =		../../../lib/tests/libt_api.@A@
 
-TARGETS =	t_timers
+TARGETS =	t_timers@EXEEXT@
 
 SRCS =		t_timers.c
 
 @BIND9_MAKE_RULES@
 
-t_timers: t_timers.@O@ ${DEPLIBS} ${TLIB}
+t_timers@EXEEXT@: t_timers.@O@ ${DEPLIBS} ${TLIB}
 	${LIBTOOL} ${PURIFY} ${CC} ${CFLAGS} -o $@ t_timers.@O@ ${TLIB} ${LIBS}
 
-test: t_timers
-	-@./t_timers -c @top_srcdir@/t_config -b @srcdir@ -q 60 -a
+test: t_timers@EXEEXT@
+	-@./t_timers@EXEEXT@ -c @top_srcdir@/t_config -b @srcdir@ -q 60 -a
 
 testhelp:
-	@./t_timers -h
+	@./t_timers@EXEEXT@ -h
 
 clean distclean::
 	rm -f ${TARGETS}
diff --git a/lib/isc/unix/ifiter_ioctl.c b/lib/isc/unix/ifiter_ioctl.c
index 91beb830a4..ad6fc45830 100644
--- a/lib/isc/unix/ifiter_ioctl.c
+++ b/lib/isc/unix/ifiter_ioctl.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ifiter_ioctl.c,v 1.35 2002/10/28 06:12:13 marka Exp $ */
+/* $Id: ifiter_ioctl.c,v 1.36 2002/12/27 03:29:37 marka Exp $ */
 
 /*
  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
@@ -444,8 +444,10 @@ internal_current4(isc_interfaceiter_t *iter) {
 	if ((ifreq.ifr_flags & IFF_UP) != 0)
 		iter->current.flags |= INTERFACE_F_UP;
 
+#ifdef IFF_POINTTOPOINT
 	if ((ifreq.ifr_flags & IFF_POINTOPOINT) != 0)
 		iter->current.flags |= INTERFACE_F_POINTTOPOINT;
+#endif
 
 	if ((ifreq.ifr_flags & IFF_LOOPBACK) != 0)
 		iter->current.flags |= INTERFACE_F_LOOPBACK;
@@ -488,6 +490,7 @@ internal_current4(isc_interfaceiter_t *iter) {
 #endif
 	if (family != AF_INET)
 		return (ISC_R_IGNORE);
+#ifdef IFF_POINTTOPOINT
 	/*
 	 * If the interface is point-to-point, get the destination address.
 	 */
@@ -512,6 +515,7 @@ internal_current4(isc_interfaceiter_t *iter) {
 		get_addr(family, &iter->current.dstaddress,
 			 (struct sockaddr *)&ifreq.ifr_dstaddr);
 	}
+#endif
 
 	/*
 	 * Get the network mask.