diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-17 09:13:33 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-17 09:13:33 +0000 |
| commit | 0eb0b64bfbc9cb34393f6a2b03dc6237e36ad895 (patch) | |
| tree | 79add5a0e75387254da41f7bae99b834a6966c6b /x11 | |
| parent | bad42f1f3f91c57da6094148f3d47577065caee8 (diff) | |
| download | pkgsrc-0eb0b64bfbc9cb34393f6a2b03dc6237e36ad895.tar.gz | |
Don't include other buildlink3.mk files if we're just checking whether the
software is built-in.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/Xrandr-mixedcase/buildlink3.mk | 8 | ||||
| -rw-r--r-- | x11/Xrender/buildlink3.mk | 8 | ||||
| -rw-r--r-- | x11/xcursor/buildlink3.mk | 8 |
3 files changed, 15 insertions, 9 deletions
diff --git a/x11/Xrandr-mixedcase/buildlink3.mk b/x11/Xrandr-mixedcase/buildlink3.mk index be940492283..99bbb6906d2 100644 --- a/x11/Xrandr-mixedcase/buildlink3.mk +++ b/x11/Xrandr-mixedcase/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2004/02/16 22:45:34 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2004/02/17 09:13:33 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRANDR_BUILDLINK3_MK:= ${XRANDR_BUILDLINK3_MK}+ @@ -127,9 +127,11 @@ BUILDLINK_DEPENDS+= Xrandr BUILDLINK_PREFIX.Xrandr= ${X11BASE} . endif USE_X11= yes +. if !empty(BUILDLINK_CHECK_BUILTIN.Xrandr:M[nN][oO]) BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 -. include "../../x11/randrext/buildlink3.mk" -. include "../../x11/Xrender/buildlink3.mk" +. include "../../x11/randrext/buildlink3.mk" +. include "../../x11/Xrender/buildlink3.mk" +. endif .endif # XRANDR_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index 266b875b8fa..4cc5c8421b0 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.22 2004/02/16 21:04:39 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2004/02/17 09:13:33 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ @@ -129,10 +129,12 @@ BUILDLINK_DEPENDS+= Xrender BUILDLINK_PREFIX.Xrender= ${X11BASE} . endif USE_X11= yes -. if !empty(BUILDLINK_DEPENDS.Xrender:MXrender>=0.8*) +. if !empty(BUILDLINK_CHECK_BUILTIN.Xrender:M[nN][oO]) +. if !empty(BUILDLINK_DEPENDS.Xrender:MXrender>=0.8*) BUILDLINK_DEPENDS.render+= render>=0.8 +. endif +. include "../../x11/render/buildlink3.mk" . endif -. include "../../x11/render/buildlink3.mk" .endif # XRENDER_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/x11/xcursor/buildlink3.mk b/x11/xcursor/buildlink3.mk index 261fb549486..77dd523712d 100644 --- a/x11/xcursor/buildlink3.mk +++ b/x11/xcursor/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2004/02/16 23:16:02 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2004/02/17 09:13:33 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XCURSOR_BUILDLINK3_MK:= ${XCURSOR_BUILDLINK3_MK}+ @@ -90,9 +90,11 @@ BUILDLINK_DEPENDS.xcursor+= xcursor>=1.1.1 . if !empty(BUILDLINK_USE_BUILTIN.xcursor:M[yY][eE][sS]) BUILDLINK_PREFIX.xcursor= ${X11BASE} . else +. if !empty(BUILDLINK_CHECK_BUILTIN.xcursor:M[nN][oO]) BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8 -. include "../../x11/Xfixes/buildlink3.mk" -. include "../../x11/Xrender/buildlink3.mk" +. include "../../x11/Xfixes/buildlink3.mk" +. include "../../x11/Xrender/buildlink3.mk" +. endif . endif USE_X11= yes .endif # XCURSOR_BUILDLINK3_MK |