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

1 files changed, 12 insertions, 45 deletions

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