From: Ben Skeggs <skeggsb@gmail.com>
Date: Wed, 16 Jan 2008 02:14:19 +0000 (+1100)
Subject: Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
X-Git-Tag: 062012170305~17580^2~496^2~298^2~16^2~412
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3119e9a14b66fcfb08fcc3563602273dd2e1893c;p=profile%2Fivi%2Fmesa.git

Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

Conflicts:

	src/mesa/pipe/Makefile
---

3119e9a14b66fcfb08fcc3563602273dd2e1893c
diff --cc src/mesa/pipe/Makefile
index fbd36d9,d880d09..6012b2b
--- a/src/mesa/pipe/Makefile
+++ b/src/mesa/pipe/Makefile
@@@ -6,8 -6,11 +6,12 @@@ ifeq ($(CONFIG_NAME), linux-cell
  CELL_DIR = cell
  endif
  
- SUBDIRS = softpipe i915simple i965simple nv40 nv50 failover \
- 	  pipebuffer $(CELL_DIR)
+ ifeq ($(CONFIG_NAME), linux-llvm)
+ LLVM_DIR = llvm
+ endif
+ 
 -SUBDIRS = softpipe i915simple i965simple failover pipebuffer $(CELL_DIR) $(LLVM_DIR)
++SUBDIRS = softpipe i915simple i965simple nv40 nv50 failover pipebuffer \
++	  $(CELL_DIR) $(LLVM_DIR)
  
  
  default: subdirs