Fine by me On Jul 6, 2016 8:18 AM, "Emil Velikov" <emil.l.veli...@gmail.com> wrote:
> From: Emil Velikov <emmil.veli...@collabora.com> > > Atm the actual rule will expand to foo.o which is used for static > libraries only. > > Thus the automake manual recommendation [to use OBJEXT] won't help us, > since since we're working with a shared library. > > Thus let's 'demote' the file and add it back to BUILT_SOURCES. This will > manage all the complexity for us, at the (existing expense) of working > only with the all, check and install targets. > > The crazy (why the issue was hard to spot): > If the dependencies (.deps/*.Plo) are already created one can alter the > anv_device.$(OBJEXT) line and/or nuke it all together. That won't lead > to any warnings/issues, even though the Makefile is regenerated. > > Moral of the story: > Always rm -rf top_builddir or don't resolve the dependencies manually > and use BUILT_SOURCES. > > Cc: "12.0" <mesa-sta...@lists.freedesktop.org> > Cc: Vinson Lee <v...@freedesktop.org> > Cc: Kenneth Graunke <kenn...@whitecape.org> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96825 > Fixes: d7a604c3f7a ("anv: use cache uuid based on the build timestamp.") > Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> > --- > Just checking if make distcheck will find any fall-outs, but should work > like a charm. > > src/intel/vulkan/Makefile.am | 4 +--- > src/intel/vulkan/Makefile.sources | 3 ++- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am > index b605c08..0e521cf 100644 > --- a/src/intel/vulkan/Makefile.am > +++ b/src/intel/vulkan/Makefile.am > @@ -144,10 +144,8 @@ anv_timestamp.h: > @echo "Updating anv_timestamp.h" > $(AM_V_GEN) echo "#define ANV_TIMESTAMP \"$(TIMESTAMP_CMD)\"" > $@ > > -anv_device.$(OBJEXT): anv_timestamp.h > - > BUILT_SOURCES = $(VULKAN_GENERATED_FILES) > -CLEANFILES = $(BUILT_SOURCES) dev_icd.json anv_timestamp.h > +CLEANFILES = $(BUILT_SOURCES) dev_icd.json > EXTRA_DIST = \ > $(top_srcdir)/include/vulkan/vk_icd.h \ > anv_entrypoints_gen.py \ > diff --git a/src/intel/vulkan/Makefile.sources > b/src/intel/vulkan/Makefile.sources > index aa1459a..7303995 100644 > --- a/src/intel/vulkan/Makefile.sources > +++ b/src/intel/vulkan/Makefile.sources > @@ -66,7 +66,8 @@ VULKAN_GEM_STUB_FILES := \ > > VULKAN_GENERATED_FILES := \ > anv_entrypoints.c \ > - anv_entrypoints.h > + anv_entrypoints.h \ > + anv_timestamp.h > > > GEN7_FILES := \ > -- > 2.8.2 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev