summaryrefslogtreecommitdiff
path: root/lib/Makefile
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2008-03-25 23:41:51 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2008-03-25 23:41:51 +0000
commit28a817eb7db2b6e503c2664c7d3683be0e3ce5f3 (patch)
tree6ce16dcf1a00f9d4a692ea93e91d6258a79c3316 /lib/Makefile
parentd0296cb2dca77008ac87984bf5fff52ca809195d (diff)
Introduce bsd.xconf.mk to set default config variables used
at several places in the Xenocara build in a central place instead of duplicating the checks all over the place. ok oga@.
Diffstat (limited to 'lib/Makefile')
-rw-r--r--lib/Makefile15
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/Makefile b/lib/Makefile
index ea386c344..4917bcfca 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,4 +1,6 @@
-# $OpenBSD: Makefile,v 1.8 2008/03/21 21:07:48 oga Exp $
+# $OpenBSD: Makefile,v 1.9 2008/03/25 23:41:50 matthieu Exp $
+
+.include <bsd.xconf.mk>
SUBDIR= freetype fontconfig libxtrans libXau libXdmcp \
libX11 libXext libXrender libXft libdmx libfontenc \
@@ -9,14 +11,11 @@ SUBDIR= freetype fontconfig libxtrans libXau libXdmcp \
libXprintAppUtil libXrandr libXRes libXScrnSaver libXTrap \
libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm
-DRM_ARCHES= alpha amd64 i386 macppc sparc64
-
-.for a in $(DRM_ARCHES)
-SUBDIR_$a+= libdrm
-.endfor
-SUBDIR+= $(SUBDIR_$(MACHINE))
+.if ${XENOCARA_BUILD_DRI:L} == "yes"
+SUBDIR+= libdrm
+.endif
-.if ${MACHINE} != "sgi" && ${MACHINE} != "vax"
+.if ${XENOCARA_BUILD_GL:L} == "yes"
SUBDIR+= libGL libGLU libGLw
.endif