From 24a989c5d1d3a9ba4536d546d20b91c0c3ffa03e Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 20 Jun 2007 23:04:56 +0100
Subject: Add state tracker create/destroy calls to i915 driver.

---
 src/mesa/drivers/dri/Makefile.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/drivers/dri/Makefile.template')

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 6f2314ee8cb..43c0e912bf2 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -85,7 +85,7 @@ $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
 depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
-		$(ASM_SOURCES) 2>&1 /dev/null
+		$(ASM_SOURCES) 2> /dev/null
 
 
 # Emacs tags
-- 
cgit v1.2.3


From e99b673cb062a2fead92d1d7d373926d148ade71 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 1 Aug 2007 15:56:23 +0100
Subject: Build libsoftpipe.a

Each pipe driver will build to a .a library, as these will optionally
be included in the various DRI drivers (this will make more sense once
there is at least one hardware driver...).  Not strictly necessary for
softpipe, but want to minimize the differences between it and
actual hw implementations.
---
 src/mesa/drivers/dri/Makefile.template |  4 +--
 src/mesa/drivers/dri/i915pipe/Makefile |  3 ++
 src/mesa/pipe/Makefile                 |  4 +++
 src/mesa/pipe/Makefile.template        | 58 ++++++++++++++++++++++++++++++++++
 src/mesa/pipe/softpipe/Makefile        | 45 ++++++++++++++++++++++++--
 src/mesa/pipe/softpipe/sp_context.c    |  1 +
 src/mesa/pipe/softpipe/sp_prim_setup.h |  2 +-
 src/mesa/pipe/softpipe/sp_quad_fs.c    |  2 +-
 src/mesa/sources                       | 26 ---------------
 src/mesa/vf/vf.h                       |  2 +-
 10 files changed, 114 insertions(+), 33 deletions(-)
 create mode 100644 src/mesa/pipe/Makefile.template

(limited to 'src/mesa/drivers/dri/Makefile.template')

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 43c0e912bf2..00b09613ec2 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -73,9 +73,9 @@ SHARED_INCLUDES = \
 default: depend symlinks $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
 
 
-$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
+$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(PIPE_DRIVERS) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
 	$(TOP)/bin/mklib -noprefix -o $@ \
