mesa: build/use libmesagallium.a for gallium builds

This contains the core mesa code but excludes things not needed for gallium
such as tnl/, swrast/, swrast_setup/, etc.

diff --git a/src/gallium/winsys/drm/Makefile.template b/src/gallium/winsys/drm/Makefile.template
index 211f4d8..6756640 100644 (file)
--- a/src/gallium/winsys/drm/Makefile.template
+++ b/src/gallium/winsys/drm/Makefile.template
@@ -1,9 +1,9 @@
 # -*-makefile-*-
 
 MESA_MODULES = \
-       $(TOP)/src/mesa/libmesa.a \
+       $(TOP)/src/mesa/libmesagallium.a \
        $(GALLIUM_AUXILIARIES)
-       
+
 COMMON_GALLIUM_SOURCES = \
         $(TOP)/src/mesa/drivers/dri/common/utils.c \
         $(TOP)/src/mesa/drivers/dri/common/vblank.c \

diff --git a/src/gallium/winsys/egl_xlib/Makefile b/src/gallium/winsys/egl_xlib/Makefile
index 76f1b56..02ac47c 100644 (file)
--- a/src/gallium/winsys/egl_xlib/Makefile
+++ b/src/gallium/winsys/egl_xlib/Makefile
@@ -34,7 +34,7 @@ LIBS = \
 # mesa code, as done for ES 1.x, 2.x, OpenVG, etc)
 UNUSED_LIBS = \
        $(TOP)/src/mesa/libglapi.a \
-       $(TOP)/src/mesa/libmesa.a \
+       $(TOP)/src/mesa/libmesagallium.a \
 
 
 LOCAL_CFLAGS = -D_EGL_PLATFORM_X=1

diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile
index 8c2892d..9d70f3c 100644 (file)
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/xlib/Makefile
@@ -47,7 +47,7 @@ LIBS = \
        $(GALLIUM_DRIVERS) \
        $(TOP)/src/gallium/state_trackers/glx/xlib/libxlib.a \
        $(TOP)/src/mesa/libglapi.a \
-       $(TOP)/src/mesa/libmesa.a \
+       $(TOP)/src/mesa/libmesagallium.a \
        $(GALLIUM_AUXILIARIES) \
        $(CELL_SPU_LIB) \
 

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 22ef05c..78b71d4 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -21,7 +21,8 @@ include sources.mak
 
 # Default: build dependencies, then asm_subdirs, then convenience
 # libs (.a) and finally the device drivers:
-default: depend asm_subdirs libmesa.a libglapi.a driver_subdirs
+default: depend asm_subdirs libmesa.a libmesagallium.a libglapi.a \
+       driver_subdirs