mirror of
https://github.com/openbsd/xenocara.git
synced 2025-12-14 13:19:23 +00:00
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:
16
lib/Makefile
16
lib/Makefile
@@ -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 \
|
SUBDIR= freetype fontconfig libxtrans libXau libXdmcp \
|
||||||
libX11 libXext libXrender libXft libdmx libfontenc \
|
libX11 libXext libXrender libXft libdmx libfontenc \
|
||||||
@@ -9,6 +9,13 @@ SUBDIR= freetype fontconfig libxtrans libXau libXdmcp \
|
|||||||
libXprintAppUtil libXrandr libXRes libXScrnSaver libXTrap \
|
libXprintAppUtil libXrandr libXRes libXScrnSaver libXTrap \
|
||||||
libXtst libXv libXvMC libXxf86dga libXxf86misc libXxf86vm
|
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"
|
.if ${MACHINE} != "sgi" && ${MACHINE} != "vax"
|
||||||
SUBDIR+= libGL libGLU libGLw
|
SUBDIR+= libGL libGLU libGLw
|
||||||
.endif
|
.endif
|
||||||
@@ -18,13 +25,6 @@ SUBDIR+= libGL libGLU libGLw
|
|||||||
SUBDIR+= pixman
|
SUBDIR+= pixman
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
DRM_ARCHES= alpha amd64 i386 macppc sparc64
|
|
||||||
|
|
||||||
.for a in $(DRM_ARCHES)
|
|
||||||
SUBDIR_$a+= libdrm
|
|
||||||
.endfor
|
|
||||||
SUBDIR+= $(SUBDIR_$(MACHINE))
|
|
||||||
|
|
||||||
.include <bsd.subdir.mk>
|
.include <bsd.subdir.mk>
|
||||||
|
|
||||||
build: _SUBDIRUSE
|
build: _SUBDIRUSE
|
||||||
|
|||||||
Reference in New Issue
Block a user