From c373eaedfc09ff2af7002b64ba0ae8ba71df86a1 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 9 Sep 2015 12:40:03 +0100 Subject: [PATCH] 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 Signed-off-by: Emil Velikov Reviewed-by: Matt Turner --- 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 798884f2602..6898fb0d492 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 7dfd60404ee..1aa9caa3b5a 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 > $@ -- 2.30.2