From 0448dbd64a2ef217349f4ada4777d432bc82e46d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jrfonseca@tungstengraphics.com>
Date: Mon, 18 Feb 2008 12:33:34 +0000
Subject: [PATCH] Update for llvm -> gallivm rename.

---
 configs/linux-llvm                        | 2 +-
 src/gallium/SConscript                    | 2 +-
 src/gallium/auxiliary/draw/draw_vs_llvm.c | 2 +-
 src/gallium/winsys/xlib/Makefile          | 8 ++------
 src/mesa/Makefile                         | 4 ++--
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/configs/linux-llvm b/configs/linux-llvm
index a8889321a02..44e200e8565 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -5,7 +5,7 @@ include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-llvm
 
-GALLIUM_AUXILIARY_DIRS += llvm
+GALLIUM_AUXILIARY_DIRS += gallivm
 
 OPT_FLAGS = -g -ansi -pedantic
 DEFINES += -DDEBUG -DDEBUG_MATH -DMESA_LLVM=1
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index a835f6d6614..ea55ed2ed55 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -13,7 +13,7 @@ SConscript([
 	'auxiliary/tgsi/SConscript',
 	'auxiliary/cso_cache/SConscript',
 	'auxiliary/draw/SConscript',
-	#'auxiliary/llvm/SConscript',
+	#'auxiliary/gallivm/SConscript',
 	'auxiliary/pipebuffer/SConscript',
 
 	'drivers/softpipe/SConscript',
diff --git a/src/gallium/auxiliary/draw/draw_vs_llvm.c b/src/gallium/auxiliary/draw/draw_vs_llvm.c
index 44022b6e077..0fd557d6674 100644
--- a/src/gallium/auxiliary/draw/draw_vs_llvm.c
+++ b/src/gallium/auxiliary/draw/draw_vs_llvm.c
@@ -40,7 +40,7 @@
 
 #ifdef MESA_LLVM
 
-#include "llvm/gallivm.h"
+#include "gallivm/gallivm.h"
 
 struct draw_llvm_vertex_shader {
    struct draw_vertex_shader base;
diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile
index 2664ac47ceb..17405388eeb 100644
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/xlib/Makefile
@@ -38,10 +38,6 @@ 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
 
@@ -69,13 +65,13 @@ 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)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) $(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)
+		--start-group $(PIPE_LIB) --end-group $(CELL_LIB) $(CELL_LIB_SPU) $(GL_LIB_DEPS)
 
 
 ######################################################################
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 86a9cf0b88c..2403223db21 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -67,13 +67,13 @@ stand-alone: depend subdirs $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$
 osmesa-only: depend subdirs $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
 
 # Make the GL library
-$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) $(PIPE_LIB) $(CELL_LIB) $(CELL_LIB_SPU) $(LLVM_LIB)
+$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) $(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) \
-		$(PIPE_LIB) $(CELL_LIB) $(CELL_LIB_SPU) $(LLVM_LIB) $(GL_LIB_DEPS)
+		$(PIPE_LIB) $(CELL_LIB) $(CELL_LIB_SPU) $(GL_LIB_DEPS)
 
 # Make the OSMesa library
 $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OSMESA_DRIVER_OBJECTS) \
-- 
2.30.2