Mesa (master): program/hash_table.c: rename to program/prog_hash_table.c

[Jordan Justen]

Module: Mesa
Branch: master
Commit: 59284bc44a3f30ec18192098a4e1e43b6c6d392a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=59284bc44a3f30ec18192098a4e1e43b6c6d392a

Author: Jordan Justen <jordan.l.justen at intel.com>
Date:   Fri Nov 30 16:32:11 2012 -0800

program/hash_table.c: rename to program/prog_hash_table.c

Removes a collision of the object file name for main/hash_table
and program/hash_table.

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/glsl/Makefile.am                               |    4 ++--
 src/glsl/SConscript                                |    4 ++--
 src/glsl/builtin_compiler/Makefile.am              |    2 +-
 src/glsl/glcpp/Makefile.am                         |    2 +-
 src/mesa/Android.libmesa_glsl_utils.mk             |    4 ++--
 src/mesa/SConscript                                |    2 +-
 .../program/{hash_table.c => prog_hash_table.c}    |    0 
 src/mesa/sources.mak                               |    2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index ea76176..2ba439c 100644
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -49,14 +49,14 @@ libglsl_la_LIBADD = glcpp/libglcpp.la
 libglsl_la_LDFLAGS =
 
 glsl_compiler_SOURCES = \
-	$(top_srcdir)/src/mesa/program/hash_table.c \
+	$(top_srcdir)/src/mesa/program/prog_hash_table.c \
 	$(top_srcdir)/src/mesa/program/symbol_table.c \
 	$(GLSL_COMPILER_CXX_FILES)
 
 glsl_compiler_LDADD = libglsl.la
 
 glsl_test_SOURCES = \
-	$(top_srcdir)/src/mesa/program/hash_table.c \
+	$(top_srcdir)/src/mesa/program/prog_hash_table.c \
 	$(top_srcdir)/src/mesa/program/symbol_table.c \
 	$(GLSL_SRCDIR)/standalone_scaffolding.cpp \
 	test.cpp \
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 0cf25c0..38de60d 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -58,13 +58,13 @@ if env['crosscompile'] and not env['embedded']:
 else:
     # Copy these files to avoid generation object files into src/mesa/program
     env.Prepend(CPPPATH = ['#src/mesa/program'])
-    env.Command('hash_table.c', '#src/mesa/program/hash_table.c', Copy('$TARGET', '$SOURCE'))
+    env.Command('prog_hash_table.c', '#src/mesa/program/prog_hash_table.c', Copy('$TARGET', '$SOURCE'))
     env.Command('symbol_table.c', '#src/mesa/program/symbol_table.c', Copy('$TARGET', '$SOURCE'))
 
     compiler_objs = env.StaticObject(source_lists['GLSL_COMPILER_CXX_FILES'])
 
     mesa_objs = env.StaticObject([
-        'hash_table.c',
+        'prog_hash_table.c',
         'symbol_table.c',
     ])
 
diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am
index d6f85a7..5fad35d 100644
--- a/src/glsl/builtin_compiler/Makefile.am
+++ b/src/glsl/builtin_compiler/Makefile.am
@@ -55,7 +55,7 @@ builtin_compiler_SOURCES = \
 	$(GLSL_BUILDDIR)/glsl_parser.cc \
 	$(LIBGLSL_FILES) \
 	$(LIBGLSL_CXX_FILES) \
-	$(top_srcdir)/src/mesa/program/hash_table.c \
+	$(top_srcdir)/src/mesa/program/prog_hash_table.c \
 	$(top_srcdir)/src/mesa/program/symbol_table.c \
 	$(GLSL_COMPILER_CXX_FILES) \
 	builtin_stubs.cpp
diff --git a/src/glsl/glcpp/Makefile.am b/src/glsl/glcpp/Makefile.am
index 04d8cda..d8d39d2 100644
--- a/src/glsl/glcpp/Makefile.am
+++ b/src/glsl/glcpp/Makefile.am
@@ -46,7 +46,7 @@ libglcpp_la_SOURCES = \
 
 glcpp_SOURCES = \
 	../ralloc.c \
-	$(top_srcdir)/src/mesa/program/hash_table.c \
+	$(top_srcdir)/src/mesa/program/prog_hash_table.c \
 	glcpp.c
 
 glcpp_LDADD = libglcpp.la
diff --git a/src/mesa/Android.libmesa_glsl_utils.mk b/src/mesa/Android.libmesa_glsl_utils.mk
index 4802757..5ae946f 100644
--- a/src/mesa/Android.libmesa_glsl_utils.mk
+++ b/src/mesa/Android.libmesa_glsl_utils.mk
@@ -36,7 +36,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := libmesa_glsl_utils
 
 LOCAL_SRC_FILES := \
-	program/hash_table.c \
+	program/prog_hash_table.c \
 	program/symbol_table.c
 
 include $(MESA_COMMON_MK)
@@ -52,7 +52,7 @@ LOCAL_MODULE := libmesa_glsl_utils
 LOCAL_IS_HOST_MODULE := true
 
 LOCAL_SRC_FILES := \
-	program/hash_table.c \
+	program/prog_hash_table.c \
 	program/symbol_table.c
 
 include $(MESA_COMMON_MK)
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 0b4dd7e..a2492f7 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -294,7 +294,7 @@ env.Append(CPPPATH = [Dir('.').abspath])
 
 program_sources = [
     'program/arbprogparse.c',
-    'program/hash_table.c',
+    'program/prog_hash_table.c',
     'program/ir_to_mesa.cpp',
     'program/program.c',
     'program/program_parse_extra.c',
diff --git a/src/mesa/program/hash_table.c b/src/mesa/program/prog_hash_table.c
similarity index 100%
rename from src/mesa/program/hash_table.c
rename to src/mesa/program/prog_hash_table.c
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 86aa31d..8cde2c4 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -248,7 +248,7 @@ STATETRACKER_FILES = \
 
 PROGRAM_FILES = \
 	$(SRCDIR)program/arbprogparse.c \
-	$(SRCDIR)program/hash_table.c \
+	$(SRCDIR)program/prog_hash_table.c \
 	$(SRCDIR)program/ir_to_mesa.cpp \
 	$(SRCDIR)program/program.c \
 	$(SRCDIR)program/program_parse_extra.c \