Code reorganization: split gallium and mesa makefiles.

In other words, don't build src/gallium source code from within src/mesa/Makefile.

Also, allow to customize which gallium auxiliary dirs, driver driver, winsys
dirs get built from the config/* files.

diff --git a/configs/default b/configs/default
index 25a87e66a1b019c06b43456b896b536cb26a6cdd..7f659725cbadec6eebd5abff327e9f8e8f1acb8e 100644 (file)
--- a/configs/default
+++ b/configs/default
@@ -60,13 +60,21 @@ GLW_SOURCES = GLwDrawA.c
 
 # Directories to build
 LIB_DIR = lib
-SRC_DIRS = gallium mesa glu glut/glx glw
+SRC_DIRS = gallium mesa gallium/winsys glu glut/glx glw
 GLU_DIRS = sgi
-DRIVER_DIRS = x11 osmesa
+DRIVER_DIRS = 
 # Which subdirs under $(TOP)/progs/ to enter:
 PROGRAM_DIRS = demos redbook samples glsl xdemos
 
 
+# Gallium directories and 
+GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi util
+GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
+GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover
+GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
+GALLIUM_WINSYS_DIRS = xlib
+
+
 # Library/program dependencies
 #EXTRA_LIB_PATH ?=
 GL_LIB_DEPS     = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread

diff --git a/configs/linux-cell b/configs/linux-cell
index 09f62fc1ff0022cbd4d5a023966185eecfe8ac4f..807ede75a7e05d5ab0fb816db166072d213733ac 100644 (file)
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -5,6 +5,9 @@ include $(TOP)/configs/default
 CONFIG_NAME = linux-cell
 
 
+GALLIUM_DRIVER_DIRS += cell
+
+
 # Compiler and flags
 CC = ppu32-gcc
 CXX = ppu32-g++

diff --git a/configs/linux-dri b/configs/linux-dri
index e6135856fc1cf69ce4aef825900f0ed0fee35946..68afcb1d28d8e69a645b8ecb8c343dc515367744 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -54,15 +54,13 @@ USING_EGL=0
 
 # Directories
 ifeq ($(USING_EGL), 1)
-SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw
+SRC_DIRS := egl $(SRC_DIRS)
 PROGRAM_DIRS = egl
-else
-SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw
-PROGRAM_DIRS =
 endif
 
 DRIVER_DIRS = dri
 WINDOW_SYSTEM=dri
+GALLIUM_WINSYS_DIRS = dri
 
 # gamma are missing because they have not been converted to use the new
 # interface.

diff --git a/configs/linux-llvm b/configs/linux-llvm
index 915189f4625bcbc5e90529584f459fee9c4bb416..a8889321a021ad53fb21c43e10e0af1500cca6c3 100644 (file)
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -5,6 +5,8 @@ include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-llvm
 
+GALLIUM_AUXILIARY_DIRS += llvm
+
 OPT_FLAGS = -g -ansi -pedantic
 DEFINES += -DDEBUG -DDEBUG_MATH -DMESA_LLVM=1
 

diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template
index 83b25f9b47c918ffae387c021ce67396b3ec22b7..6ad58c205c23fdda91a6b16287f877544f51f4c1 100644 (file)
--- a/src/gallium/Makefile.template
+++ b/src/gallium/Makefile.template
@@ -20,6 +20,7 @@ INCLUDES = \
        -I$(TOP)/src/gallium/auxiliary \
        -I$(TOP)/src/gallium/drivers \
        -I$(TOP)/src/mesa \
+       -I$(TOP)/src/mesa/main \
        -I$(TOP)/include \
         $(DRIVER_INCLUDES)
 

diff --git a/src/gallium/auxiliary/Makefile b/src/gallium/auxiliary/Makefile
index da68498aa1fc97a894c308d2dfc15444a69dff19..eaa0f2fe4e8a195d732e67eff0dff42232ab06eb 100644 (file)
--- a/src/gallium/auxiliary/Makefile
+++ b/src/gallium/auxiliary/Makefile
@@ -2,11 +2,7 @@ TOP = ../../..
 include $(TOP)/configs/current
 
 
-ifeq ($(CONFIG_NAME), linux-llvm)
-LLVM_DIR = llvm
-endif
-
-SUBDIRS = pipebuffer $(LLVM_DIR)
+SUBDIRS = $(GALLIUM_AUXILIARY_DIRS)
 
 
 default: subdirs

diff --git a/src/gallium/auxiliary/cso_cache/Makefile b/src/gallium/auxiliary/cso_cache/Makefile
new file mode 100644 (file)
index 0000000..8248b09
--- /dev/null
+++ b/src/gallium/auxiliary/cso_cache/Makefile
@@ -0,0 +1,18 @@
+TOP = ../../../..
+include $(TOP)/configs/current
+
+LIBNAME = cso_cache
+
+DRIVER_SOURCES = \
+       cso_cache.c \
+       cso_hash.c
+
+C_SOURCES = \
+       $(DRIVER_SOURCES)
+
+ASM_SOURCES = 
+
+include ../../Makefile.template
+
+symlinks:
+

diff --git a/src/gallium/auxiliary/draw/Makefile b/src/gallium/auxiliary/draw/Makefile
index fe9b150f3045ab9c2b32d31f99886c9213287b8b..c56b63d85b84a1967f0ed99d5b7eca177dd57090 100644 (file)
--- a/src/gallium/auxiliary/draw/Makefile
+++ b/src/gallium/auxiliary/draw/Makefile
@@ -1,2 +1,39 @@
-default:
-       cd ../../../mesa ; make
+TOP = ../../../..
+include $(TOP)/configs/current
+
+LIBNAME = draw
+
+DRIVER_SOURCES = \
+       draw_clip.c \
+       draw_vs_exec.c \
+       draw_vs_sse.c \
+       draw_vs_llvm.c \
+       draw_context.c\
+       draw_cull.c \
+       draw_debug.c \
+       draw_flatshade.c \
+       draw_offset.c \
+       draw_prim.c \
+       draw_stipple.c \
+       draw_twoside.c \
+       draw_unfilled.c \
+       draw_validate.c \
+       draw_vbuf.c \
+       draw_vertex.c \
+       draw_vertex_cache.c \
+       draw_vertex_fetch.c \
+       draw_vertex_shader.c \
+       draw_vf.c \
+       draw_vf_generic.c \
+       draw_vf_sse.c \
+       draw_wide_prims.c
+
+C_SOURCES = \
+       $(DRIVER_SOURCES)
+
+ASM_SOURCES = 
+
+include ../../Makefile.template
+
+symlinks:
+

diff --git a/src/gallium/auxiliary/tgsi/Makefile b/src/gallium/auxiliary/tgsi/Makefile
index 12a8bd0409e07cc5a3a52aa42117f7e383214b20..c10ab396d8da888f0db9b1bd58b5288d6c253f59 100644 (file)
--- a/src/gallium/auxiliary/tgsi/Makefile
+++ b/src/gallium/auxiliary/tgsi/Makefile
@@ -1,3 +1,23 @@
-default:
-       cd ../.. ; make
+
+TOP = ../../../..
+include $(TOP)/configs/current
+
+LIBNAME = tgsi
+
+DRIVER_SOURCES = \
+       exec/tgsi_exec.c \
+       exec/tgsi_sse2.c \
+       util/tgsi_build.c \
+       util/tgsi_dump.c \
+       util/tgsi_parse.c \
+       util/tgsi_util.c
+
+C_SOURCES = \
+       $(DRIVER_SOURCES)
+
+ASM_SOURCES = 
+
+include ../../Makefile.template
+
+symlinks:
 

diff --git a/src/gallium/auxiliary/tgsi/exec/Makefile b/src/gallium/auxiliary/tgsi/exec/Makefile
deleted file mode 100644 (file)
index eb8b14e..0000000
--- a/src/gallium/auxiliary/tgsi/exec/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-default:
-       cd ../../.. ; make
-

diff --git a/src/gallium/auxiliary/util/Makefile b/src/gallium/auxiliary/util/Makefile
new file mode 100644 (file)
index 0000000..b8cb148
--- /dev/null
+++ b/src/gallium/auxiliary/util/Makefile
@@ -0,0 +1,20 @@
+
+TOP = ../../../..
+include $(TOP)/configs/current
+
+LIBNAME = util
+
+DRIVER_SOURCES = \
+       p_debug.c \
+       p_tile.c \
+       p_util.c
+
+C_SOURCES = \
+       $(DRIVER_SOURCES)
+
+ASM_SOURCES = 
+
+include ../../Makefile.template
+
+symlinks:
+

diff --git a/src/gallium/drivers/Makefile b/src/gallium/drivers/Makefile
index c0345a9cb54feead7510fe58c13b383c5c6b534d..8dcfb18a16f98571a00b51c43d64403510b4b5ad 100644 (file)
--- a/src/gallium/drivers/Makefile
+++ b/src/gallium/drivers/Makefile
@@ -2,11 +2,7 @@ TOP = ../../..
 include $(TOP)/configs/current
 
 
-ifeq ($(CONFIG_NAME), linux-cell)
-CELL_DIR = cell
-endif
-
-SUBDIRS = softpipe i915simple i965simple failover pipebuffer $(CELL_DIR)
+SUBDIRS = softpipe i915simple i965simple failover
 
 
 default: subdirs

diff --git a/src/gallium/winsys/Makefile b/src/gallium/winsys/Makefile
new file mode 100644 (file)
index 0000000..3dc5ea5
--- /dev/null
+++ b/src/gallium/winsys/Makefile
@@ -0,0 +1,20 @@
+TOP = ../../..
+include $(TOP)/configs/current
+
+
+SUBDIRS = $(GALLIUM_WINSYS_DIRS)
+
+
+default: subdirs
+
+
+subdirs:
+       @for dir in $(SUBDIRS) ; do \
+               if [ -d $$dir ] ; then \
+                       (cd $$dir && $(MAKE)) || exit 1 ; \
+               fi \
+       done
+
+
+clean:
+       rm -f `find . -name \*.[oa]`

diff --git a/src/gallium/winsys/dri/Makefile.template b/src/gallium/winsys/dri/Makefile.template
index 2a261ed66947f1d3d6d46f6e4fcc7c04562c3abc..65a93bd53e37560cce2c69116b84f8076891dcab 100644 (file)
--- a/src/gallium/winsys/dri/Makefile.template
+++ b/src/gallium/winsys/dri/Makefile.template
@@ -1,7 +1,9 @@
 # -*-makefile-*-
 
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-
+MESA_MODULES = \
+       $(TOP)/src/mesa/libmesa.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/xlib/Makefile b/src/gallium/winsys/xlib/Makefile
new file mode 100644 (file)
index 0000000..2664ac4
--- /dev/null
+++ b/src/gallium/winsys/xlib/Makefile
@@ -0,0 +1,113 @@
+# src/mesa/Makefile
+
+TOP = ../../../..
+include $(TOP)/configs/current
+
+
+INCLUDE_DIRS = \
+       -I$(TOP)/include \
+       -I$(TOP)/src/mesa \
+       -I$(TOP)/src/mesa/main \
+       -I$(TOP)/src/gallium/include \
+       -I$(TOP)/src/gallium/drivers \
+       -I$(TOP)/src/gallium/auxiliary
+
+X11_DRIVER_SOURCES = \
+       glxapi.c        \
+       fakeglx.c       \
+       xfonts.c        \
+       xm_api.c        \
+       xm_winsys.c     \
+       xm_winsys_aub.c \
+       brw_aub.c
+
+
+GL_MAJOR = 1
+GL_MINOR = 5
+GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
+
+
+PIPE_LIB = \
+       $(GALLIUM_DRIVERS) \
+       $(TOP)/src/mesa/libglapi.a \
+       $(TOP)/src/mesa/libmesa.a \
+       $(GALLIUM_AUXILIARIES)
+
+ifeq ($(CONFIG_NAME), linux-cell)
+CELL_LIB = $(TOP)/src/gallium/drivers/cell/ppu/libcell.a
+CELL_LIB_SPU = $(TOP)/src/gallium/drivers/cell/spu/g3d_spu.a
+endif
+
+ifeq ($(CONFIG_NAME), linux-llvm)
+LLVM_LIB = $(TOP)/src/gallium/auxiliary/llvm/libgallivm.a
+endif
+
+
+.SUFFIXES : .cpp
+
+.c.o:
+       $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
+
+.cpp.o:
+       $(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@
+
+.S.o:
+       $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
+
+
+default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
+
+
+######################################################################
+# Stand-alone Mesa libGL and libOSMesa
+STAND_ALONE_DRIVER_SOURCES = \
+       $(X11_DRIVER_SOURCES)
+
+STAND_ALONE_DRIVER_OBJECTS = $(STAND_ALONE_DRIVER_SOURCES:.c=.o)
+
+STAND_ALONE_OBJECTS = \
+       $(STAND_ALONE_DRIVER_OBJECTS)
+
+# Make the GL library
+$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) $(LLVM_LIB) $(PIPE_LIB) $(CELL_LIB) $(CELL_LIB_SPU)
+       $(TOP)/bin/mklib -o $(GL_LIB) \
+               -linker "$(CC)" \
+               -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
+               -install $(TOP)/$(LIB_DIR) \
+               $(MKLIB_OPTIONS) $(STAND_ALONE_OBJECTS) \
+               --start-group $(PIPE_LIB) $(LLVM_LIB) --end-group $(CELL_LIB) $(CELL_LIB_SPU) $(GL_LIB_DEPS)
+
+
+######################################################################
+# Generic stuff
+
+depend: $(ALL_SOURCES)
+       @ echo "running $(MKDEP)"
+       @ rm -f depend  # workaround oops on gutsy?!?
+       @ touch depend
+       @ $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) $(ALL_SOURCES) \
+               > /dev/null 2>/dev/null
+
+
+install: default
+       $(INSTALL) -d $(INSTALL_DIR)/include/GL
+       $(INSTALL) -d $(INSTALL_DIR)/$(LIB_DIR)
+       $(INSTALL) -m 644 $(TOP)/include/GL/*.h $(INSTALL_DIR)/include/GL
+       @if [ -e $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) ]; then \
+               $(INSTALL) $(TOP)/$(LIB_DIR)/libGL* $(INSTALL_DIR)/$(LIB_DIR); \
+       fi
+
+## NOT INSTALLED YET:
+## $(INSTALL) -d $(INSTALL_DIR)/include/GLES
+## $(INSTALL) -m 644 include/GLES/*.h $(INSTALL_DIR)/include/GLES
+
+
+# Emacs tags
+tags:
+       etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h
+
+clean:
+       -rm -f *.o
+
+
+include depend

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index c8cb2b592fe819d7c6aa5e6abba2ce46fc2d4233..86a9cf0b88c8a308228c199776546e955e7afa39 100644 (file)
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -11,19 +11,6 @@ GL_MINOR = 5
 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 
-PIPE_LIB = \
-       $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
-       $(TOP)/src/gallium/drivers/i965simple/libi965simple.a
-
-ifeq ($(CONFIG_NAME), linux-cell)
-CELL_LIB = $(TOP)/src/gallium/drivers/cell/ppu/libcell.a
-CELL_LIB_SPU = $(TOP)/src/gallium/drivers/cell/spu/g3d_spu.a
-endif
-
-ifeq ($(CONFIG_NAME), linux-llvm)
-LLVM_LIB = $(TOP)/src/gallium/auxiliary/llvm/libgallivm.a
-endif
-
 .SUFFIXES : .cpp
 
 .c.o:
@@ -36,33 +23,14 @@ endif
        $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
 
 
-# Figure out what to make here
-default:
-       @if [ "${DRIVER_DIRS}" = "dri" ] ; then \
-               $(MAKE) linux-solo ; \
-       elif [ "${DRIVER_DIRS}" = "osmesa" ] ; then \
-               $(MAKE) osmesa-only ; \
-       elif [ "$(DRIVER_DIRS)" = "beos" ]; then \
-               $(MAKE) beos ; \
-       elif [ "$(DRIVER_DIRS)" = "directfb" ]; then \
-               $(MAKE) directfb ; \
-       elif [ "$(DRIVER_DIRS)" = "fbdev osmesa" ]; then \
-               $(MAKE) fbdev ; $(MAKE) osmesa-only ; \
-       else \
-               $(MAKE) stand-alone ; \
-       fi
-
+default: depend subdirs libmesa.a
 
-######################################################################
-# BeOS driver target
-
-beos: depend subdirs libmesa.a
-       cd drivers/beos; $(MAKE)
+ifneq ($(DRIVER_DIRS),dri)
+default: libglapi.a
+endif
 
 
 ######################################################################
-# Linux DRI drivers
-
 # Make archive of core object files
 libmesa.a: $(SOLO_OBJECTS)
        @ $(TOP)/bin/mklib -o mesa -static $(SOLO_OBJECTS);
@@ -70,32 +38,8 @@ libmesa.a: $(SOLO_OBJECTS)
                mimeset -f "$@" ; \
        fi
 
-linux-solo: depend subdirs libmesa.a
-       cd $(TOP)/src/gallium/winsys/dri ; $(MAKE)
-
-
-#####################################################################
-# Stand-alone Mesa libGL, no built-in drivers (DirectFB)
-
-libgl-core: $(CORE_OBJECTS)
-       @ $(TOP)/bin/mklib -o $(GL_LIB) \
-               -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) $(CORE_OBJECTS) \
-               $(GL_LIB_DEPS)
-
-directfb: depend subdirs libgl-core
-       cd drivers/directfb ; $(MAKE)
-
-
-#####################################################################
-# fbdev Mesa driver (libGL.so)
-
-fbdev: $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) $(COMMON_DRIVER_OBJECTS)
-       @ $(TOP)/bin/mklib -o $(GL_LIB) \
-               -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
-               -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
-               $(CORE_OBJECTS) $(FBDEV_DRIVER_OBJECTS) \
-               $(COMMON_DRIVER_OBJECTS) $(GL_LIB_DEPS)
+libglapi.a: $(GLAPI_OBJECTS)
+       @ $(TOP)/bin/mklib -o glapi -static $(GLAPI_OBJECTS)
 
 
 ######################################################################
@@ -176,9 +120,6 @@ install: default
        @if [ -e $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) ]; then \
                $(INSTALL) $(TOP)/$(LIB_DIR)/libOSMesa* $(INSTALL_DIR)/$(LIB_DIR); \
        fi
-       @if [ "${DRIVER_DIRS}" = "dri" ] ; then \
-               cd $(TOP)/gallium/winsys/dri ; $(MAKE) install ; \
-       fi
 
 ## NOT INSTALLED YET:
 ## $(INSTALL) -d $(INSTALL_DIR)/include/GLES
@@ -192,9 +133,8 @@ tags:
 clean:
        -rm -f */*.o
        -rm -f */*/*.o
-       -rm -f depend depend.bak libmesa.a
+       -rm -f depend depend.bak libmesa.a libglapi.a
        -rm -f drivers/*/*.o
