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 /converters | |
| 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 'converters')
| -rw-r--r-- | converters/libiconv/buildlink.mk | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/converters/libiconv/buildlink.mk b/converters/libiconv/buildlink.mk index d57c487a110..fd634fad410 100644 --- a/converters/libiconv/buildlink.mk +++ b/converters/libiconv/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/05/26 08:10:43 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/06/10 00:09:29 jlam Exp $ # # This Makefile fragment is included by packages that use libiconv. # @@ -7,10 +7,9 @@ # (1) Optionally define ICONV_REQD to the version of libiconv 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(ICONV_BUILDLINK_MK) @@ -27,8 +26,15 @@ ICONV_LIBS+= ${LOCALBASE}/lib/libiconv.* BUILDLINK_INCDIR?= ${WRKDIR}/include BUILDLINK_LIBDIR?= ${WRKDIR}/lib -BUILDLINK_TARGETS+= link-iconv-headers -BUILDLINK_TARGETS+= link-iconv-libs +ICONV_BUILDLINK_COOKIE= ${WRKDIR}/.iconv_buildlink_done +ICONV_BUILDLINK_TARGETS= link-iconv-headers +ICONV_BUILDLINK_TARGETS+= link-iconv-libs +BUILDLINK_TARGETS+= ${ICONV_BUILDLINK_COOKIE} + +pre-configure: ${ICONV_BUILDLINK_COOKIE} + +${ICONV_BUILDLINK_COOKIE}: ${ICONV_BUILDLINK_TARGETS} + @${TOUCH} ${TOUCH_FLAGS} ${ICONV_BUILDLINK_COOKIE} # This target links the headers into ${BUILDLINK_INCDIR}, which should # be searched first by the C preprocessor. |