Module Name: src
Committed By: mrg
Date: Sat May 22 08:52:34 UTC 2010
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/libGL: Makefile
Added Files:
src/external/mit/xorg/lib/libGL/internal: Makefile
Log Message:
install GL/internal/sarea.h and GL/internal/dri_interface.h, like Mesa does.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libGL/internal/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.102 src/distrib/sets/lists/xcomp/mi:1.103
--- src/distrib/sets/lists/xcomp/mi:1.102 Sat May 22 06:21:05 2010
+++ src/distrib/sets/lists/xcomp/mi Sat May 22 08:52:33 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.102 2010/05/22 06:21:05 mrg Exp $
+# $NetBSD: mi,v 1.103 2010/05/22 08:52:33 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5188,7 +5188,9 @@
./usr/X11R7/include/GL/glxmd.h -unknown- xorg
./usr/X11R7/include/GL/glxproto.h -unknown- xorg
./usr/X11R7/include/GL/glxtokens.h -unknown- xorg
+./usr/X11R7/include/GL/internal/dri_interface.h -unknown- xorg
./usr/X11R7/include/GL/internal/glcore.h -unknown- xorg
+./usr/X11R7/include/GL/internal/sarea.h -unknown- xorg
./usr/X11R7/include/GL/osmesa.h -unknown- xorg
./usr/X11R7/include/GL/xmesa.h -unknown- xorg
./usr/X11R7/include/GL/xmesa_x.h -unknown- xorg
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.10 src/external/mit/xorg/lib/libGL/Makefile:1.11
--- src/external/mit/xorg/lib/libGL/Makefile:1.10 Thu Oct 8 19:06:50 2009
+++ src/external/mit/xorg/lib/libGL/Makefile Sat May 22 08:52:34 2010
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2009/10/08 19:06:50 snj Exp $
+# $NetBSD: Makefile,v 1.11 2010/05/22 08:52:34 mrg Exp $
.include <bsd.own.mk>
LIB= GL
+SUBDIR= internal
+
# glx
.PATH: ${X11SRCDIR.MesaLib}/src/glx/x11
SRCS.glx= glcontextmodes.c clientattrib.c compsize.c eval.c glxcmds.c \
@@ -102,3 +104,4 @@
.include <bsd.x11.mk>
.include <bsd.lib.mk>
+.include <bsd.subdir.mk>
Added files:
Index: src/external/mit/xorg/lib/libGL/internal/Makefile
diff -u /dev/null src/external/mit/xorg/lib/libGL/internal/Makefile:1.1
--- /dev/null Sat May 22 08:52:34 2010
+++ src/external/mit/xorg/lib/libGL/internal/Makefile Sat May 22 08:52:34 2010
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2010/05/22 08:52:34 mrg Exp $
+
+.include <bsd.own.mk>
+
+.PATH: ${X11SRCDIR.MesaLib}/include/GL/internal
+
+INCS= dri_interface.h sarea.h
+INCSDIR=${X11INCDIR}/GL/internal
+
+NOOBJ= # defined
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
