Mesa (master): glsl: build: remove bogus dependency
Emil Velikov
evelikov at kemper.freedesktop.org
Wed Sep 9 13:49:44 UTC 2015
Module: Mesa
Branch: master
Commit: c373eaedfc09ff2af7002b64ba0ae8ba71df86a1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c373eaedfc09ff2af7002b64ba0ae8ba71df86a1
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Wed Sep 9 12:40:03 2015 +0100
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 at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
---
src/glsl/Android.gen.mk | 3 +--
src/glsl/Makefile.am | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/glsl/Android.gen.mk b/src/glsl/Android.gen.mk
index 798884f..6898fb0 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 7dfd604..1aa9caa 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 > $@
More information about the mesa-commit
mailing list