Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / mesa / shader / slang / library / Makefile

diff --git a/src/mesa/shader/slang/library/Makefile b/src/mesa/shader/slang/library/Makefile
index 92a313d7b0d9d09f5b62b33ba23768454b803958..0e03fac2ee176ad8c296acf752785b1c3bac8869 100644 (file)
--- a/src/mesa/shader/slang/library/Makefile
+++ b/src/mesa/shader/slang/library/Makefile
@@ -17,11 +17,11 @@ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
 default: syntax builtin
 
 clean:
-       rm -f syn_to_c gc_to_bin *_syn.h *_gc.h
+       -rm -f syn_to_c gc_to_bin *_syn.h *_gc.h
 
 syntax: slang_pp_directives_syn.h slang_pp_expression_syn.h slang_shader_syn.h slang_pp_version_syn.h
 
-builtin: builtin_110 builtin_120 builtin_vec4
+builtin: builtin_110 builtin_120
 
 #
 # executables
@@ -29,7 +29,7 @@ builtin: builtin_110 builtin_120 builtin_vec4
 
 syn_to_c: syn_to_c.c
        $(CC) syn_to_c.c -o syn_to_c
-       
+
 gc_to_bin: gc_to_bin.c slang_shader_syn.h
        $(CC) gc_to_bin.c -o gc_to_bin
 
@@ -57,7 +57,6 @@ builtin_110: slang_common_builtin_gc.h slang_core_gc.h slang_fragment_builtin_gc
 
 builtin_120: slang_120_core_gc.h slang_builtin_120_common_gc.h slang_builtin_120_fragment_gc.h
 
-builtin_vec4: slang_builtin_vec4_gc.h
 
 slang_120_core_gc.h: gc_to_bin slang_120_core.gc
        ./gc_to_bin 1 slang_120_core.gc slang_120_core_gc.h
@@ -68,9 +67,6 @@ slang_builtin_120_common_gc.h: gc_to_bin slang_builtin_120_common.gc
 slang_builtin_120_fragment_gc.h: gc_to_bin slang_builtin_120_fragment.gc
        ./gc_to_bin 1 slang_builtin_120_fragment.gc slang_builtin_120_fragment_gc.h
 
-slang_builtin_vec4_gc.h: gc_to_bin slang_builtin_vec4.gc
-       ./gc_to_bin 1 slang_builtin_vec4.gc slang_builtin_vec4_gc.h
-
 slang_common_builtin_gc.h: gc_to_bin slang_common_builtin.gc
        ./gc_to_bin 1 slang_common_builtin.gc slang_common_builtin_gc.h