Install libdrm before libGL. That way if we're building X on a clean system

with dri, libGL doesn't fail due to drm.h being missing.

ok matthieu@. Patch from Peter Hessler, thanks!
This commit is contained in:
oga
2008-03-21 21:07:48 +00:00
parent eb303a5123
commit aad4718a0c

View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2007/10/27 19:57:48 matthieu Exp $
# $OpenBSD: Makefile,v 1.8 2008/03/21 21:07:48 oga Exp $
SUBDIR= freetype fontconfig libxtrans libXau libXdmcp \
libX11 libXext libXrender libXft libdmx libfontenc \
@@ -9,6 +9,13 @@ 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 ${MACHINE} != "sgi" && ${MACHINE} != "vax"
SUBDIR+= libGL libGLU libGLw
.endif
@@ -18,13 +25,6 @@ SUBDIR+= libGL libGLU libGLw
SUBDIR+= pixman
.endif
DRM_ARCHES= alpha amd64 i386 macppc sparc64
.for a in $(DRM_ARCHES)
SUBDIR_$a+= libdrm
.endfor
SUBDIR+= $(SUBDIR_$(MACHINE))
.include <bsd.subdir.mk>
build: _SUBDIRUSE