Index: src/mesa/Makefile
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- src/mesa/Makefile	14 Sep 2005 02:18:43 -0000	1.34
+++ src/mesa/Makefile	22 Sep 2005 10:53:23 -0000
@@ -84,44 +84,43 @@
 
 STAND_ALONE_DRIVER_OBJECTS = $(STAND_ALONE_DRIVER_SOURCES:.c=.o)
 
-STAND_ALONE_OBJECTS = \
+LIBGL_OBJECTS = \
 	$(CORE_OBJECTS) \
 	$(STAND_ALONE_DRIVER_OBJECTS)
 
+OSMESA_OBJECTS = $(OSMESA_DRIVER_OBJECTS)
+
+OSMESA_TINY = $(GL_TINY)
+
 # For libOSMesa16 or libOSMesa32 we link _all_ the objects into the library,
 # not just the osmesa.o object (i.e. we don't have a libGL).
-OSMESA16_OBJECTS = \
+ifeq ("${DRIVER_DIRS}","osmesa")
+OSMESA_OBJECTS = \
 	$(CORE_OBJECTS) \
 	$(COMMON_DRIVER_OBJECTS) \
 	$(OSMESA_DRIVER_OBJECTS)
 
+OSMESA_TINY = $(MESA_TINY)
+endif
 
 stand-alone: depend subdirs $(LIB_DIR)/$(GL_LIB_NAME) $(LIB_DIR)/$(OSMESA_LIB_NAME)
 
 osmesa-only: depend subdirs $(LIB_DIR)/$(OSMESA_LIB_NAME)
 
 # Make the GL library
-$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS)
+$(LIB_DIR)/$(GL_LIB_NAME): $(LIBGL_OBJECTS)
 	@ $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
 		-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
 		-install $(LIB_DIR) \
-		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(STAND_ALONE_OBJECTS)
+		$(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(LIBGL_OBJECTS)
 
 # Make the OSMesa library
-$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) $(OSMESA16_OBJECTS)
-	@ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
-		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
-			-major $(MESA_MAJOR) \
-			-minor $(MESA_MINOR) -patch $(MESA_TINY) \
-			-install $(LIB_DIR) $(MKLIB_OPTIONS) \
-			$(OSMESA_LIB_DEPS) $(OSMESA16_OBJECTS) ; \
-	else \
-		$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
-			-major $(MESA_MAJOR) \
-			-minor $(MESA_MINOR) -patch $(GL_TINY) \
-			-install $(LIB_DIR) $(MKLIB_OPTIONS) \
-			$(OSMESA_LIB_DEPS) $(OSMESA_DRIVER_OBJECTS) ; \
-	fi
+$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_OBJECTS)
+	$(TOP)/bin/mklib -o $(OSMESA_LIB) -linker '$(CC)' \
+		-major $(MESA_MAJOR) \
+		-minor $(MESA_MINOR) -patch $(OSMESA_TINY) \
+		-install $(LIB_DIR) \
+		$(MKLIB_OPTIONS) $(OSMESA_LIB_DEPS) $(OSMESA_OBJECTS)
 
 
 ######################################################################
@@ -139,6 +138,7 @@
 depend: $(ALL_SOURCES)
 	@ echo "running $(MKDEP)"
 	@ touch depend
+	@ $(MAKE) subdirs
 	$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
 		> /dev/null 
 
Index: src/mesa/drivers/dri/Makefile.template
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/Makefile.template,v
retrieving revision 1.29
diff -u -r1.29 Makefile.template
--- src/mesa/drivers/dri/Makefile.template	14 Sep 2005 00:33:03 -0000	1.29
+++ src/mesa/drivers/dri/Makefile.template	22 Sep 2005 10:53:24 -0000
@@ -13,22 +13,14 @@
         ../common/drirenderbuffer.c
 
 ifeq ($(WINDOW_SYSTEM),dri)
-WINOBJ=
-WINLIB=
-INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES) \
-           `pkg-config --cflags libdrm`
+INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)
 
 OBJECTS = $(C_SOURCES:.c=.o) \
 	  $(ASM_SOURCES:.S=.o) 
 
 else
-WINOBJ=
-WINLIB=-L$(MESA)/src/glx/mini
 MINIGLX_INCLUDES = -I$(TOP)/src/glx/mini
-INCLUDES = $(MINIGLX_INCLUDES) \
-	   -I$(DRM_SOURCE_PATH)/shared-core \
-	   -I$(DRM_SOURCE_PATH)/libdrm \
-	   $(SHARED_INCLUDES)
+INCLUDES = $(MINIGLX_INCLUDES) $(SHARED_INCLUDES)
 
 OBJECTS = $(C_SOURCES:.c=.o) \
 	  $(MINIGLX_SOURCES:.c=.o) \
@@ -41,17 +33,13 @@
 	-I. \
 	-I$(TOP)/src/mesa/drivers/dri/common \
 	-Iserver \
