Module Name:    src
Committed By:   mrg
Date:           Tue Jan 12 00:57:45 UTC 2010

Modified Files:
        src/external/mit/xorg/lib/dri/i915: Makefile
        src/external/mit/xorg/lib/dri/i965: Makefile

Log Message:
replace LIBS with LIBDPLIBS.  makes these actually link against drm_intel.
should fix a problem reported by s...@.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/i965/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/dri/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.4 src/external/mit/xorg/lib/dri/i915/Makefile:1.5
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.4	Mon Nov  9 02:38:24 2009
+++ src/external/mit/xorg/lib/dri/i915/Makefile	Tue Jan 12 00:57:45 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/11/09 02:38:24 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/01/12 00:57:45 mrg Exp $
 
 MODULE=	i915
 
@@ -58,6 +58,6 @@
 
 CPPFLAGS+=	 -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP
 
-LIBS+=	-ldrm_intel
+LIBDPLIBS+=	drm_intel	${.CURDIR}/../../libdrm_intel
 
 .include "${.CURDIR}/../dri.mk"

Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.6 src/external/mit/xorg/lib/dri/i965/Makefile:1.7
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.6	Sun Jan 10 17:35:33 2010
+++ src/external/mit/xorg/lib/dri/i965/Makefile	Tue Jan 12 00:57:45 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/01/10 17:35:33 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2010/01/12 00:57:45 mrg Exp $
 
 MODULE=	i965
 
@@ -89,6 +89,6 @@
 
 COPTS.brw_draw_upload.c=	-Wno-error
 
-LIBS+=	-ldrm_intel
+LIBDPLIBS+=	drm_intel	${.CURDIR}/../../libdrm_intel
 
 .include "${.CURDIR}/../dri.mk"

Reply via email to