-       (cd drivers/dri && $(MAKE) clean)
        (cd x86 && $(MAKE) clean)
        (cd x86-64 && $(MAKE) clean)
 

diff --git a/src/mesa/sources b/src/mesa/sources
index f83d247a1e2f7d78cdf207df01f0b7a234ab43d5..0d185fd5f3f7e493c38d1f463dcf54cb09effb13 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -156,51 +156,6 @@ VF_SOURCES = \
        vf/vf_generic.c \
        vf/vf_sse.c
 
-
-DRAW_SOURCES = \
-       $(TOP)/src/gallium/auxiliary/draw/draw_clip.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_vs_exec.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_vs_sse.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_vs_llvm.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_context.c\
-       $(TOP)/src/gallium/auxiliary/draw/draw_cull.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_debug.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_flatshade.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_offset.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_prim.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_stipple.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_twoside.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_unfilled.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_validate.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_vbuf.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_vertex.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_vertex_cache.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_vertex_fetch.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_vertex_shader.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_vf.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_vf_generic.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_vf_sse.c \
-       $(TOP)/src/gallium/auxiliary/draw/draw_wide_prims.c
-
-TGSIEXEC_SOURCES = \
-       $(TOP)/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c \
-       $(TOP)/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c
-
-TGSIUTIL_SOURCES = \
-       $(TOP)/src/gallium/auxiliary/tgsi/util/tgsi_build.c \
-       $(TOP)/src/gallium/auxiliary/tgsi/util/tgsi_dump.c \
-       $(TOP)/src/gallium/auxiliary/tgsi/util/tgsi_parse.c \
-       $(TOP)/src/gallium/auxiliary/tgsi/util/tgsi_util.c
-
-STATECACHE_SOURCES = \
-       $(TOP)/src/gallium/auxiliary/cso_cache/cso_hash.c \
-       $(TOP)/src/gallium/auxiliary/cso_cache/cso_cache.c
-
-PIPEUTIL_SOURCES = \
-       $(TOP)/src/gallium/auxiliary/util/p_debug.c \
-       $(TOP)/src/gallium/auxiliary/util/p_tile.c \
-       $(TOP)/src/gallium/auxiliary/util/p_util.c
-
 STATETRACKER_SOURCES = \
        state_tracker/st_atom.c \
        state_tracker/st_atom_blend.c \
