summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gallium/Makefile2
-rw-r--r--src/gallium/Makefile.template2
-rw-r--r--src/gallium/auxiliary/llvm/Makefile2
-rw-r--r--src/gallium/drivers/cell/ppu/Makefile2
-rw-r--r--src/gallium/drivers/cell/spu/Makefile2
-rw-r--r--src/gallium/winsys/dri/Makefile.template2
-rw-r--r--src/mesa/Makefile2
-rw-r--r--src/mesa/sources66
8 files changed, 40 insertions, 40 deletions
diff --git a/src/gallium/Makefile b/src/gallium/Makefile
index a13b9a52d3..89e068a449 100644
--- a/src/gallium/Makefile
+++ b/src/gallium/Makefile
@@ -2,7 +2,7 @@ TOP = ../..
include $(TOP)/configs/current
-SUBDIRS = aux drivers
+SUBDIRS = auxiliary drivers
default: subdirs
diff --git a/src/gallium/Makefile.template b/src/gallium/Makefile.template
index 0717ed8dd2..83b25f9b47 100644
--- a/src/gallium/Makefile.template
+++ b/src/gallium/Makefile.template
@@ -17,7 +17,7 @@ INCLUDES = \
-I. \
-I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/include/pipe \
- -I$(TOP)/src/gallium/aux \
+ -I$(TOP)/src/gallium/auxiliary \
-I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/mesa \
-I$(TOP)/include \
diff --git a/src/gallium/auxiliary/llvm/Makefile b/src/gallium/auxiliary/llvm/Makefile
index e6ac399d08..e0abf860c1 100644
--- a/src/gallium/auxiliary/llvm/Makefile
+++ b/src/gallium/auxiliary/llvm/Makefile
@@ -31,7 +31,7 @@ OBJECTS = $(C_SOURCES:.c=.o) \
INCLUDES = \
-I. \
-I$(TOP)/src/gallium/drivers
- -I$(TOP)/src/gallium/aux \
+ -I$(TOP)/src/gallium/auxiliary \
-I$(TOP)/src/gallium/include \
-I$(TOP)/src/mesa \
-I$(TOP)/include
diff --git a/src/gallium/drivers/cell/ppu/Makefile b/src/gallium/drivers/cell/ppu/Makefile
index 011863c11e..a4c3f29e8a 100644
--- a/src/gallium/drivers/cell/ppu/Makefile
+++ b/src/gallium/drivers/cell/ppu/Makefile
@@ -43,7 +43,7 @@ OBJECTS = $(SOURCES:.c=.o) \
INCLUDE_DIRS = \
-I$(TOP)/src/mesa \
-I$(TOP)/src/gallium/include \
- -I$(TOP)/src/gallium/aux \
+ -I$(TOP)/src/gallium/auxiliary \
-I$(TOP)/src/gallium/drivers
.c.o:
diff --git a/src/gallium/drivers/cell/spu/Makefile b/src/gallium/drivers/cell/spu/Makefile
index 7aa947299e..30ef2450ec 100644
--- a/src/gallium/drivers/cell/spu/Makefile
+++ b/src/gallium/drivers/cell/spu/Makefile
@@ -34,7 +34,7 @@ SPU_ASM_OUT = $(SOURCES:.c=.s) \
INCLUDE_DIRS = \
-I$(TOP)/src/mesa \
-I$(TOP)/src/gallium/include \
- -I$(TOP)/src/gallium/aux \
+ -I$(TOP)/src/gallium/auxiliary \
-I$(TOP)/src/gallium/drivers
diff --git a/src/gallium/winsys/dri/Makefile.template b/src/gallium/winsys/dri/Makefile.template
index b96305c094..2a261ed669 100644
--- a/src/gallium/winsys/dri/Makefile.template
+++ b/src/gallium/winsys/dri/Makefile.template
@@ -49,7 +49,7 @@ SHARED_INCLUDES = \
-I$(TOP)/include \
-I$(TOP)/include/GL/internal \
-I$(TOP)/src/gallium/include \
- -I$(TOP)/src/gallium/aux \
+ -I$(TOP)/src/gallium/auxiliary \
-I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 561608fedd..c8cb2b592f 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -21,7 +21,7 @@ CELL_LIB_SPU = $(TOP)/src/gallium/drivers/cell/spu/g3d_spu.a
endif
ifeq ($(CONFIG_NAME), linux-llvm)
-LLVM_LIB = $(TOP)/src/gallium/aux/llvm/libgallivm.a
+LLVM_LIB = $(TOP)/src/gallium/auxiliary/llvm/libgallivm.a
endif
.SUFFIXES : .cpp
diff --git a/src/mesa/sources b/src/mesa/sources
index 2d07738210..cecd8a830f 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -158,45 +158,45 @@ VF_SOURCES = \
DRAW_SOURCES = \
- $(TOP)/src/gallium/aux/draw/draw_clip.c \
- $(TOP)/src/gallium/aux/draw/draw_context.c\
- $(TOP)/src/gallium/aux/draw/draw_cull.c \
- $(TOP)/src/gallium/aux/draw/draw_debug.c \
- $(TOP)/src/gallium/aux/draw/draw_flatshade.c \
- $(TOP)/src/gallium/aux/draw/draw_offset.c \
- $(TOP)/src/gallium/aux/draw/draw_prim.c \
- $(TOP)/src/gallium/aux/draw/draw_stipple.c \
- $(TOP)/src/gallium/aux/draw/draw_twoside.c \
- $(TOP)/src/gallium/aux/draw/draw_unfilled.c \
- $(TOP)/src/gallium/aux/draw/draw_validate.c \
- $(TOP)/src/gallium/aux/draw/draw_vbuf.c \
- $(TOP)/src/gallium/aux/draw/draw_vertex.c \
- $(TOP)/src/gallium/aux/draw/draw_vertex_cache.c \
- $(TOP)/src/gallium/aux/draw/draw_vertex_fetch.c \
- $(TOP)/src/gallium/aux/draw/draw_vertex_shader.c \
- $(TOP)/src/gallium/aux/draw/draw_vf.c \
- $(TOP)/src/gallium/aux/draw/draw_vf_generic.c \
- $(TOP)/src/gallium/aux/draw/draw_vf_sse.c \
- $(TOP)/src/gallium/aux/draw/draw_wide_prims.c
+ $(TOP)/src/gallium/auxiliary/draw/draw_clip.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/aux/tgsi/exec/tgsi_exec.c \
- $(TOP)/src/gallium/aux/tgsi/exec/tgsi_sse2.c
+ $(TOP)/src/gallium/auxiliary/tgsi/exec/tgsi_exec.c \
+ $(TOP)/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c
TGSIUTIL_SOURCES = \
- $(TOP)/src/gallium/aux/tgsi/util/tgsi_build.c \
- $(TOP)/src/gallium/aux/tgsi/util/tgsi_dump.c \
- $(TOP)/src/gallium/aux/tgsi/util/tgsi_parse.c \
- $(TOP)/src/gallium/aux/tgsi/util/tgsi_util.c
+ $(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/aux/cso_cache/cso_hash.c \
- $(TOP)/src/gallium/aux/cso_cache/cso_cache.c
+ $(TOP)/src/gallium/auxiliary/cso_cache/cso_hash.c \
+ $(TOP)/src/gallium/auxiliary/cso_cache/cso_cache.c
PIPEUTIL_SOURCES = \
- $(TOP)/src/gallium/aux/util/p_debug.c \
- $(TOP)/src/gallium/aux/util/p_tile.c \
- $(TOP)/src/gallium/aux/util/p_util.c
+ $(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 \
@@ -428,7 +428,7 @@ INCLUDE_DIRS = \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/drivers \
- -I$(TOP)/src/gallium/aux
+ -I$(TOP)/src/gallium/auxiliary
OLD_INCLUDE_DIRS = \
-I$(TOP)/src/mesa/tnl \
@@ -438,4 +438,4 @@ OLD_INCLUDE_DIRS = \
-I$(TOP)/src/mesa/shader \
-I$(TOP)/src/mesa/shader/grammar \
-I$(TOP)/src/mesa/shader/slang \
- -I$(TOP)/s$(TOP)/src/gallium/aux/tgsi
+ -I$(TOP)/s$(TOP)/src/gallium/auxiliary/tgsi