-	-I$(DRM_SOURCE_PATH)/shared-core \
+	`pkg-config --cflags libdrm` \
 	-I$(TOP)/include \
 	-I$(TOP)/include/GL/internal \
 	-I$(TOP)/src/mesa \
 	-I$(TOP)/src/mesa/main \
 	-I$(TOP)/src/mesa/glapi \
-	-I$(TOP)/src/mesa/math \
-	-I$(TOP)/src/mesa/transform \
 	-I$(TOP)/src/mesa/shader \
-	-I$(TOP)/src/mesa/swrast \
-	-I$(TOP)/src/mesa/swrast_setup \
 	-I$(TOP)/src/egl/main \
 	-I$(TOP)/src/egl/drivers/dri
 
@@ -69,14 +57,9 @@
 default: depend symlinks $(LIBNAME) $(LIB_DIR)/$(LIBNAME)
 
 
-#$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
-#	@echo BUILDING FOR: $(WINDOW_SYSTEM)
-#	$(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \
-#		$(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES) $(OBJECTS)
-
-$(LIBNAME):  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
+$(LIBNAME):  $(OBJECTS) $(MESA_MODULES) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
 	$(TOP)/bin/mklib -noprefix -o $@ \
-		$(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
+		$(OBJECTS) $(MESA_MODULES) $(DRI_LIB_DEPS)
 
 
 $(LIB_DIR)/$(LIBNAME): $(LIBNAME)
Index: configs/linux-debug
===================================================================
RCS file: /cvs/mesa/Mesa/configs/linux-debug,v
retrieving revision 1.6
diff -u -r1.6 linux-debug
--- configs/linux-debug	2 Jul 2005 07:38:40 -0000	1.6
+++ configs/linux-debug	22 Sep 2005 10:53:22 -0000
@@ -5,4 +5,4 @@
 CONFIG_NAME = linux-debug
 
 OPT_FLAGS = -g
-DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK
+DEFINES += -DDEBUG -DMESA_DEBUG -DDEBUG_MATH
Index: configs/linux-x86-64-debug
===================================================================
RCS file: /cvs/mesa/Mesa/configs/linux-x86-64-debug,v
retrieving revision 1.2
diff -u -r1.2 linux-x86-64-debug
--- configs/linux-x86-64-debug	2 Jul 2005 07:38:40 -0000	1.2
+++ configs/linux-x86-64-debug	22 Sep 2005 10:53:22 -0000
@@ -4,4 +4,4 @@
 
 CONFIG_NAME = linux-x86-64-debug
 
-DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK
+DEFINES += -DDEBUG -DMESA_DEBUG -DDEBUG_MATH
Index: configs/linux-x86-debug
===================================================================
RCS file: /cvs/mesa/Mesa/configs/linux-x86-debug,v
retrieving revision 1.2
diff -u -r1.2 linux-x86-debug
--- configs/linux-x86-debug	2 Jul 2005 07:38:40 -0000	1.2
+++ configs/linux-x86-debug	22 Sep 2005 10:53:22 -0000
@@ -6,4 +6,4 @@
 CONFIG_NAME = linux-x86-debug
 
 OPT_FLAGS = -g
-DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK
+DEFINES += -DDEBUG -DMESA_DEBUG -DDEBUG_MATH
Index: src/mesa/math/m_debug_clip.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/math/m_debug_clip.c,v
retrieving revision 1.9
diff -u -r1.9 m_debug_clip.c
--- src/mesa/math/m_debug_clip.c	23 Jul 2004 15:45:56 -0000	1.9
+++ src/mesa/math/m_debug_clip.c	22 Sep 2005 10:53:34 -0000
@@ -41,7 +41,7 @@
 static char dummy;
 #endif
 
-#ifdef DEBUG  /* This code only used for debugging */
+#ifdef DEBUG_MATH  /* This code only used for debugging */
 
 static clip_func *clip_tab[2] = {
    _mesa_clip_tab,
@@ -368,4 +368,4 @@
 }
 
 
-#endif /* DEBUG */
+#endif /* DEBUG_MATH */
Index: src/mesa/math/m_debug_norm.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/math/m_debug_norm.c,v
retrieving revision 1.16
diff -u -r1.16 m_debug_norm.c
--- src/mesa/math/m_debug_norm.c	19 Sep 2005 20:12:33 -0000	1.16
+++ src/mesa/math/m_debug_norm.c	22 Sep 2005 10:53:34 -0000
@@ -43,7 +43,7 @@
 static char dummy;
 #endif
 
-#ifdef DEBUG  /* This code only used for debugging */
+#ifdef DEBUG_MATH  /* This code only used for debugging */
 
 
 static int m_norm_identity[16] = {
@@ -375,10 +375,9 @@
 #ifdef RUN_DEBUG_BENCHMARK
    if ( mesa_profile ) {
       _mesa_printf( "\n" );
-      fflush( stdout );
    }
 #endif
 }
 
 
-#endif /* DEBUG */
+#endif /* DEBUG_MATH */
Index: src/mesa/math/m_debug_util.h
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/math/m_debug_util.h,v
retrieving revision 1.12
diff -u -r1.12 m_debug_util.h
--- src/mesa/math/m_debug_util.h	12 Aug 2005 18:56:57 -0000	1.12
+++ src/mesa/math/m_debug_util.h	22 Sep 2005 10:53:35 -0000
@@ -29,7 +29,7 @@
 #define __M_DEBUG_UTIL_H__
 
 
-#ifdef DEBUG  /* This code only used for debugging */
+#ifdef DEBUG_MATH  /* This code only used for debugging */
 
 
 /* Comment this out to deactivate the cycle counter.
@@ -315,6 +315,6 @@
 #endif
 
 
-#endif /* DEBUG */
+#endif /* DEBUG_MATH */
 
 #endif /* __M_DEBUG_UTIL_H__ */
Index: src/mesa/math/m_debug_xform.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/math/m_debug_xform.c,v
retrieving revision 1.18
diff -u -r1.18 m_debug_xform.c
--- src/mesa/math/m_debug_xform.c	19 Sep 2005 20:12:33 -0000	1.18
+++ src/mesa/math/m_debug_xform.c	22 Sep 2005 10:53:35 -0000
@@ -42,7 +42,7 @@
 static char dummy;
 #endif
 
-#ifdef DEBUG  /* This code only used for debugging */
+#ifdef DEBUG_MATH  /* This code only used for debugging */
 
 
 /* Overhead of profiling counter in cycles.  Automatically adjusted to
@@ -335,4 +335,4 @@
 }
 
 
-#endif /* DEBUG */
+#endif /* DEBUG_MATH */
Index: src/mesa/math/m_xform.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/math/m_xform.c,v
retrieving revision 1.24
diff -u -r1.24 m_xform.c
--- src/mesa/math/m_xform.c	7 May 2005 16:59:58 -0000	1.24
+++ src/mesa/math/m_xform.c	22 Sep 2005 10:53:36 -0000
@@ -43,7 +43,7 @@
 #include "mathmod.h"
 
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
 #include "m_debug.h"
 #endif
 
@@ -204,7 +204,7 @@
    init_copy0();
    init_dotprod();
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
    _math_test_all_transform_functions( "default" );
    _math_test_all_normal_transform_functions( "default" );
    _math_test_all_cliptest_functions( "default" );
Index: src/mesa/x86/3dnow.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/3dnow.c,v
retrieving revision 1.23
diff -u -r1.23 3dnow.c
--- src/mesa/x86/3dnow.c	29 Mar 2003 16:38:37 -0000	1.23
+++ src/mesa/x86/3dnow.c	22 Sep 2005 10:53:39 -0000
@@ -37,7 +37,7 @@
 #include "3dnow.h"
 #include "common_x86_macros.h"
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
 #include "math/m_debug.h"
 #endif
 
@@ -84,7 +84,7 @@
    ASSIGN_NORM_GROUP( 3dnow );
    */
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
    _math_test_all_transform_functions( "3DNow!" );
    _math_test_all_normal_transform_functions( "3DNow!" );
 #endif
Index: src/mesa/x86/sse.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/sse.c,v
retrieving revision 1.6
diff -u -r1.6 sse.c
--- src/mesa/x86/sse.c	9 Jan 2004 17:14:22 -0000	1.6
+++ src/mesa/x86/sse.c	22 Sep 2005 10:53:40 -0000
@@ -35,7 +35,7 @@
 #include "sse.h"
 #include "common_x86_macros.h"
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
 #include "math/m_debug.h"
 #endif
 
@@ -114,7 +114,7 @@
    ASSIGN_NORM_GROUP( sse );
 #endif
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
    _math_test_all_transform_functions( "SSE" );
    _math_test_all_normal_transform_functions( "SSE" );
 #endif
Index: src/mesa/x86/x86.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/x86/x86.c,v
retrieving revision 1.25
diff -u -r1.25 x86.c
--- src/mesa/x86/x86.c	9 Apr 2002 14:58:03 -0000	1.25
+++ src/mesa/x86/x86.c	22 Sep 2005 10:53:40 -0000
@@ -36,7 +36,7 @@
 #include "x86.h"
 #include "common_x86_macros.h"
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
 #include "math/m_debug.h"
 #endif
 
@@ -87,7 +87,7 @@
    _mesa_clip_tab[4] = _mesa_x86_cliptest_points4;
    _mesa_clip_np_tab[4] = _mesa_x86_cliptest_points4_np;
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
    _math_test_all_transform_functions( "x86" );
    _math_test_all_cliptest_functions( "x86" );
 #endif