diff options
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | lib/Makefile | 8 | ||||
| -rw-r--r-- | share/mk/bsd.xconf.mk | 5 |
3 files changed, 6 insertions, 14 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.69 2016/03/11 13:09:42 okan Exp $ +# $OpenBSD: Makefile,v 1.70 2016/04/01 03:15:15 jsg Exp $ .include <bsd.own.mk> .include <bsd.xconf.mk> @@ -10,9 +10,8 @@ RM?=rm XSERVER= xserver -.if defined(XENOCARA_BUILD_PIXMAN) -.if ${XENOCARA_BUILD_PIXMAN:L} == "yes" && \ - ${XENOCARA_BUILD_GL:L} == "yes" +.if defined(XENOCARA_BUILD_GL) +.if ${XENOCARA_BUILD_GL:L} == "yes" XSERVER+= kdrive .endif .endif diff --git a/lib/Makefile b/lib/Makefile index 2fe4d0399..32c46fca7 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2015/11/22 07:57:10 jsg Exp $ +# $OpenBSD: Makefile,v 1.30 2016/04/01 03:15:15 jsg Exp $ .include <bsd.xconf.mk> @@ -44,11 +44,7 @@ SUBDIR= libpthread-stubs \ libXi libXinerama libxkbfile libxkbui \ libXrandr libXRes libXScrnSaver \ libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm \ - libpciaccess - -.if ${XENOCARA_BUILD_PIXMAN:L} == "yes" -SUBDIR+= pixman -.endif + libpciaccess pixman .if ${XENOCARA_BUILD_GL:L} == "yes" SUBDIR+= libdrm diff --git a/share/mk/bsd.xconf.mk b/share/mk/bsd.xconf.mk index e271a9071..4603c4afe 100644 --- a/share/mk/bsd.xconf.mk +++ b/share/mk/bsd.xconf.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.xconf.mk,v 1.33 2016/03/11 13:09:42 okan Exp $ +# $OpenBSD: bsd.xconf.mk,v 1.34 2016/04/01 03:15:15 jsg Exp $ # Build GL libs and apps? .if ${MACHINE_ARCH} == "m88k" @@ -8,6 +8,3 @@ XENOCARA_BUILD_DRI?=no XENOCARA_BUILD_GL?=yes XENOCARA_BUILD_DRI?=yes .endif - -# Build pixman? -XENOCARA_BUILD_PIXMAN?=yes |