-		$(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
+		$(OBJECTS) $(PIPE_DRIVERS) $(MESA_MODULES)  $(WINOBJ) $(DRI_LIB_DEPS)
 
 
 $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
diff --git a/src/mesa/drivers/dri/i915pipe/Makefile b/src/mesa/drivers/dri/i915pipe/Makefile
index bf801f4bddd..8cc8d912644 100644
--- a/src/mesa/drivers/dri/i915pipe/Makefile
+++ b/src/mesa/drivers/dri/i915pipe/Makefile
@@ -6,6 +6,9 @@ LIBNAME = i915tex_dri.so
 
 MINIGLX_SOURCES = server/intel_dri.c
 
+PIPE_DRIVERS = \
+	$(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a
+
 DRIVER_SOURCES = \
 	intel_regions.c \
 	intel_buffer_objects.c \
diff --git a/src/mesa/pipe/Makefile b/src/mesa/pipe/Makefile
index 451911a3545..ab7e09c9918 100644
--- a/src/mesa/pipe/Makefile
+++ b/src/mesa/pipe/Makefile
@@ -1,2 +1,6 @@
 default:
 	cd .. ; make
+	cd softpipe ; make
+
+clean:
+	rm -f `find . -name \*.[oa]`
\ No newline at end of file
diff --git a/src/mesa/pipe/Makefile.template b/src/mesa/pipe/Makefile.template
new file mode 100644
index 00000000000..7c64981d7b0
--- /dev/null
+++ b/src/mesa/pipe/Makefile.template
@@ -0,0 +1,58 @@
+# -*-makefile-*-
+
+
+# We still have a dependency on the "dri" buffer manager.  Most likely
+# the interface can be reused in non-dri environments, and also as a
+# frontend to simpler memory managers.
+#
+COMMON_SOURCES = 
+
+OBJECTS = $(C_SOURCES:.c=.o) \
+	  $(ASM_SOURCES:.S=.o) 
+
+
+### Include directories
+INCLUDES = \
+	-I. \
+	-I$(TOP)/src/mesa/drivers/dri/common \
+	-I$(TOP)/src/mesa/main \
+	-I$(TOP)/src/mesa/pipe \
+	-I$(TOP)/src/mesa 
+
+
+##### RULES #####
+
+.c.o:
+	$(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@
+
+.S.o:
+	$(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES)  $< -o $@
+
+
+##### TARGETS #####
+
+default:: depend symlinks $(LIBNAME)
+
+
+$(LIBNAME): $(OBJECTS) Makefile $(TOP)/src/mesa/pipe/Makefile.template
+	$(TOP)/bin/mklib -o $@ -static $(OBJECTS)
+
+
+depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
+	touch depend
+	$(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
+		$(ASM_SOURCES) 2> /dev/null
+
+
+# Emacs tags
+tags:
+	etags `find . -name \*.[ch]` `find ../include`
+
+
+# Remove .o and backup files
+clean:
+	-rm -f *.o */*.o *~ *.so *~ server/*.o $(SYMLINKS)
+	-rm -f depend depend.bak
+
+
+include depend
diff --git a/src/mesa/pipe/softpipe/Makefile b/src/mesa/pipe/softpipe/Makefile
index 12a8bd0409e..947983baf07 100644
--- a/src/mesa/pipe/softpipe/Makefile
+++ b/src/mesa/pipe/softpipe/Makefile
@@ -1,3 +1,44 @@
-default:
-	cd ../.. ; make
 
+TOP = ../../../..
+include $(TOP)/configs/current
+
+LIBNAME = softpipe
+
+DRIVER_SOURCES = \
+	sp_clear.c \
+	sp_context.c \
+	sp_prim_setup.c \
+	sp_quad.c \
+	sp_quad_alpha_test.c \
+	sp_quad_blend.c \
+	sp_quad_bufloop.c \
+	sp_quad_colormask.c \
+	sp_quad_coverage.c \
+	sp_quad_depth_test.c \
+	sp_quad_fs.c \
+	sp_quad_occlusion.c \
+	sp_quad_output.c \
+	sp_quad_stencil.c \
+	sp_quad_stipple.c \
+	sp_region.c \
+	sp_state_blend.c \
+	sp_state_clip.c \
+	sp_state_derived.c \
+	sp_state_fs.c \
+	sp_state_sampler.c \
+	sp_state_setup.c \
+	sp_state_surface.c \
+	sp_surface.c 
+
+C_SOURCES = \
+	$(COMMON_SOURCES) \
+	$(DRIVER_SOURCES)
+
+ASM_SOURCES = 
+
+include ../Makefile.template
+
+symlinks:
+
+default::
+	cd ../.. ; make
diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c
index 002fe73b59d..434e18308ab 100644
--- a/src/mesa/pipe/softpipe/sp_context.c
+++ b/src/mesa/pipe/softpipe/sp_context.c
@@ -157,6 +157,7 @@ struct pipe_context *softpipe_create( void )
     * Create drawing context and plug our rendering stage into it.
     */
    softpipe->draw = draw_create();
+   assert(softpipe->draw);
    draw_set_setup_stage(softpipe->draw, sp_draw_render_stage(softpipe));
 
    sp_init_region_functions(softpipe);
diff --git a/src/mesa/pipe/softpipe/sp_prim_setup.h b/src/mesa/pipe/softpipe/sp_prim_setup.h
index e5abefcd499..0180454a8d2 100644
--- a/src/mesa/pipe/softpipe/sp_prim_setup.h
+++ b/src/mesa/pipe/softpipe/sp_prim_setup.h
@@ -41,8 +41,8 @@
 #include "imports.h"
 #if 0
 #include "s_tri_public.h"
-#endif
 #include "s_context.h"
+#endif
 
 
 extern struct draw_stage *sp_draw_render_stage( struct softpipe_context *softpipe );
diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/mesa/pipe/softpipe/sp_quad_fs.c
index d4acf402ce7..1676d47d51b 100644
--- a/src/mesa/pipe/softpipe/sp_quad_fs.c
+++ b/src/mesa/pipe/softpipe/sp_quad_fs.c
@@ -37,7 +37,7 @@
 #include "sp_context.h"
 #include "sp_headers.h"
 #include "sp_quad.h"
-#include "core/tgsi_core.h"
+#include "tgsi/core/tgsi_core.h"
 
 #if defined __GNUC__
 #define ALIGNED_ATTRIBS 1
diff --git a/src/mesa/sources b/src/mesa/sources
index 3b820b71f0e..d9ee7266e54 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -154,31 +154,6 @@ VF_SOURCES = \
 	vf/vf_generic.c \
 	vf/vf_sse.c
 
-SOFTPIPE_SOURCES = \
-	pipe/softpipe/sp_clear.c \
-	pipe/softpipe/sp_context.c \
-	pipe/softpipe/sp_region.c \
-	pipe/softpipe/sp_quad.c \
-	pipe/softpipe/sp_quad_alpha_test.c \
-	pipe/softpipe/sp_quad_blend.c \
-	pipe/softpipe/sp_quad_bufloop.c \
-	pipe/softpipe/sp_quad_colormask.c \
-	pipe/softpipe/sp_quad_coverage.c \
-	pipe/softpipe/sp_quad_depth_test.c \
-	pipe/softpipe/sp_quad_fs.c \
-	pipe/softpipe/sp_quad_occlusion.c \
-	pipe/softpipe/sp_quad_output.c \
-	pipe/softpipe/sp_quad_stipple.c \
-	pipe/softpipe/sp_quad_stencil.c \
-	pipe/softpipe/sp_state_blend.c \
-	pipe/softpipe/sp_state_clip.c \
-	pipe/softpipe/sp_state_derived.c \
-	pipe/softpipe/sp_state_fs.c \
-	pipe/softpipe/sp_state_sampler.c \
-	pipe/softpipe/sp_state_setup.c \
-	pipe/softpipe/sp_state_surface.c \
-	pipe/softpipe/sp_surface.c \
-	pipe/softpipe/sp_prim_setup.c
 
 DRAW_SOURCES = \
 	pipe/draw/draw_clip.c \
@@ -367,7 +342,6 @@ SOLO_SOURCES = \
 	$(MATH_SOURCES)		\
 	$(VBO_SOURCES)		\
 	$(VF_SOURCES)		\
-	$(SOFTPIPE_SOURCES)	\
 	$(DRAW_SOURCES)		\
 	$(TGSICORE_SOURCES)	\
 	$(TGSIMESA_SOURCES)	\
diff --git a/src/mesa/vf/vf.h b/src/mesa/vf/vf.h
index fc988b9fb9a..8ca3ab6d4a6 100644
--- a/src/mesa/vf/vf.h
+++ b/src/mesa/vf/vf.h
@@ -29,7 +29,7 @@
 #define VF_VERTEX_H
 
 #include "mtypes.h"
-#include "m_vector.h"
+#include "math/m_vector.h"
 
 enum {
    VF_ATTRIB_POS = 0,
-- 
cgit v1.2.3


From 90ee7a41443a971d6ff2e0a6e90997806c28d11b Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Tue, 7 Aug 2007 10:18:04 +0100
Subject: Gutsy oopses on touch of existing file. Workaround.

---
 Makefile                               | 8 +++-----
 progs/fbdev/Makefile                   | 1 +
 progs/miniglx/Makefile                 | 1 +
 src/egl/drivers/dri/Makefile           | 1 +
 src/egl/main/Makefile                  | 1 +
 src/glut/beos/Makefile                 | 1 +
 src/glut/directfb/Makefile             | 1 +
 src/glut/fbdev/Makefile                | 1 +
 src/glut/ggi/Makefile                  | 1 +
 src/glut/glx/Makefile                  | 1 +
 src/glut/mini/Makefile                 | 1 +
 src/glw/Makefile                       | 1 +
 src/glx/mini/Makefile                  | 1 +
 src/glx/x11/Makefile                   | 1 +
 src/mesa/drivers/beos/Makefile         | 1 +
 src/mesa/drivers/dri/Makefile.template | 1 +
 src/mesa/drivers/dri/glcore/Makefile   | 1 +
 17 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'src/mesa/drivers/dri/Makefile.template')

diff --git a/Makefile b/Makefile
index 9a6557571c5..4bd340f2120 100644
--- a/Makefile
+++ b/Makefile
@@ -25,15 +25,13 @@ clean:
 
 
 realclean:
-	touch $(TOP)/configs/current
-	$(MAKE) clean
-	-rm -rf lib*
-	-rm -f $(TOP)/configs/current
 	-rm -f `find . -name \*.o`
 	-rm -f `find . -name \*.a`
 	-rm -f `find . -name \*.so`
 	-rm -f `find . -name depend`
-
+	-rm -rf lib*
+	$(MAKE) clean
+	-rm -f $(TOP)/configs/current
 
 
 install:
diff --git a/progs/fbdev/Makefile b/progs/fbdev/Makefile
index 0a0c77906f7..178020e2b3f 100644
--- a/progs/fbdev/Makefile
+++ b/progs/fbdev/Makefile
@@ -41,6 +41,7 @@ clean:
 
 
 depend: $(SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
diff --git a/progs/miniglx/Makefile b/progs/miniglx/Makefile
index 7f1e162186f..cc27024b568 100644
--- a/progs/miniglx/Makefile
+++ b/progs/miniglx/Makefile
@@ -46,6 +46,7 @@ clean:
 
 
 depend: $(SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
diff --git a/src/egl/drivers/dri/Makefile b/src/egl/drivers/dri/Makefile
index cb11971c640..fa3720a16ba 100644
--- a/src/egl/drivers/dri/Makefile
+++ b/src/egl/drivers/dri/Makefile
@@ -52,6 +52,7 @@ clean:
 
 depend: $(SOURCES) $(HEADERS)
 	@ echo "running $(MKDEP)"
+	@ rm -f depend
 	@ touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) \
 		$(SOURCES) $(HEADERS) > /dev/null 
diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 431eda4197f..e6844d48524 100644
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -58,6 +58,7 @@ clean:
 
 depend: $(SOURCES) $(HEADERS)
 	@ echo "running $(MKDEP)"
+	@ rm -f depend
 	@ touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) \
 		$(SOURCES) $(HEADERS) > /dev/null 
diff --git a/src/glut/beos/Makefile b/src/glut/beos/Makefile
index 3ff928bfd72..a7ba512cb11 100644
--- a/src/glut/beos/Makefile
+++ b/src/glut/beos/Makefile
@@ -91,6 +91,7 @@ clean:
 	-rm -f *.o
 
 depend: $(SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
diff --git a/src/glut/directfb/Makefile b/src/glut/directfb/Makefile
index 3791b16df89..e881b8aacdd 100644
--- a/src/glut/directfb/Makefile
+++ b/src/glut/directfb/Makefile
@@ -70,6 +70,7 @@ $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
 # Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(SOURCES) 
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
diff --git a/src/glut/fbdev/Makefile b/src/glut/fbdev/Makefile
index 254ff8c098f..b32b4141e8d 100644
--- a/src/glut/fbdev/Makefile
+++ b/src/glut/fbdev/Makefile
@@ -77,6 +77,7 @@ install:
 # Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(SOURCES) 
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
diff --git a/src/glut/ggi/Makefile b/src/glut/ggi/Makefile
index 1bef6c23a35..748c83c2286 100644
--- a/src/glut/ggi/Makefile
+++ b/src/glut/ggi/Makefile
@@ -46,6 +46,7 @@ clean:
 
 
 depend: $(SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES)
 
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 7e1d56b3278..910c6fa28a4 100644
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -113,6 +113,7 @@ clean:
 
 depend: $(SOURCES)
 	@ echo "running $(MKDEP)"
+	@ rm -f depend
 	@ touch depend
 	@ $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES) \
 		> /dev/null 
diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile
index 177bfe2d2bf..980306d0e28 100644
--- a/src/glut/mini/Makefile
+++ b/src/glut/mini/Makefile
@@ -64,6 +64,7 @@ $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
 # Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(SOURCES) 
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
diff --git a/src/glw/Makefile b/src/glw/Makefile
index 5228cbbb721..12ab2facd48 100644
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -49,6 +49,7 @@ $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
 # by any source file.
 # 
 depend: $(GLW_SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(GLW_SOURCES) \
 		> /dev/null 
diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index 71f085d5cd9..9545505cbff 100644
--- a/src/glx/mini/Makefile
+++ b/src/glx/mini/Makefile
@@ -65,6 +65,7 @@ drmtest: xf86drm.o drmtest.o
 
 
 depend: $(C_SOURCES) $(ASM_SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \
 		> /dev/null 
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 296747e0dda..c7b5874faa7 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -70,6 +70,7 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME):  $(OBJECTS) Makefile
 
 
 depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) \
 		$(MESA_GLAPI_SOURCES) $(MESA_ASM_API) 
diff --git a/src/mesa/drivers/beos/Makefile b/src/mesa/drivers/beos/Makefile
index 1897d6aa3e8..f8b7eb69a4e 100644
--- a/src/mesa/drivers/beos/Makefile
+++ b/src/mesa/drivers/beos/Makefile
@@ -186,6 +186,7 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES)
 #	cd $(GLU_DIR); $(MAKE) $< ;
 
 depend: $(DRIVER_SOURCES) $(GLU_SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(DRIVER_SOURCES) $(GLU_SOURCES) > /dev/null 
 
diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 00b09613ec2..37bf0a49772 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -83,6 +83,7 @@ $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
 
 
 depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
 		$(ASM_SOURCES) 2> /dev/null
diff --git a/src/mesa/drivers/dri/glcore/Makefile b/src/mesa/drivers/dri/glcore/Makefile
index a9e96970fae..ac7e1de9285 100644
--- a/src/mesa/drivers/dri/glcore/Makefile
+++ b/src/mesa/drivers/dri/glcore/Makefile
@@ -66,6 +66,7 @@ $(TOP)/$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
 
 
 depend: $(C_SOURCES) $(ASM_SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \
 		> /dev/null 
-- 
cgit v1.2.3


From 41ce1f8fb30c9a918d85d4016ce82fe2a3d2c72c Mon Sep 17 00:00:00 2001
From: Michel Dänzer <michel@tungstengraphics.com>
Date: Mon, 10 Dec 2007 16:34:25 +0100
Subject: Link fewer common objects into Gallium winsys layers.

These are useless or even harmful due to referencing symbols no longer
available in the Gallium build.
---
 src/mesa/drivers/dri/Makefile.template     | 12 +++++++-----
 src/mesa/drivers/dri/intel_winsys/Makefile |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/mesa/drivers/dri/Makefile.template')

diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 37bf0a49772..3e7e527a982 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -2,14 +2,16 @@
 
 MESA_MODULES = $(TOP)/src/mesa/libmesa.a
 
-COMMON_SOURCES = \
-        ../../common/driverfuncs.c \
+COMMON_GALLIUM_SOURCES = \
         ../common/utils.c \
-        ../common/texmem.c \
         ../common/vblank.c \
         ../common/dri_util.c \
-        ../common/xmlconfig.c \
-        ../common/drirenderbuffer.c 
+        ../common/xmlconfig.c
+
+COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
+        ../../common/driverfuncs.c \
+        ../common/texmem.c \
+        ../common/drirenderbuffer.c
 
 COMMON_BM_SOURCES = \
 	../common/dri_bufmgr.c \
diff --git a/src/mesa/drivers/dri/intel_winsys/Makefile b/src/mesa/drivers/dri/intel_winsys/Makefile
index 46b9541d7d4..9ae0f013256 100644
--- a/src/mesa/drivers/dri/intel_winsys/Makefile
+++ b/src/mesa/drivers/dri/intel_winsys/Makefile
@@ -22,7 +22,7 @@ DRIVER_SOURCES = \
 	intel_batchpool.c
 
 C_SOURCES = \
-	$(COMMON_SOURCES) \
+	$(COMMON_GALLIUM_SOURCES) \
 	$(COMMON_BM_SOURCES) \
 	$(DRIVER_SOURCES)
 
-- 
cgit v1.2.3