Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/devel/zlib/Attic/buildlink.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- pkgsrc/devel/zlib/Attic/buildlink.mk 2001/05/26 16:30:18 1.1 +++ pkgsrc/devel/zlib/Attic/buildlink.mk 2001/06/10 00:09:31 1.2 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/05/26 16:30:18 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/06/10 00:09:31 jlam Exp $ # # This Makefile fragment is included by packages that use zlib. # @@ -7,10 +7,9 @@ # (1) Optionally define ZLIB_REQD to the version of zlib 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(ZLIB_BUILDLINK_MK) @@ -38,8 +37,15 @@ ZLIB_LIBS= /usr/lib/libz.* BUILDLINK_INCDIR?= ${WRKDIR}/include BUILDLINK_LIBDIR?= ${WRKDIR}/lib -BUILDLINK_TARGETS+= link-zlib-headers -BUILDLINK_TARGETS+= link-zlib-libs +ZLIB_BUILDLINK_COOKIE= ${WRKDIR}/.zlib_buildlink_done +ZLIB_BUILDLINK_TARGETS= link-zlib-headers +ZLIB_BUILDLINK_TARGETS+= link-zlib-libs +BUILDLINK_TARGETS+= ${ZLIB_BUILDLINK_COOKIE} + +pre-configure: ${ZLIB_BUILDLINK_COOKIE} + +${ZLIB_BUILDLINK_COOKIE}: ${ZLIB_BUILDLINK_TARGETS} + @${TOUCH} ${TOUCH_FLAGS} ${ZLIB_BUILDLINK_COOKIE} # This target links the headers into ${BUILDLINK_INCDIR}, which should # be searched first by the C preprocessor.