From 9c34f756d124725a34859e96693fbe2ead3a30ef Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sun, 10 Jun 2001 00:09:29 +0000
Subject: 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.

---
 graphics/tiff/buildlink.mk | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'graphics/tiff')

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.
-- 
cgit v1.2.3