summaryrefslogtreecommitdiffstats
path: root/src/glsl/glcpp
diff options
context:
space:
mode:
authorJordan Justen <[email protected]>2012-11-30 16:32:11 -0800
committerJordan Justen <[email protected]>2012-12-07 14:46:18 -0800
commit59284bc44a3f30ec18192098a4e1e43b6c6d392a (patch)
tree3b329722485258ba74640f31bdbe8830b51d4488 /src/glsl/glcpp
parent970ec8dbc3491615964808ce1563d34d08e806cb (diff)
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 <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl/glcpp')
-rw-r--r--src/glsl/glcpp/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glcpp/Makefile.am b/src/glsl/glcpp/Makefile.am
index 04d8cda0194..d8d39d295fa 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