diff options
| author | Emil Velikov <[email protected]> | 2016-07-06 16:18:21 +0100 |
|---|---|---|
| committer | Mark Janes <[email protected]> | 2016-07-06 10:19:19 -0700 |
| commit | 9618e2a24c18b5bbc9ff872d1f6870261d14dee5 (patch) | |
| tree | df94a809990c8a152bafd7784da8fad8d6d08870 /src | |
| parent | 64d35f817afc3106684dd74491b14be4d676cb88 (diff) | |
anv: vulkan: remove the anv_device.$(OBJEXT) rule
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" <[email protected]>
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 <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Tested-by: Mark Janes <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 4 | ||||
| -rw-r--r-- | 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 07c81a89af4..fe7371e9665 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -137,10 +137,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 aa1459af5e4..7303995b2fe 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 := \ |