Use bsd.buildlink.mk instead of duplicating code all over the place.

5 files changed, 70 insertions, 232 deletions

diff --git a/graphics/Mesa/buildlink.mk b/graphics/Mesa/buildlink.mk
index ca1fa68a8df..67d4992da62 100644
--- a/graphics/Mesa/buildlink.mk
+++ b/graphics/Mesa/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:31 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:36 jlam Exp $
 #
 # This Makefile fragment is included by packages that use Mesa.
 #
@@ -6,10 +6,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_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(MESA_BUILDLINK_MK)
@@ -20,56 +19,28 @@ MESA_REQD?=		3.2.1
 # We double-list because we're not sure if the files are in ${X11BASE}
 # or in ${LOCALBASE}.
 
-MESA_HEADERS=		${X11BASE}/include/GL/*
-MESA_HEADERS+=		${LOCALBASE}/include/GL/*
+BUILDLINK_PREFIX.Mesa-1=	${X11BASE}
+BUILDLINK_FILES.Mesa-1=		include/GL/*
+BUILDLINK_FILES.Mesa-1+=	lib/libGL.*
+BUILDLINK_FILES.Mesa-1+=	lib/libGLU.*
+BUILDLINK_FILES.Mesa-1+=	lib/libglut.*
 
-MESA_LIBS=		${X11BASE}/lib/libGL.*
-MESA_LIBS+=		${X11BASE}/lib/libGLU.*
-MESA_LIBS+=		${X11BASE}/lib/libglut.*
-MESA_LIBS+=		${LOCALBASE}/lib/libGL.*
-MESA_LIBS+=		${LOCALBASE}/lib/libGLU.*
-MESA_LIBS+=		${LOCALBASE}/lib/libglut.*
+BUILDLINK_TARGETS.Mesa=		Mesa-1-buildlink
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_PREFIX.Mesa-2=	${LOCALBASE}
+BUILDLINK_FILES.Mesa-2=		include/GL/*
+BUILDLINK_FILES.Mesa-2+=	lib/libGL.*
+BUILDLINK_FILES.Mesa-2+=	lib/libGLU.*
+BUILDLINK_FILES.Mesa-2+=	lib/libglut.*
 
-MESA_BUILDLINK_COOKIE=		${WRKDIR}/.Mesa_buildlink_done
-MESA_BUILDLINK_TARGETS=		link-Mesa-headers
-MESA_BUILDLINK_TARGETS+=	link-Mesa-libs
-BUILDLINK_TARGETS+=		${MESA_BUILDLINK_COOKIE}
+BUILDLINK_TARGETS.Mesa+=	Mesa-2-buildlink
 
-pre-configure: ${MESA_BUILDLINK_COOKIE}
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.Mesa}
 
-${MESA_BUILDLINK_COOKIE}: ${MESA_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${MESA_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.Mesa}
+Mesa-1-buildlink: _BUILDLINK_USE
+Mesa-2-buildlink: _BUILDLINK_USE
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-Mesa-headers:
-	@${ECHO} "Linking Mesa headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}/GL
-	@${RM} -f ${BUILDLINK_INCDIR}/GL/*
-	@for inc in ${MESA_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/GL/`${BASENAME} $${inc}`; \
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-Mesa-libs:
-	@${ECHO} "Linking Mesa libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${MESA_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# MESA_BUILDLINK_MK
diff --git a/graphics/freetype-lib/buildlink.mk b/graphics/freetype-lib/buildlink.mk
index d6fd563fb8e..b419cf82d20 100644
--- a/graphics/freetype-lib/buildlink.mk
+++ b/graphics/freetype-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:31 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:36 jlam Exp $
 #
 # This Makefile fragment is included by packages that use freetype.
 #
@@ -6,10 +6,9 @@
 #
 # (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_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(FREETYPE_BUILDLINK_MK)
@@ -18,51 +17,18 @@ FREETYPE_BUILDLINK_MK=	# defined
 FREETYPE_REQD?=		1.3.1
 DEPENDS+=		freetype-lib>=${FREETYPE_REQD}:../../graphics/freetype-lib
 
-FREETYPE_HEADERS=	${LOCALBASE}/include/freetype/*
-FREETYPE_LIBS=		${LOCALBASE}/lib/libttf.*
-
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_PREFIX.freetype=	${LOCALBASE}
+BUILDLINK_FILES.freetype=	include/freetype/*
+BUILDLINK_FILES.freetype+=	lib/libttf.*
 
 .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}
+BUILDLINK_TARGETS.freetype=	freetype-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.freetype}
 
-${FREETYPE_BUILDLINK_COOKIE}: ${FREETYPE_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${FREETYPE_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.freetype}
+freetype-buildlink: _BUILDLINK_USE
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-freetype-headers:
-	@${ECHO} "Linking freetype headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}/freetype
-	@${RM} -f ${BUILDLINK_INCDIR}/freetype/*
-	@for inc in ${FREETYPE_HEADERS}; do				\
-		dest=${BUILDLINK_INCDIR}/freetype/`${BASENAME} $${inc}`; \
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-freetype-libs:
-	@${ECHO} "Linking freetype libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${FREETYPE_LIBS}; do				\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# FREETYPE_BUILDLINK_MK
diff --git a/graphics/jpeg/buildlink.mk b/graphics/jpeg/buildlink.mk
index a9df6753ac2..31c665a77ac 100644
--- a/graphics/jpeg/buildlink.mk
+++ b/graphics/jpeg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:32 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/06/11 01:59:36 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libjpeg.
 #
@@ -6,10 +6,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_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(JPEG_BUILDLINK_MK)
@@ -18,51 +17,19 @@ JPEG_BUILDLINK_MK=	# defined
 JPEG_REQD?=		6
 DEPENDS+=		jpeg>=${JPEG_REQD}:../../graphics/jpeg
 
-JPEG_HEADERS=		${LOCALBASE}/include/jconfig.h
-JPEG_HEADERS+=		${LOCALBASE}/include/jpeglib.h
-JPEG_HEADERS+=		${LOCALBASE}/include/jmorecfg.h
-JPEG_HEADERS+=		${LOCALBASE}/include/jerror.h
-JPEG_LIBS=		${LOCALBASE}/lib/libjpeg.*
+BUILDLINK_PREFIX.jpeg=	${LOCALBASE}
+BUILDLINK_FILES.jpeg=	include/jconfig.h
+BUILDLINK_FILES.jpeg+=	include/jpeglib.h
+BUILDLINK_FILES.jpeg+=	include/jmorecfg.h
+BUILDLINK_FILES.jpeg+=	include/jerror.h
+BUILDLINK_FILES.jpeg+=	lib/libjpeg.*
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_TARGETS.jpeg=	jpeg-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.jpeg}
 
-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: ${BUILDLINK_TARGETS.jpeg}
+jpeg-buildlink: _BUILDLINK_USE
 
-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.
-#
-link-jpeg-headers:
-	@${ECHO} "Linking jpeg headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}
-	@for inc in ${JPEG_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/`${BASENAME} $${inc}`;		\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-jpeg-libs:
-	@${ECHO} "Linking jpeg libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${JPEG_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# JPEG_BUILDLINK_MK
diff --git a/graphics/png/buildlink.mk b/graphics/png/buildlink.mk
index 5b4e57f76d6..b36119507b4 100644
--- a/graphics/png/buildlink.mk
+++ b/graphics/png/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/10 00:09:32 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/11 01:59:36 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libpng.
 #
@@ -6,10 +6,9 @@
 #
 # (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_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(PNG_BUILDLINK_MK)
@@ -18,51 +17,19 @@ PNG_BUILDLINK_MK=	# defined
 PNG_REQD?=		1.0.11
 DEPENDS+=		png>=${PNG_REQD}:../../graphics/png
 
-PNG_HEADERS=		${LOCALBASE}/include/png.h
-PNG_HEADERS+=		${LOCALBASE}/include/pngconf.h
-PNG_LIBS=		${LOCALBASE}/lib/libpng.*
-
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_PREFIX.png=	${LOCALBASE}
+BUILDLINK_FILES.png=	include/png.h
+BUILDLINK_FILES.png+=	include/pngconf.h
+BUILDLINK_FILES.png+=	lib/libpng.*
 
 .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}
+BUILDLINK_TARGETS.png=	png-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.png}
 
-${PNG_BUILDLINK_COOKIE}: ${PNG_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${PNG_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.png}
+png-buildlink: _BUILDLINK_USE
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-png-headers:
-	@${ECHO} "Linking png headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}
-	@for inc in ${PNG_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/`${BASENAME} $${inc}`;		\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-png-libs:
-	@${ECHO} "Linking png libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${PNG_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# PNG_BUILDLINK_MK
diff --git a/graphics/tiff/buildlink.mk b/graphics/tiff/buildlink.mk
index e700b3c5fc5..a428e8be831 100644
--- a/graphics/tiff/buildlink.mk
+++ b/graphics/tiff/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/10 00:09:32 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/11 01:59:37 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libtiff.
 #
@@ -6,10 +6,9 @@
 #
 # (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_INCDIR} to the front of the C preprocessor's header
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
 #     search path, and
-# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(TIFF_BUILDLINK_MK)
@@ -18,53 +17,21 @@ TIFF_BUILDLINK_MK=	# defined
 TIFF_REQD?=		3.5.4
 DEPENDS+=		tiff>=${TIFF_REQD}:../../graphics/tiff
 
-TIFF_HEADERS=		${LOCALBASE}/include/tiff.h
-TIFF_HEADERS+=		${LOCALBASE}/include/tiffconf.h
-TIFF_HEADERS+=		${LOCALBASE}/include/tiffio.h
-TIFF_LIBS=		${LOCALBASE}/lib/libtiff.*
-
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_PREFIX.tiff=	${LOCALBASE}
+BUILDLINK_FILES.tiff=	include/tiff.h
+BUILDLINK_FILES.tiff+=	include/tiffconf.h
+BUILDLINK_FILES.tiff+=	include/tiffio.h
+BUILDLINK_FILES.tiff+=	lib/libtiff.*
 
 .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}
+BUILDLINK_TARGETS.tiff=	tiff-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.tiff}
 
-${TIFF_BUILDLINK_COOKIE}: ${TIFF_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${TIFF_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.tiff}
+tiff-buildlink: _BUILDLINK_USE
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-tiff-headers:
-	@${ECHO} "Linking tiff headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}
-	@for inc in ${TIFF_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/`${BASENAME} $${inc}`;		\
-		if [ -f $${inc} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${inc} $${dest};			\
-		fi;							\
-	done
-
-# This target links the libraries into ${BUILDLINK_LIBDIR}, which should
-# be searched first by the linker.
-#
-link-tiff-libs:
-	@${ECHO} "Linking tiff libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${TIFF_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# TIFF_BUILDLINK_MK