@@ -229,7 +184,7 @@ STATETRACKER_SOURCES = \
        state_tracker/st_cb_readpixels.c \
        state_tracker/st_cb_strings.c \
        state_tracker/st_cb_texture.c \
-        state_tracker/st_cache.c \
+       state_tracker/st_cache.c \
        state_tracker/st_context.c \
        state_tracker/st_debug.c \
        state_tracker/st_draw.c \
@@ -333,15 +288,6 @@ SPARC_API =                        \
 __COMMON_DRIVER_SOURCES =                      \
        drivers/common/driverfuncs.c
 
-X11_DRIVER_SOURCES =           \
-       $(TOP)/src/gallium/winsys/xlib/glxapi.c \
-       $(TOP)/src/gallium/winsys/xlib/fakeglx.c        \
-       $(TOP)/src/gallium/winsys/xlib/xfonts.c \
-       $(TOP)/src/gallium/winsys/xlib/xm_api.c \
-       $(TOP)/src/gallium/winsys/xlib/xm_winsys.c      \
-       $(TOP)/src/gallium/winsys/xlib/xm_winsys_aub.c  \
-       $(TOP)/src/gallium/winsys/xlib/brw_aub.c
-
 OSMESA_DRIVER_SOURCES = \
        drivers/osmesa/osmesa.c