Use cookies (.*_done) to determine whether headers and libs have been

linked from a particular package, and add a pre-configure target to
the buildlink.mk file to more painlessly use buildlink.mk files.  A
${BUILDLINK_TARGETS} variable still exists in case a package _must_
define NO_CONFIGURE.

19 files changed, 242 insertions, 124 deletions

diff --git a/converters/libiconv/buildlink.mk b/converters/libiconv/buildlink.mk
index d57c487a110..fd634fad410 100644
--- a/converters/libiconv/buildlink.mk
+++ b/converters/libiconv/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/05/26 08:10:43 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/10 00:09:29 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libiconv.
 #
@@ -7,10 +7,9 @@
 # (1) Optionally define ICONV_REQD to the version of libiconv desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(ICONV_BUILDLINK_MK)
@@ -27,8 +26,15 @@ ICONV_LIBS+=		${LOCALBASE}/lib/libiconv.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-iconv-headers
-BUILDLINK_TARGETS+=	link-iconv-libs
+ICONV_BUILDLINK_COOKIE=		${WRKDIR}/.iconv_buildlink_done
+ICONV_BUILDLINK_TARGETS=	link-iconv-headers
+ICONV_BUILDLINK_TARGETS+=	link-iconv-libs
+BUILDLINK_TARGETS+=		${ICONV_BUILDLINK_COOKIE}
+
+pre-configure: ${ICONV_BUILDLINK_COOKIE}
+
+${ICONV_BUILDLINK_COOKIE}: ${ICONV_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${ICONV_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/databases/gdbm/buildlink.mk b/databases/gdbm/buildlink.mk
index 0500b558898..d42f1a4d81e 100644
--- a/databases/gdbm/buildlink.mk
+++ b/databases/gdbm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/05/28 05:38:04 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/10 00:09:29 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gdbm.
 #
@@ -7,10 +7,9 @@
 # (1) Optionally define GDBM_REQD to the version of gdbm desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(GDBM_BUILDLINK_MK)
@@ -25,8 +24,15 @@ GDBM_LIBS=		${LOCALBASE}/lib/libgdbm.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-gdbm-headers
-BUILDLINK_TARGETS+=	link-gdbm-libs
+GDBM_BUILDLINK_COOKIE=		${WRKDIR}/.gdbm_buildlink_done
+GDBM_BUILDLINK_TARGETS=		link-gdbm-headers
+GDBM_BUILDLINK_TARGETS+=	link-gdbm-libs
+BUILDLINK_TARGETS+=		${GDBM_BUILDLINK_COOKIE}
+
+pre-configure: ${GDBM_BUILDLINK_COOKIE}
+
+${GDBM_BUILDLINK_COOKIE}: ${GDBM_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${GDBM_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/devel/gettext-lib/buildlink.mk b/devel/gettext-lib/buildlink.mk
index 08f0b33a7a9..8afeb4b9476 100644
--- a/devel/gettext-lib/buildlink.mk
+++ b/devel/gettext-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/09 15:25:18 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/10 00:09:29 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gettext.
 #
@@ -7,10 +7,9 @@
 # (1) Optionally define GETTEXT_REQD to the version of gettext desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(GETTEXT_BUILDLINK_MK)
@@ -53,8 +52,15 @@ LDFLAGS+=		-L${BUILDLINK_LIBDIR}
 LIBS+=			-lintl
 .endif
 
-BUILDLINK_TARGETS+=	link-gettext-headers
-BUILDLINK_TARGETS+=	link-gettext-libs
+GETTEXT_BUILDLINK_COOKIE=	${WRKDIR}/.gettext_buildlink_done
+GETTEXT_BUILDLINK_TARGETS=	link-gettext-headers
+GETTEXT_BUILDLINK_TARGETS+=	link-gettext-libs
+BUILDLINK_TARGETS+=		${GETTEXT_BUILDLINK_COOKIE}
+
+pre-configure: ${GETTEXT_BUILDLINK_COOKIE}
+
+${GETTEXT_BUILDLINK_COOKIE}: ${GETTEXT_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${GETTEXT_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/devel/gmp/buildlink.mk b/devel/gmp/buildlink.mk
index 83a7a0085cf..1c7ef4c5b95 100644
--- a/devel/gmp/buildlink.mk
+++ b/devel/gmp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/05/28 05:47:28 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/10 00:09:30 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gmp.
 #
@@ -7,10 +7,9 @@
 # (1) Optionally define GMP_REQD to the version of gmp desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(GMP_BUILDLINK_MK)
@@ -25,8 +24,15 @@ GMP_LIBS=		${LOCALBASE}/lib/libgmp.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-gmp-headers
-BUILDLINK_TARGETS+=	link-gmp-libs
+GMP_BUILDLINK_COOKIE=		${WRKDIR}/.gmp_buildlink_done
+GMP_BUILDLINK_TARGETS=		link-gmp-headers
+GMP_BUILDLINK_TARGETS+=		link-gmp-libs
+BUILDLINK_TARGETS+=		${GMP_BUILDLINK_COOKIE}
+
+pre-configure: ${GMP_BUILDLINK_COOKIE}
+
+${GMP_BUILDLINK_COOKIE}: ${GMP_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${GMP_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/devel/libgetopt/buildlink.mk b/devel/libgetopt/buildlink.mk
index ebf41e5991b..1ba2423ec7a 100644
--- a/devel/libgetopt/buildlink.mk
+++ b/devel/libgetopt/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/05/26 05:44:09 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/06/10 00:09:30 jlam Exp $
 #
 # This Makefile fragment is included by packages that use getopt_long().
 #
@@ -10,10 +10,9 @@
 #
 # (1) Include this Makefile fragment in the package Makefile,
 # (2) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (3) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path.
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(GETOPT_BUILDLINK_MK)
@@ -36,8 +35,15 @@ LIBS+=			-lgetopt
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-getopt-headers
-BUILDLINK_TARGETS+=	link-getopt-libs
+GETOPT_BUILDLINK_COOKIE=	${WRKDIR}/.getopt_buildlink_done
+GETOPT_BUILDLINK_TARGETS=	link-getopt-headers
+GETOPT_BUILDLINK_TARGETS+=	link-getopt-libs
+BUILDLINK_TARGETS+=		${GETOPT_BUILDLINK_COOKIE}
+
+pre-configure: ${GETOPT_BUILDLINK_COOKIE}
+
+${GETOPT_BUILDLINK_COOKIE}: ${GETOPT_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${GETOPT_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/devel/lwp/buildlink.mk b/devel/lwp/buildlink.mk
index 80c0c95b279..523daee00bb 100644
--- a/devel/lwp/buildlink.mk
+++ b/devel/lwp/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/09 15:21:03 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:30 jlam Exp $
 #
 # This Makefile fragment is included by packages that use lwp.
 #
@@ -7,10 +7,9 @@
 # (1) Optionally define LWP_REQD to the version of lwp desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(LWP_BUILDLINK_MK)
@@ -25,8 +24,15 @@ LWP_LIBS=		${LOCALBASE}/lib/liblwp.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-lwp-headers
-BUILDLINK_TARGETS+=	link-lwp-libs
+LWP_BUILDLINK_COOKIE=		${WRKDIR}/.lwp_buildlink_done
+LWP_BUILDLINK_TARGETS=		link-lwp-headers
+LWP_BUILDLINK_TARGETS+=		link-lwp-libs
+BUILDLINK_TARGETS+=		${LWP_BUILDLINK_COOKIE}
+
+pre-configure: ${LWP_BUILDLINK_COOKIE}
+
+${LWP_BUILDLINK_COOKIE}: ${LWP_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${LWP_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/devel/readline/buildlink.mk b/devel/readline/buildlink.mk
index c8458f09a9f..980fa67c35f 100644
--- a/devel/readline/buildlink.mk
+++ b/devel/readline/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/06/05 22:15:01 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/06/10 00:09:30 jlam Exp $
 #
 # This Makefile fragment is included by packages that use readline().
 #
@@ -8,10 +8,9 @@
 # (2) Optionally define READLINE_REQD to the version of GNU readline desired.
 # (3) Include this Makefile fragment in the package Makefile,
 # (4) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (5) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (6) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (7) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 #
 # NOTE:	You may need to do some more work to get libedit recognized over
@@ -54,11 +53,18 @@ HISTORY_LIBS=		/usr/lib/libedit.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-readline-headers
+READLINE_BUILDLINK_COOKIE=	${WRKDIR}/.readline_buildlink_done
+READLINE_BUILDLINK_TARGETS=	link-readline-headers
 .if defined(HAVE_LIBEDIT_READLINE) && defined(USE_LIBTOOL)
-BUILDLINK_TARGETS+=	editline-libtool-archive
+READLINE_BUILDLINK_TARGETS+=	editline-libtool-archive
 .endif
-BUILDLINK_TARGETS+=	link-readline-libs
+READLINE_BUILDLINK_TARGETS+=	link-readline-libs
+BUILDLINK_TARGETS+=		${READLINE_BUILDLINK_COOKIE}
+
+pre-configure: ${READLINE_BUILDLINK_COOKIE}
+
+${READLINE_BUILDLINK_COOKIE}: ${READLINE_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${READLINE_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/devel/rpc2/buildlink.mk b/devel/rpc2/buildlink.mk
index f96f5285807..12e634a737f 100644
--- a/devel/rpc2/buildlink.mk
+++ b/devel/rpc2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/09 15:29:50 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:31 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rpc2.
 #
@@ -7,17 +7,14 @@
 # (1) Optionally define RPC2_REQD to the version of rpc2 desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(RPC2_BUILDLINK_MK)
 RPC2_BUILDLINK_MK=	# defined
 
-.include "../../devel/lwp/buildlink.mk"
-
 RPC2_REQD?=		1.10
 DEPENDS+=		rpc2>=${RPC2_REQD}:../../devel/rpc2
 
@@ -29,8 +26,17 @@ RPC2_LIBS+=		${LOCALBASE}/lib/libse.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-rpc2-headers
-BUILDLINK_TARGETS+=	link-rpc2-libs
+.include "../../devel/lwp/buildlink.mk"
+
+RPC2_BUILDLINK_COOKIE=		${WRKDIR}/.rpc2_buildlink_done
+RPC2_BUILDLINK_TARGETS=		link-rpc2-headers
+RPC2_BUILDLINK_TARGETS+=	link-rpc2-libs
+BUILDLINK_TARGETS+=		${RPC2_BUILDLINK_COOKIE}
+
+pre-configure: ${RPC2_BUILDLINK_COOKIE}
+
+${RPC2_BUILDLINK_COOKIE}: ${RPC2_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${RPC2_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/devel/rvm/buildlink.mk b/devel/rvm/buildlink.mk
index 662a715e304..8ae5b8fab88 100644
--- a/devel/rvm/buildlink.mk
+++ b/devel/rvm/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/09 15:29:50 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:31 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rvm.
 #
@@ -16,8 +16,6 @@
 .if !defined(RVM_BUILDLINK_MK)
 RVM_BUILDLINK_MK=	# defined
 
-.include "../../devel/lwp/buildlink.mk"
-
 RVM_REQD?=		1.3
 DEPENDS+=		rvm>=${RVM_REQD}:../../devel/rvm
 
@@ -31,8 +29,17 @@ RVM_LIBS+=		${LOCALBASE}/lib/libseg.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-rvm-headers
-BUILDLINK_TARGETS+=	link-rvm-libs
+.include "../../devel/lwp/buildlink.mk"
+
+RVM_BUILDLINK_COOKIE=		${WRKDIR}/.rvm_buildlink_done
+RVM_BUILDLINK_TARGETS=		link-rvm-headers
+RVM_BUILDLINK_TARGETS+=		link-rvm-libs
+BUILDLINK_TARGETS+=		${RVM_BUILDLINK_COOKIE}
+
+pre-configure: ${RVM_BUILDLINK_COOKIE}
+
+${RVM_BUILDLINK_COOKIE}: ${RVM_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${RVM_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/devel/zlib/buildlink.mk b/devel/zlib/buildlink.mk
index f052461d5a4..acc96935bee 100644
--- a/devel/zlib/buildlink.mk
+++ b/devel/zlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/05/26 16:30:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/06/10 00:09:31 jlam Exp $
 #
 # This Makefile fragment is included by packages that use zlib. 
 #
@@ -7,10 +7,9 @@
 # (1) Optionally define ZLIB_REQD to the version of zlib desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(ZLIB_BUILDLINK_MK)
@@ -38,8 +37,15 @@ ZLIB_LIBS=		/usr/lib/libz.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-zlib-headers
-BUILDLINK_TARGETS+=	link-zlib-libs
+ZLIB_BUILDLINK_COOKIE=		${WRKDIR}/.zlib_buildlink_done
+ZLIB_BUILDLINK_TARGETS=		link-zlib-headers
+ZLIB_BUILDLINK_TARGETS+=	link-zlib-libs
+BUILDLINK_TARGETS+=		${ZLIB_BUILDLINK_COOKIE}
+
+pre-configure: ${ZLIB_BUILDLINK_COOKIE}
+
+${ZLIB_BUILDLINK_COOKIE}: ${ZLIB_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${ZLIB_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/graphics/Mesa/buildlink.mk b/graphics/Mesa/buildlink.mk
index a5a6e8f82a0..ca1fa68a8df 100644
--- a/graphics/Mesa/buildlink.mk
+++ b/graphics/Mesa/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/05/26 06:46:31 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:31 jlam Exp $
 #
 # This Makefile fragment is included by packages that use Mesa.
 #
@@ -7,10 +7,9 @@
 # (1) Optionally define MESA_REQD to the version of Mesa desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(MESA_BUILDLINK_MK)
@@ -34,8 +33,15 @@ MESA_LIBS+=		${LOCALBASE}/lib/libglut.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-Mesa-headers
-BUILDLINK_TARGETS+=	link-Mesa-libs
+MESA_BUILDLINK_COOKIE=		${WRKDIR}/.Mesa_buildlink_done
+MESA_BUILDLINK_TARGETS=		link-Mesa-headers
+MESA_BUILDLINK_TARGETS+=	link-Mesa-libs
+BUILDLINK_TARGETS+=		${MESA_BUILDLINK_COOKIE}
+
+pre-configure: ${MESA_BUILDLINK_COOKIE}
+
+${MESA_BUILDLINK_COOKIE}: ${MESA_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${MESA_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/graphics/freetype-lib/buildlink.mk b/graphics/freetype-lib/buildlink.mk
index 8acf713e7c9..d6fd563fb8e 100644
--- a/graphics/freetype-lib/buildlink.mk
+++ b/graphics/freetype-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/09 15:27:21 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:31 jlam Exp $
 #
 # This Makefile fragment is included by packages that use freetype.
 #
@@ -7,17 +7,14 @@
 # (1) Optionally define FREETYPE_REQD to the version of freetype desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(FREETYPE_BUILDLINK_MK)
 FREETYPE_BUILDLINK_MK=	# defined
 
-.include "../../devel/gettext-lib/buildlink.mk"
-
 FREETYPE_REQD?=		1.3.1
 DEPENDS+=		freetype-lib>=${FREETYPE_REQD}:../../graphics/freetype-lib
 
@@ -27,8 +24,17 @@ FREETYPE_LIBS=		${LOCALBASE}/lib/libttf.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-freetype-headers
-BUILDLINK_TARGETS+=	link-freetype-libs
+.include "../../devel/gettext-lib/buildlink.mk"
+
+FREETYPE_BUILDLINK_COOKIE=	${WRKDIR}/.freetype_buildlink_done
+FREETYPE_BUILDLINK_TARGETS=	link-freetype-headers
+FREETYPE_BUILDLINK_TARGETS+=	link-freetype-libs
+BUILDLINK_TARGETS+=		${FREETYPE_BUILDLINK_COOKIE}
+
+pre-configure: ${FREETYPE_BUILDLINK_COOKIE}
+
+${FREETYPE_BUILDLINK_COOKIE}: ${FREETYPE_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${FREETYPE_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/graphics/jpeg/buildlink.mk b/graphics/jpeg/buildlink.mk
index e08d047da03..a9df6753ac2 100644
--- a/graphics/jpeg/buildlink.mk
+++ b/graphics/jpeg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/09 15:27:20 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:32 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libjpeg.
 #
@@ -7,10 +7,9 @@
 # (1) Optionally define JPEG_REQD to the version of libjpeg desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(JPEG_BUILDLINK_MK)
@@ -28,8 +27,15 @@ JPEG_LIBS=		${LOCALBASE}/lib/libjpeg.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-jpeg-headers
-BUILDLINK_TARGETS+=	link-jpeg-libs
+JPEG_BUILDLINK_COOKIE=		${WRKDIR}/.jpeg_buildlink_done
+JPEG_BUILDLINK_TARGETS=		link-jpeg-headers
+JPEG_BUILDLINK_TARGETS+=	link-jpeg-libs
+BUILDLINK_TARGETS+=		${JPEG_BUILDLINK_COOKIE}
+
+pre-configure: ${JPEG_BUILDLINK_COOKIE}
+
+${JPEG_BUILDLINK_COOKIE}: ${JPEG_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${JPEG_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/graphics/png/buildlink.mk b/graphics/png/buildlink.mk
index d14901e287e..5b4e57f76d6 100644
--- a/graphics/png/buildlink.mk
+++ b/graphics/png/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/09 15:27:20 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/10 00:09:32 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libpng.
 #
@@ -7,17 +7,14 @@
 # (1) Optionally define PNG_REQD to the version of libpng desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(PNG_BUILDLINK_MK)
 PNG_BUILDLINK_MK=	# defined
 
-.include "../../devel/zlib/buildlink.mk"
-
 PNG_REQD?=		1.0.11
 DEPENDS+=		png>=${PNG_REQD}:../../graphics/png
 
@@ -28,8 +25,17 @@ PNG_LIBS=		${LOCALBASE}/lib/libpng.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-png-headers
-BUILDLINK_TARGETS+=	link-png-libs
+.include "../../devel/zlib/buildlink.mk"
+
+PNG_BUILDLINK_COOKIE=		${WRKDIR}/.png_buildlink_done
+PNG_BUILDLINK_TARGETS=		link-png-headers
+PNG_BUILDLINK_TARGETS+=		link-png-libs
+BUILDLINK_TARGETS+=		${PNG_BUILDLINK_COOKIE}
+
+pre-configure: ${PNG_BUILDLINK_COOKIE}
+
+${PNG_BUILDLINK_COOKIE}: ${PNG_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${PNG_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/graphics/tiff/buildlink.mk b/graphics/tiff/buildlink.mk
index dfa56103d30..e700b3c5fc5 100644
--- a/graphics/tiff/buildlink.mk
+++ b/graphics/tiff/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/09 15:32:16 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/10 00:09:32 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libtiff.
 #
@@ -7,18 +7,14 @@
 # (1) Optionally define TIFF_REQD to the version of libtiff desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(TIFF_BUILDLINK_MK)
 TIFF_BUILDLINK_MK=	# defined
 
-.include "../../devel/zlib/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-
 TIFF_REQD?=		3.5.4
 DEPENDS+=		tiff>=${TIFF_REQD}:../../graphics/tiff
 
@@ -30,8 +26,18 @@ TIFF_LIBS=		${LOCALBASE}/lib/libtiff.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-tiff-headers
-BUILDLINK_TARGETS+=	link-tiff-libs
+.include "../../devel/zlib/buildlink.mk"
+.include "../../graphics/jpeg/buildlink.mk"
+
+TIFF_BUILDLINK_COOKIE=		${WRKDIR}/.tiff_buildlink_done
+TIFF_BUILDLINK_TARGETS=		link-tiff-headers
+TIFF_BUILDLINK_TARGETS+=	link-tiff-libs
+BUILDLINK_TARGETS+=		${TIFF_BUILDLINK_COOKIE}
+
+pre-configure: ${TIFF_BUILDLINK_COOKIE}
+
+${TIFF_BUILDLINK_COOKIE}: ${TIFF_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${TIFF_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/japanese/vflib-lib/buildlink.mk b/japanese/vflib-lib/buildlink.mk
index 926fe78f1a0..fb3170c85e8 100644
--- a/japanese/vflib-lib/buildlink.mk
+++ b/japanese/vflib-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/09 15:27:19 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:32 jlam Exp $
 #
 # This Makefile fragment is included by packages that use VFlib.
 #
@@ -7,17 +7,14 @@
 # (1) Optionally define VFLIB_REQD to the version of VFlib desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(VFLIB_BUILDLINK_MK)
 VFLIB_BUILDLINK_MK=	# defined
 
-.include "../../graphics/freetype-lib/buildlink.mk"
-
 VFLIB_REQD?=		2.24.2
 DEPENDS+=		ja-vflib-lib>=${VFLIB_REQD}:../../japanese/vflib-lib
 
@@ -27,8 +24,17 @@ VFLIB_LIBS=		${LOCALBASE}/lib/libVFlib2.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-vflib-headers
-BUILDLINK_TARGETS+=	link-vflib-libs
+.include "../../graphics/freetype-lib/buildlink.mk"
+
+VFLIB_BUILDLINK_COOKIE=		${WRKDIR}/.vflib_buildlink_done
+VFLIB_BUILDLINK_TARGETS=	link-vflib-headers
+VFLIB_BUILDLINK_TARGETS+=	link-vflib-libs
+BUILDLINK_TARGETS+=		${VFLIB_BUILDLINK_COOKIE}
+
+pre-configure: ${VFLIB_BUILDLINK_COOKIE}
+
+${VFLIB_BUILDLINK_COOKIE}: ${VFLIB_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${VFLIB_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/print/cups/buildlink.mk b/print/cups/buildlink.mk
index 9394444b21e..465b49c3d05 100644
--- a/print/cups/buildlink.mk
+++ b/print/cups/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/09 15:12:04 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/10 00:09:33 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libcups.
 #
@@ -7,10 +7,9 @@
 # (1) Optionally define CUPS_REQD to the version of cups desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(CUPS_BUILDLINK_MK)
@@ -26,8 +25,15 @@ CUPS_LIBS+=		${LOCALBASE}/lib/libcupsimage.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-cups-headers
-BUILDLINK_TARGETS+=	link-cups-libs
+CUPS_BUILDLINK_COOKIE=		${WRKDIR}/.cups_buildlink_done
+CUPS_BUILDLINK_TARGETS=		link-cups-headers
+CUPS_BUILDLINK_TARGETS+=	link-cups-libs
+BUILDLINK_TARGETS+=		${CUPS_BUILDLINK_COOKIE}
+
+pre-configure: ${CUPS_BUILDLINK_COOKIE}
+
+${CUPS_BUILDLINK_COOKIE}: ${CUPS_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${CUPS_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/security/PAM/buildlink.mk b/security/PAM/buildlink.mk
index 466ddcd3b78..881006efc81 100644
--- a/security/PAM/buildlink.mk
+++ b/security/PAM/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/09 15:30:53 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/10 00:09:33 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libpam.
 #
@@ -7,10 +7,9 @@
 # (1) Optionally define PAM_REQD to the version of pam desired.
 # (2) Include this Makefile fragment in the package Makefile,
 # (3) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR,
-# (4) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure,
-# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
+# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header
 #     search path, and
-# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
 #     path.
 
 .if !defined(PAM_BUILDLINK_MK)
@@ -27,8 +26,15 @@ PAM_LIBS+=		${LOCALBASE}/lib/libpam_misc.*
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-pam-headers
-BUILDLINK_TARGETS+=	link-pam-libs
+PAM_BUILDLINK_COOKIE=		${WRKDIR}/.pam_buildlink_done
+PAM_BUILDLINK_TARGETS=		link-pam-headers
+PAM_BUILDLINK_TARGETS+=		link-pam-libs
+BUILDLINK_TARGETS+=		${PAM_BUILDLINK_COOKIE}
+
+pre-configure: ${PAM_BUILDLINK_COOKIE}
+
+${PAM_BUILDLINK_COOKIE}: ${PAM_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${PAM_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
diff --git a/x11/fltk/buildlink.mk b/x11/fltk/buildlink.mk
index 1151487cac6..ff9255cd4ab 100644
--- a/x11/fltk/buildlink.mk
+++ b/x11/fltk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/09 15:13:07 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/10 00:09:33 jlam Exp $
 #
 # This Makefile fragment is included by packages that use FLTK.
 #
@@ -18,8 +18,6 @@ FLTK_BUILDLINK_MK=	# defined
 
 FLTK_REQD?=		1.0.9
 
-.include "../../graphics/Mesa/buildlink.mk"
-
 FLTK_HEADERS=		${X11PREFIX}/include/FL/*
 FLTK_LIBS=		${X11PREFIX}/lib/libfltk.*
 DEPENDS+=		fltk>=${FLTK_REQD}:../../x11/fltk
@@ -27,8 +25,17 @@ DEPENDS+=		fltk>=${FLTK_REQD}:../../x11/fltk
 BUILDLINK_INCDIR?=	${WRKDIR}/include
 BUILDLINK_LIBDIR?=	${WRKDIR}/lib
 
-BUILDLINK_TARGETS+=	link-fltk-headers
-BUILDLINK_TARGETS+=	link-fltk-libs
+.include "../../graphics/Mesa/buildlink.mk"
+
+FLTK_BUILDLINK_COOKIE=		${WRKDIR}/.fltk_buildlink_done
+FLTK_BUILDLINK_TARGETS+=	link-fltk-headers
+FLTK_BUILDLINK_TARGETS+=	link-fltk-libs
+BUILDLINK_TARGETS+=		${FLTK_BUILDLINK_COOKIE}
+
+pre-configure: ${FLTK_BUILDLINK_COOKIE}
+
+${FLTK_BUILDLINK_COOKIE}: ${FLTK_BUILDLINK_TARGETS}
+	@${TOUCH} ${TOUCH_FLAGS} ${FLTK_BUILDLINK_COOKIE}
 
 # This target links the headers into ${BUILDLINK_INCDIR}, which should
 # be searched first by the C preprocessor.
@@ -59,4 +66,6 @@ link-fltk-libs:
 		fi;							\
 	done
 
+jlam: ${FLTK_BUILDLINK_COOKIE}
+
 .endif	# FLTK_BUILDLINK_MK