From 9feea48248042660af088743e08faa7eb4967ebb Mon Sep 17 00:00:00 2001 From: joerg Date: Sun, 14 Jan 2007 09:10:45 +0000 Subject: Modular Xorg support. XXX The conditionals for the native case are nasty. --- wm/waimea/Makefile | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'wm/waimea') diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile index 7bd3f6b77d2..5d0fcf55144 100644 --- a/wm/waimea/Makefile +++ b/wm/waimea/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2006/12/15 20:33:02 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2007/01/14 09:10:45 joerg Exp $ # DISTNAME= waimea-0.4.0 @@ -16,16 +16,28 @@ USE_TOOLS+= gmake perl:run pkg-config .include "../../mk/bsd.prefs.mk" -.if !exists(${X11BASE}/include/X11/extensions/Xinerama.h) -CONFIGURE_ARGS+= --disable-xinerama -.endif +BUILDLINK_DEPMETHOD.libXt?= build -.if !exists(${X11BASE}/include/X11/extensions/Xrender.h) -CONFIGURE_ARGS+= --disable-render -.endif +.include "../../x11/libSM/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" -.if !exists(${X11BASE}/include/X11/extensions/shape.h) +.if ${X11_TYPE} != "native" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXinerama/buildlink3.mk" +.include "../../x11/libXrandr/buildlink3.mk" +.include "../../x11/libXrender/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" +.else +. if !exists(${X11BASE}/include/X11/extensions/Xinerama.h) +CONFIGURE_ARGS+= --disable-xinerama +. endif +. if !exists(${X11BASE}/include/X11/extensions/Xrender.h) +CONFIGURE_ARGS+= --disable-render +. endif +. if !exists(${X11BASE}/include/X11/extensions/shape.h) CONFIGURE_ARGS+= --disable-shape +. endif .endif CONFIGURE_ARGS+= --disable-randr -- cgit v1.2.3