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

1 files changed, 15 insertions, 50 deletions

diff --git a/devel/rvm/buildlink.mk b/devel/rvm/buildlink.mk
index 8ae5b8fab88..7a776b9f281 100644
--- a/devel/rvm/buildlink.mk
+++ b/devel/rvm/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:35 jlam Exp $
 #
 # This Makefile fragment is included by packages that use rvm.
 #
@@ -6,11 +6,9 @@
 #
 # (1) Optionally define RVM_REQD to the version of rvm 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(RVM_BUILDLINK_MK)
@@ -19,55 +17,22 @@ RVM_BUILDLINK_MK=	# defined
 RVM_REQD?=		1.3
 DEPENDS+=		rvm>=${RVM_REQD}:../../devel/rvm
 
-RVM_HEADERS=		${LOCALBASE}/include/rvm/*
-RVM_LIBS=		${LOCALBASE}/lib/librds.*
-RVM_LIBS+=		${LOCALBASE}/lib/librdslwp.*
-RVM_LIBS+=		${LOCALBASE}/lib/librvm.*
-RVM_LIBS+=		${LOCALBASE}/lib/librvmlwp.*
-RVM_LIBS+=		${LOCALBASE}/lib/libseg.*
-
-BUILDLINK_INCDIR?=	${WRKDIR}/include
-BUILDLINK_LIBDIR?=	${WRKDIR}/lib
+BUILDLINK_PREFIX.rvm=	${LOCALBASE}
+BUILDLINK_FILES.rvm=	include/rvm/*
+BUILDLINK_FILES.rvm+=	lib/librds.*
+BUILDLINK_FILES.rvm+=	lib/librdslwp.*
+BUILDLINK_FILES.rvm+=	lib/librvm.*
+BUILDLINK_FILES.rvm+=	lib/librvmlwp.*
+BUILDLINK_FILES.rvm+=	lib/libseg.*
 
 .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}
+BUILDLINK_TARGETS.rvm=	rvm-buildlink
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.rvm}
 
-${RVM_BUILDLINK_COOKIE}: ${RVM_BUILDLINK_TARGETS}
-	@${TOUCH} ${TOUCH_FLAGS} ${RVM_BUILDLINK_COOKIE}
+pre-configure: ${BUILDLINK_TARGETS.rvm}
+rvm-buildlink: _BUILDLINK_USE
 
-# This target links the headers into ${BUILDLINK_INCDIR}, which should
-# be searched first by the C preprocessor.
-#
-link-rvm-headers:
-	@${ECHO} "Linking rvm headers into ${BUILDLINK_INCDIR}."
-	@${MKDIR} ${BUILDLINK_INCDIR}/rvm
-	@${RM} -f ${BUILDLINK_INCDIR}/rvm/*
-	@for inc in ${RVM_HEADERS}; do					\
-		dest=${BUILDLINK_INCDIR}/rvm/`${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-rvm-libs:
-	@${ECHO} "Linking rvm libraries into ${BUILDLINK_LIBDIR}."
-	@${MKDIR} ${BUILDLINK_LIBDIR}
-	@for lib in ${RVM_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	# RVM_BUILDLINK_MK