summaryrefslogtreecommitdiff
path: root/japanese
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-06-10 00:09:29 +0000
committerjlam <jlam@pkgsrc.org>2001-06-10 00:09:29 +0000
commit5d02f04b3aa2a8553bbc5c5b42fc941c54d5c76d (patch)
tree7a6bfc07ceedb0e0b8ac1235a0168afecaf37111 /japanese
parent3bc5e40254426847ecde2acbbfab3d3fbc8e20a6 (diff)
downloadpkgsrc-5d02f04b3aa2a8553bbc5c5b42fc941c54d5c76d.tar.gz
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.
Diffstat (limited to 'japanese')
-rw-r--r--japanese/vflib-lib/buildlink.mk22
1 files changed, 14 insertions, 8 deletions
diff --git a/japanese/vflib-lib/buildlink.mk b/japanese/vflib-lib/buildlink.mk
index 926fe78f1a0..fb3170c85e8 100644
--- a/japanese/vflib-lib/buildlink.mk
+++ b/japanese/vflib-lib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/06/09 15:27:19 wiz Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:32 jlam Exp $
#
# This Makefile fragment is included by packages that use VFlib.
#
@@ -7,17 +7,14 @@
# (1) Optionally define VFLIB_REQD to the version of VFlib 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(VFLIB_BUILDLINK_MK)
VFLIB_BUILDLINK_MK= # defined
-.include "../../graphics/freetype-lib/buildlink.mk"
-
VFLIB_REQD?= 2.24.2
DEPENDS+= ja-vflib-lib>=${VFLIB_REQD}:../../japanese/vflib-lib
@@ -27,8 +24,17 @@ VFLIB_LIBS= ${LOCALBASE}/lib/libVFlib2.*
BUILDLINK_INCDIR?= ${WRKDIR}/include
BUILDLINK_LIBDIR?= ${WRKDIR}/lib
-BUILDLINK_TARGETS+= link-vflib-headers
-BUILDLINK_TARGETS+= link-vflib-libs
+.include "../../graphics/freetype-lib/buildlink.mk"
+
+VFLIB_BUILDLINK_COOKIE= ${WRKDIR}/.vflib_buildlink_done
+VFLIB_BUILDLINK_TARGETS= link-vflib-headers
+VFLIB_BUILDLINK_TARGETS+= link-vflib-libs
+BUILDLINK_TARGETS+= ${VFLIB_BUILDLINK_COOKIE}
+
+pre-configure: ${VFLIB_BUILDLINK_COOKIE}
+
+${VFLIB_BUILDLINK_COOKIE}: ${VFLIB_BUILDLINK_TARGETS}
+ @${TOUCH} ${TOUCH_FLAGS} ${VFLIB_BUILDLINK_COOKIE}
# This target links the headers into ${BUILDLINK_INCDIR}, which should
# be searched first by the C preprocessor.