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.

5 files changed, 67 insertions, 37 deletions

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.