<p dir="ltr">So here's a thought: could we make anv_timestamp.h generation trigger off of libvulkan_intel.so getting rebuilt? I'm not quite sure how one would even do that but it seems like a thing you might be able to do...</p>
<div class="gmail_quote">On Jul 6, 2016 8:18 AM, "Emil Velikov" <<a href="mailto:emil.l.velikov@gmail.com">emil.l.velikov@gmail.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Emil Velikov <<a href="mailto:emmil.velikov@collabora.com">emmil.velikov@collabora.com</a>><br>
<br>
Atm the actual rule will expand to foo.o which is used for static<br>
libraries only.<br>
<br>
Thus the automake manual recommendation [to use OBJEXT] won't help us,<br>
since since we're working with a shared library.<br>
<br>
Thus let's 'demote' the file and add it back to BUILT_SOURCES. This will<br>
manage all the complexity for us, at the (existing expense) of working<br>
only with the all, check and install targets.<br>
<br>
The crazy (why the issue was hard to spot):<br>
If the dependencies (.deps/*.Plo) are already created one can alter the<br>
anv_device.$(OBJEXT) line and/or nuke it all together. That won't lead<br>
to any warnings/issues, even though the Makefile is regenerated.<br>
<br>
Moral of the story:<br>
Always rm -rf top_builddir or don't resolve the dependencies manually<br>
and use BUILT_SOURCES.<br>
<br>
Cc: "12.0" <<a href="mailto:mesa-stable@lists.freedesktop.org">mesa-stable@lists.freedesktop.org</a>><br>
Cc: Vinson Lee <<a href="mailto:vlee@freedesktop.org">vlee@freedesktop.org</a>><br>
Cc: Kenneth Graunke <<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>><br>
Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=96825" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/show_bug.cgi?id=96825</a><br>
Fixes: d7a604c3f7a ("anv: use cache uuid based on the build timestamp.")<br>
Signed-off-by: Emil Velikov <<a href="mailto:emil.l.velikov@gmail.com">emil.l.velikov@gmail.com</a>><br>
---<br>
Just checking if make distcheck will find any fall-outs, but should work<br>
like a charm.<br>
<br>
src/intel/vulkan/Makefile.am | 4 +---<br>
src/intel/vulkan/Makefile.sources | 3 ++-<br>
2 files changed, 3 insertions(+), 4 deletions(-)<br>
<br>
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am<br>
index b605c08..0e521cf 100644<br>
--- a/src/intel/vulkan/Makefile.am<br>
+++ b/src/intel/vulkan/Makefile.am<br>
@@ -144,10 +144,8 @@ anv_timestamp.h:<br>
@echo "Updating anv_timestamp.h"<br>
$(AM_V_GEN) echo "#define ANV_TIMESTAMP \"$(TIMESTAMP_CMD)\"" > $@<br>
<br>
-anv_device.$(OBJEXT): anv_timestamp.h<br>
-<br>
BUILT_SOURCES = $(VULKAN_GENERATED_FILES)<br>
-CLEANFILES = $(BUILT_SOURCES) dev_icd.json anv_timestamp.h<br>
+CLEANFILES = $(BUILT_SOURCES) dev_icd.json<br>
EXTRA_DIST = \<br>
$(top_srcdir)/include/vulkan/vk_icd.h \<br>
anv_entrypoints_gen.py \<br>
diff --git a/src/intel/vulkan/Makefile.sources b/src/intel/vulkan/Makefile.sources<br>
index aa1459a..7303995 100644<br>
--- a/src/intel/vulkan/Makefile.sources<br>
+++ b/src/intel/vulkan/Makefile.sources<br>
@@ -66,7 +66,8 @@ VULKAN_GEM_STUB_FILES := \<br>
<br>
VULKAN_GENERATED_FILES := \<br>
anv_entrypoints.c \<br>
- anv_entrypoints.h<br>
+ anv_entrypoints.h \<br>
+ anv_timestamp.h<br>
<br>
<br>
GEN7_FILES := \<br>
--<br>
2.8.2<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</blockquote></div>