summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2015-09-09 12:40:03 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2015-09-09 12:48:47 +0100
commitc373eaedfc09ff2af7002b64ba0ae8ba71df86a1 (patch)
tree300366c68542404bb56bb0fd5ffa1e59657e6012
parenta3b05e04921a4fcc05cfc994e415e3ceb39fd184 (diff)
glsl: build: remove bogus dependency
v2: rebase on top of the previous commit - don't touch the LOCAL_PATH prefix for nir_constant_expressions.h Cc: 11.0 <mesa-stable@lists.freedesktop.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
-rw-r--r--src/glsl/Android.gen.mk3
-rw-r--r--src/glsl/Makefile.am2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/glsl/Android.gen.mk b/src/glsl/Android.gen.mk
index 798884f260..6898fb0d49 100644
--- a/src/glsl/Android.gen.mk
+++ b/src/glsl/Android.gen.mk
@@ -93,8 +93,7 @@ $(intermediates)/nir/nir_builder_opcodes.h: $(nir_builder_opcodes_deps)
nir_constant_expressions_gen := $(LOCAL_PATH)/nir/nir_constant_expressions.py
nir_constant_expressions_deps := \
$(LOCAL_PATH)/nir/nir_opcodes.py \
- $(LOCAL_PATH)/nir/nir_constant_expressions.py \
- $(LOCAL_PATH)/nir/nir_constant_expressions.h
+ $(LOCAL_PATH)/nir/nir_constant_expressions.py
$(intermediates)/nir/nir_constant_expressions.c: $(nir_constant_expressions_deps)
@mkdir -p $(dir $@)
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 7dfd60404e..1aa9caa3b5 100644
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -248,7 +248,7 @@ nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@
-nir/nir_constant_expressions.c: nir/nir_opcodes.py nir/nir_constant_expressions.py nir/nir_constant_expressions.h
+nir/nir_constant_expressions.c: nir/nir_opcodes.py nir/nir_constant_expressions.py
$(MKDIR_GEN)
$(PYTHON_GEN) $(srcdir)/nir/nir_constant_expressions.py > $@