diff options
author | jlam <jlam@pkgsrc.org> | 2001-06-10 00:09:29 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-06-10 00:09:29 +0000 |
commit | 5d02f04b3aa2a8553bbc5c5b42fc941c54d5c76d (patch) | |
tree | 7a6bfc07ceedb0e0b8ac1235a0168afecaf37111 /graphics/png | |
parent | 3bc5e40254426847ecde2acbbfab3d3fbc8e20a6 (diff) | |
download | pkgsrc-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 'graphics/png')
-rw-r--r-- | graphics/png/buildlink.mk | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/graphics/png/buildlink.mk b/graphics/png/buildlink.mk index d14901e287e..5b4e57f76d6 100644 --- a/graphics/png/buildlink.mk +++ b/graphics/png/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.3 2001/06/09 15:27:20 wiz Exp $ +# $NetBSD: buildlink.mk,v 1.4 2001/06/10 00:09:32 jlam Exp $ # # This Makefile fragment is included by packages that use libpng. # @@ -7,17 +7,14 @@ # (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_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(PNG_BUILDLINK_MK) PNG_BUILDLINK_MK= # defined -.include "../../devel/zlib/buildlink.mk" - PNG_REQD?= 1.0.11 DEPENDS+= png>=${PNG_REQD}:../../graphics/png @@ -28,8 +25,17 @@ PNG_LIBS= ${LOCALBASE}/lib/libpng.* BUILDLINK_INCDIR?= ${WRKDIR}/include BUILDLINK_LIBDIR?= ${WRKDIR}/lib -BUILDLINK_TARGETS+= link-png-headers -BUILDLINK_TARGETS+= link-png-libs +.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} + +${PNG_BUILDLINK_COOKIE}: ${PNG_BUILDLINK_TARGETS} + @${TOUCH} ${TOUCH_FLAGS} ${PNG_BUILDLINK_COOKIE} # This target links the headers into ${BUILDLINK_INCDIR}, which should # be searched first by the C preprocessor. |