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

1 files changed, 11 insertions, 48 deletions

diff --git a/x11/fltk/buildlink.mk b/x11/fltk/buildlink.mk
index ff9255cd4ab..eec267d2e38 100644
--- a/x11/fltk/buildlink.mk
+++ b/x11/fltk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/06/10 00:09:33 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/06/11 01:59:38 jlam Exp $
 #
 # This Makefile fragment is included by packages that use FLTK.
 #
@@ -6,66 +6,29 @@
 #
 # (1) Optionally define FLTK_REQD to the version of FLTK 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
+# (3) Add ${BUILDLINK_DIR}/include 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
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
 #     path.
 
 .if !defined(FLTK_BUILDLINK_MK)
 FLTK_BUILDLINK_MK=	# defined
 
 FLTK_REQD?=		1.0.9
-
-FLTK_HEADERS=		${X11PREFIX}/include/FL/*
-FLTK_LIBS=		${X11PREFIX}/lib/libfltk.*
 DEPENDS+=		fltk>=${FLTK_REQD}:../../x11/fltk
 
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_PREFIX.fltk=	${X11PREFIX}
+BUILDLINK_FILES.fltk=	include/FL/*
+BUILDLINK_FILES.fltk+=	lib/libfltk.*
 
 .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}
+BUILDLINK_TARGETS.fltk=	fltk-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.fltk}
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-fltk-headers:
-	@${ECHO} "Linking fltk headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}/FL
-	@${RM} -f ${BUILDLINK_INCDIR}/FL/*
-	@for inc in ${FLTK_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/FL/`${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-fltk-libs:
-	@${ECHO} "Linking fltk libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${FLTK_LIBS}; do					\
-		dest=${BUILDLINK_LIBDIR}/`${BASENAME} $${lib}`;		\
-		if [ -f $${lib} ]; then					\
-			${RM} -f $${dest};				\
-			${LN} -sf $${lib} $${dest};			\
-		fi;							\
-	done
+pre-configure: ${BUILDLINK_TARGETS.fltk}
+fltk-buildlink: _BUILDLINK_USE
 
-jlam: ${FLTK_BUILDLINK_COOKIE}
+.include "../../mk/bsd.buildlink.mk"
 
 .endif	# FLTK_BUILDLINK_MK