BSD make is choking on some of the mesa Imakefiles in mesa-4-0-branch. A
patch is attached, which I think is correct.
Index: xc/lib/GL/mesa/src/math/Imakefile
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/math/Attic/Imakefile,v
retrieving revision 1.1.4.3
diff -u -r1.1.4.3 Imakefile
--- xc/lib/GL/mesa/src/math/Imakefile 2002/01/29 19:42:27 1.1.4.3
+++ xc/lib/GL/mesa/src/math/Imakefile 2002/02/04 21:48:17
@@ -52,7 +52,7 @@
-I../../../include
INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
- SRCS = m_debug_clip.c \
+SRCS = m_debug_clip.c \
m_debug_norm.c \
m_debug_xform.c \
m_debug_vertex.c \
@@ -63,7 +63,7 @@
m_vertices.c \
m_xform.c
- OBJS = m_debug_clip.o \
+OBJS = m_debug_clip.o \
m_debug_norm.o \
m_debug_xform.o \
m_debug_vertex.o \
Index: xc/lib/GL/mesa/src/swrast/Imakefile
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/swrast/Attic/Imakefile,v
retrieving revision 1.1.4.3
diff -u -r1.1.4.3 Imakefile
--- xc/lib/GL/mesa/src/swrast/Imakefile 2002/01/29 19:42:27 1.1.4.3
+++ xc/lib/GL/mesa/src/swrast/Imakefile 2002/02/04 21:48:17
@@ -73,7 +73,7 @@
-I../../../include
INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
- SRCS = s_aaline.c \
+SRCS = s_aaline.c \
s_aatriangle.c \
s_accum.c \
s_alpha.c \
@@ -104,7 +104,7 @@
s_triangle.c \
s_zoom.c
- OBJS = s_aaline.o \
+ OBJS = s_aaline.o \
s_aatriangle.o \
s_accum.o \
s_alpha.o \
Index: xc/lib/GL/mesa/src/tnl/Imakefile
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/tnl/Attic/Imakefile,v
retrieving revision 1.1.4.3
diff -u -r1.1.4.3 Imakefile
--- xc/lib/GL/mesa/src/tnl/Imakefile 2002/01/29 19:42:28 1.1.4.3
+++ xc/lib/GL/mesa/src/tnl/Imakefile 2002/02/04 21:48:17
@@ -88,7 +88,7 @@
t_vb_texmat.c \
t_vb_vertex.c
- OBJS = t_array_api.o \
+ OBJS = t_array_api.o \
t_array_import.o \
t_context.o \
t_eval_api.o \
Index: xc/lib/GL/mesa/src/tnl_dd/Imakefile
===================================================================
RCS file: /cvsroot/dri/xc/xc/lib/GL/mesa/src/tnl_dd/Attic/Imakefile,v
retrieving revision 1.1.4.3
diff -u -r1.1.4.3 Imakefile
--- xc/lib/GL/mesa/src/tnl_dd/Imakefile 2002/01/29 19:42:28 1.1.4.3
+++ xc/lib/GL/mesa/src/tnl_dd/Imakefile 2002/02/04 21:48:17
@@ -44,10 +44,10 @@
-I$(MESASRCDIR)/include \
-I../../../include
- INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
- SRCS =
+INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
+SRCS =
- OBJS =
+OBJS =
#ifdef i386Architecture
ASM_SRCS =
Index: xc/programs/Xserver/GL/mesa/src/math/Imakefile
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/GL/mesa/src/math/Attic/Imakefile,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 Imakefile
--- xc/programs/Xserver/GL/mesa/src/math/Imakefile 2001/10/30 21:57:16 1.1.4.2
+++ xc/programs/Xserver/GL/mesa/src/math/Imakefile 2002/02/04 21:48:18
@@ -42,7 +42,7 @@
m_vertices.c \
m_xform.c
- OBJS = m_debug_clip.o \
+ OBJS = m_debug_clip.o \
m_debug_norm.o \
m_debug_vertex.o \
m_debug_xform.o \
Index: xc/programs/Xserver/GL/mesa/src/swrast/Imakefile
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/GL/mesa/src/swrast/Attic/Imakefile,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 Imakefile
--- xc/programs/Xserver/GL/mesa/src/swrast/Imakefile 2001/10/30 21:57:16 1.1.4.2
+++ xc/programs/Xserver/GL/mesa/src/swrast/Imakefile 2002/02/04 21:48:18
@@ -96,7 +96,7 @@
s_triangle.c \
s_zoom.c
- OBJS = s_aaline.o \
+ OBJS = s_aaline.o \
s_aatriangle.o \
s_accum.o \
s_alpha.o \
Index: xc/programs/Xserver/GL/mesa/src/tnl/Imakefile
===================================================================
RCS file: /cvsroot/dri/xc/xc/programs/Xserver/GL/mesa/src/tnl/Attic/Imakefile,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 Imakefile
--- xc/programs/Xserver/GL/mesa/src/tnl/Imakefile 2001/10/30 21:57:17 1.1.4.2
+++ xc/programs/Xserver/GL/mesa/src/tnl/Imakefile 2002/02/04 21:48:18
@@ -65,7 +65,7 @@
t_vb_texmat.c \
t_vb_vertex.c
- OBJS = t_array_api.o \
+ OBJS = t_array_api.o \
t_array_import.o \
t_context.o \
t_eval_api.o \
