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 /devel | |
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 'devel')
-rw-r--r-- | devel/gettext-lib/buildlink.mk | 18 | ||||
-rw-r--r-- | devel/gmp/buildlink.mk | 18 | ||||
-rw-r--r-- | devel/libgetopt/buildlink.mk | 18 | ||||
-rw-r--r-- | devel/lwp/buildlink.mk | 18 | ||||
-rw-r--r-- | devel/readline/buildlink.mk | 20 | ||||
-rw-r--r-- | devel/rpc2/buildlink.mk | 22 | ||||
-rw-r--r-- | devel/rvm/buildlink.mk | 17 | ||||
-rw-r--r-- | devel/zlib/buildlink.mk | 18 |
8 files changed, 99 insertions, 50 deletions
diff --git a/devel/gettext-lib/buildlink.mk b/devel/gettext-lib/buildlink.mk index 08f0b33a7a9..8afeb4b9476 100644 --- a/devel/gettext-lib/buildlink.mk +++ b/devel/gettext-lib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.4 2001/06/09 15:25:18 wiz Exp $ +# $NetBSD: buildlink.mk,v 1.5 2001/06/10 00:09:29 jlam Exp $ # # This Makefile fragment is included by packages that use gettext. # @@ -7,10 +7,9 @@ # (1) Optionally define GETTEXT_REQD to the version of gettext 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(GETTEXT_BUILDLINK_MK) @@ -53,8 +52,15 @@ LDFLAGS+= -L${BUILDLINK_LIBDIR} LIBS+= -lintl .endif -BUILDLINK_TARGETS+= link-gettext-headers -BUILDLINK_TARGETS+= link-gettext-libs +GETTEXT_BUILDLINK_COOKIE= ${WRKDIR}/.gettext_buildlink_done +GETTEXT_BUILDLINK_TARGETS= link-gettext-headers +GETTEXT_BUILDLINK_TARGETS+= link-gettext-libs +BUILDLINK_TARGETS+= ${GETTEXT_BUILDLINK_COOKIE} + +pre-configure: ${GETTEXT_BUILDLINK_COOKIE} + +${GETTEXT_BUILDLINK_COOKIE}: ${GETTEXT_BUILDLINK_TARGETS} + @${TOUCH} ${TOUCH_FLAGS} ${GETTEXT_BUILDLINK_COOKIE} # This target links the headers into ${BUILDLINK_INCDIR}, which should # be searched first by the C preprocessor. diff --git a/devel/gmp/buildlink.mk b/devel/gmp/buildlink.mk index 83a7a0085cf..1c7ef4c5b95 100644 --- a/devel/gmp/buildlink.mk +++ b/devel/gmp/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.1 2001/05/28 05:47:28 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.2 2001/06/10 00:09:30 jlam Exp $ # # This Makefile fragment is included by packages that use gmp. # @@ -7,10 +7,9 @@ # (1) Optionally define GMP_REQD to the version of gmp 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(GMP_BUILDLINK_MK) @@ -25,8 +24,15 @@ GMP_LIBS= ${LOCALBASE}/lib/libgmp.* BUILDLINK_INCDIR?= ${WRKDIR}/include BUILDLINK_LIBDIR?= ${WRKDIR}/lib -BUILDLINK_TARGETS+= link-gmp-headers -BUILDLINK_TARGETS+= link-gmp-libs +GMP_BUILDLINK_COOKIE= ${WRKDIR}/.gmp_buildlink_done +GMP_BUILDLINK_TARGETS= link-gmp-headers +GMP_BUILDLINK_TARGETS+= link-gmp-libs +BUILDLINK_TARGETS+= ${GMP_BUILDLINK_COOKIE} + +pre-configure: ${GMP_BUILDLINK_COOKIE} + +${GMP_BUILDLINK_COOKIE}: ${GMP_BUILDLINK_TARGETS} + @${TOUCH} ${TOUCH_FLAGS} ${GMP_BUILDLINK_COOKIE} # This target links the headers into ${BUILDLINK_INCDIR}, which should # be searched first by the C preprocessor. diff --git a/devel/libgetopt/buildlink.mk b/devel/libgetopt/buildlink.mk index ebf41e5991b..1ba2423ec7a 100644 --- a/devel/libgetopt/buildlink.mk +++ b/devel/libgetopt/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/05/26 05:44:09 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/06/10 00:09:30 jlam Exp $ # # This Makefile fragment is included by packages that use getopt_long(). # @@ -10,10 +10,9 @@ # # (1) Include this Makefile fragment in the package Makefile, # (2) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR, -# (3) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure, -# (4) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header +# (3) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header # search path. -# (5) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search +# (4) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search # path. .if !defined(GETOPT_BUILDLINK_MK) @@ -36,8 +35,15 @@ LIBS+= -lgetopt BUILDLINK_INCDIR?= ${WRKDIR}/include BUILDLINK_LIBDIR?= ${WRKDIR}/lib -BUILDLINK_TARGETS+= link-getopt-headers -BUILDLINK_TARGETS+= link-getopt-libs +GETOPT_BUILDLINK_COOKIE= ${WRKDIR}/.getopt_buildlink_done +GETOPT_BUILDLINK_TARGETS= link-getopt-headers +GETOPT_BUILDLINK_TARGETS+= link-getopt-libs +BUILDLINK_TARGETS+= ${GETOPT_BUILDLINK_COOKIE} + +pre-configure: ${GETOPT_BUILDLINK_COOKIE} + +${GETOPT_BUILDLINK_COOKIE}: ${GETOPT_BUILDLINK_TARGETS} + @${TOUCH} ${TOUCH_FLAGS} ${GETOPT_BUILDLINK_COOKIE} # This target links the headers into ${BUILDLINK_INCDIR}, which should # be searched first by the C preprocessor. diff --git a/devel/lwp/buildlink.mk b/devel/lwp/buildlink.mk index 80c0c95b279..523daee00bb 100644 --- a/devel/lwp/buildlink.mk +++ b/devel/lwp/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/06/09 15:21:03 wiz Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:30 jlam Exp $ # # This Makefile fragment is included by packages that use lwp. # @@ -7,10 +7,9 @@ # (1) Optionally define LWP_REQD to the version of lwp 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(LWP_BUILDLINK_MK) @@ -25,8 +24,15 @@ LWP_LIBS= ${LOCALBASE}/lib/liblwp.* BUILDLINK_INCDIR?= ${WRKDIR}/include BUILDLINK_LIBDIR?= ${WRKDIR}/lib -BUILDLINK_TARGETS+= link-lwp-headers -BUILDLINK_TARGETS+= link-lwp-libs +LWP_BUILDLINK_COOKIE= ${WRKDIR}/.lwp_buildlink_done +LWP_BUILDLINK_TARGETS= link-lwp-headers +LWP_BUILDLINK_TARGETS+= link-lwp-libs +BUILDLINK_TARGETS+= ${LWP_BUILDLINK_COOKIE} + +pre-configure: ${LWP_BUILDLINK_COOKIE} + +${LWP_BUILDLINK_COOKIE}: ${LWP_BUILDLINK_TARGETS} + @${TOUCH} ${TOUCH_FLAGS} ${LWP_BUILDLINK_COOKIE} # This target links the headers into ${BUILDLINK_INCDIR}, which should # be searched first by the C preprocessor. diff --git a/devel/readline/buildlink.mk b/devel/readline/buildlink.mk index c8458f09a9f..980fa67c35f 100644 --- a/devel/readline/buildlink.mk +++ b/devel/readline/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.7 2001/06/05 22:15:01 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.8 2001/06/10 00:09:30 jlam Exp $ # # This Makefile fragment is included by packages that use readline(). # @@ -8,10 +8,9 @@ # (2) Optionally define READLINE_REQD to the version of GNU readline desired. # (3) Include this Makefile fragment in the package Makefile, # (4) Optionally define BUILDLINK_INCDIR and BUILDLINK_LIBDIR, -# (5) Add ${BUILDLINK_TARGETS} to the prerequisite targets for pre-configure, -# (6) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header +# (5) Add ${BUILDLINK_INCDIR} to the front of the C preprocessor's header # search path, and -# (7) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search +# (6) Add ${BUILDLINK_LIBDIR} to the front of the linker's library search # path. # # NOTE: You may need to do some more work to get libedit recognized over @@ -54,11 +53,18 @@ HISTORY_LIBS= /usr/lib/libedit.* BUILDLINK_INCDIR?= ${WRKDIR}/include BUILDLINK_LIBDIR?= ${WRKDIR}/lib -BUILDLINK_TARGETS+= link-readline-headers +READLINE_BUILDLINK_COOKIE= ${WRKDIR}/.readline_buildlink_done +READLINE_BUILDLINK_TARGETS= link-readline-headers .if defined(HAVE_LIBEDIT_READLINE) && defined(USE_LIBTOOL) -BUILDLINK_TARGETS+= editline-libtool-archive +READLINE_BUILDLINK_TARGETS+= editline-libtool-archive .endif -BUILDLINK_TARGETS+= link-readline-libs +READLINE_BUILDLINK_TARGETS+= link-readline-libs +BUILDLINK_TARGETS+= ${READLINE_BUILDLINK_COOKIE} + +pre-configure: ${READLINE_BUILDLINK_COOKIE} + +${READLINE_BUILDLINK_COOKIE}: ${READLINE_BUILDLINK_TARGETS} + @${TOUCH} ${TOUCH_FLAGS} ${READLINE_BUILDLINK_COOKIE} # This target links the headers into ${BUILDLINK_INCDIR}, which should # be searched first by the C preprocessor. diff --git a/devel/rpc2/buildlink.mk b/devel/rpc2/buildlink.mk index f96f5285807..12e634a737f 100644 --- a/devel/rpc2/buildlink.mk +++ b/devel/rpc2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/06/09 15:29:50 wiz Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:31 jlam Exp $ # # This Makefile fragment is included by packages that use rpc2. # @@ -7,17 +7,14 @@ # (1) Optionally define RPC2_REQD to the version of rpc2 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(RPC2_BUILDLINK_MK) RPC2_BUILDLINK_MK= # defined -.include "../../devel/lwp/buildlink.mk" - RPC2_REQD?= 1.10 DEPENDS+= rpc2>=${RPC2_REQD}:../../devel/rpc2 @@ -29,8 +26,17 @@ RPC2_LIBS+= ${LOCALBASE}/lib/libse.* BUILDLINK_INCDIR?= ${WRKDIR}/include BUILDLINK_LIBDIR?= ${WRKDIR}/lib -BUILDLINK_TARGETS+= link-rpc2-headers -BUILDLINK_TARGETS+= link-rpc2-libs +.include "../../devel/lwp/buildlink.mk" + +RPC2_BUILDLINK_COOKIE= ${WRKDIR}/.rpc2_buildlink_done +RPC2_BUILDLINK_TARGETS= link-rpc2-headers +RPC2_BUILDLINK_TARGETS+= link-rpc2-libs +BUILDLINK_TARGETS+= ${RPC2_BUILDLINK_COOKIE} + +pre-configure: ${RPC2_BUILDLINK_COOKIE} + +${RPC2_BUILDLINK_COOKIE}: ${RPC2_BUILDLINK_TARGETS} + @${TOUCH} ${TOUCH_FLAGS} ${RPC2_BUILDLINK_COOKIE} # This target links the headers into ${BUILDLINK_INCDIR}, which should # be searched first by the C preprocessor. diff --git a/devel/rvm/buildlink.mk b/devel/rvm/buildlink.mk index 662a715e304..8ae5b8fab88 100644 --- a/devel/rvm/buildlink.mk +++ b/devel/rvm/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/06/09 15:29:50 wiz Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/06/10 00:09:31 jlam Exp $ # # This Makefile fragment is included by packages that use rvm. # @@ -16,8 +16,6 @@ .if !defined(RVM_BUILDLINK_MK) RVM_BUILDLINK_MK= # defined -.include "../../devel/lwp/buildlink.mk" - RVM_REQD?= 1.3 DEPENDS+= rvm>=${RVM_REQD}:../../devel/rvm @@ -31,8 +29,17 @@ RVM_LIBS+= ${LOCALBASE}/lib/libseg.* BUILDLINK_INCDIR?= ${WRKDIR}/include BUILDLINK_LIBDIR?= ${WRKDIR}/lib -BUILDLINK_TARGETS+= link-rvm-headers -BUILDLINK_TARGETS+= link-rvm-libs +.include "../../devel/lwp/buildlink.mk" + +RVM_BUILDLINK_COOKIE= ${WRKDIR}/.rvm_buildlink_done +RVM_BUILDLINK_TARGETS= link-rvm-headers +RVM_BUILDLINK_TARGETS+= link-rvm-libs +BUILDLINK_TARGETS+= ${RVM_BUILDLINK_COOKIE} + +pre-configure: ${RVM_BUILDLINK_COOKIE} + +${RVM_BUILDLINK_COOKIE}: ${RVM_BUILDLINK_TARGETS} + @${TOUCH} ${TOUCH_FLAGS} ${RVM_BUILDLINK_COOKIE} # This target links the headers into ${BUILDLINK_INCDIR}, which should # be searched first by the C preprocessor. diff --git a/devel/zlib/buildlink.mk b/devel/zlib/buildlink.mk index f052461d5a4..acc96935bee 100644 --- a/devel/zlib/buildlink.mk +++ b/devel/zlib/buildlink.mk @@ -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. |