Mesa (master): automake: vulkan: rename/reuse VULKAN_UTIL_{GENERATED_, }FILES list

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 14281c9035d6b30cda08fd6ab573ee3bfafa2c2d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=14281c9035d6b30cda08fd6ab573ee3bfafa2c2d

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Tue Feb 28 14:13:09 2017 +0000

automake: vulkan: rename/reuse VULKAN_UTIL_{GENERATED_,}FILES list

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/vulkan/Android.mk       | 5 ++---
 src/vulkan/Makefile.am      | 5 ++---
 src/vulkan/Makefile.sources | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/vulkan/Android.mk b/src/vulkan/Android.mk
index b8ed706..0825c1a 100644
--- a/src/vulkan/Android.mk
+++ b/src/vulkan/Android.mk
@@ -37,9 +37,8 @@ intermediates := $(call local-generated-sources-dir)
 LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/include/vulkan
 
-LOCAL_GENERATED_SOURCES := \
-	$(intermediates)/util/vk_enum_to_str.c \
-	$(intermediates)/util/vk_enum_to_str.h
+LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/, \
+	$(VULKAN_UTIL_GENERATED_FILES))
 
 vulkan_api_xml = $(MESA_TOP)/src/vulkan/registry/vk.xml
 
diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
index 072e45e..e28a81c 100644
--- a/src/vulkan/Makefile.am
+++ b/src/vulkan/Makefile.am
@@ -12,14 +12,13 @@ EXTRA_DIST = \
 	util/gen_enum_to_str.py
 
 BUILT_SOURCES = \
-	util/vk_enum_to_str.c \
-	util/vk_enum_to_str.h
+	$(VULKAN_UTIL_GENERATED_FILES)
 
 util/vk_enum_to_str.c util/vk_enum_to_str.h: util/gen_enum_to_str.py $(vulkan_api_xml)
 	$(MKDIR_GEN)
 	$(PYTHON_GEN) $(srcdir)/util/gen_enum_to_str.py --outdir $(top_builddir)/src/vulkan/util
 
-libvulkan_util_la_SOURCES = $(VULKAN_UTIL_FILES)
+libvulkan_util_la_SOURCES = $(VULKAN_UTIL_GENERATED_FILES)
 
 AM_CPPFLAGS = \
 	$(DEFINES) \
diff --git a/src/vulkan/Makefile.sources b/src/vulkan/Makefile.sources
index fbb8bfc..7510d72 100644
--- a/src/vulkan/Makefile.sources
+++ b/src/vulkan/Makefile.sources
@@ -11,6 +11,6 @@ VULKAN_WSI_X11_FILES := \
 	wsi/wsi_common_x11.c \
 	wsi/wsi_common_x11.h
 
-VULKAN_UTIL_FILES := \
+VULKAN_UTIL_GENERATED_FILES := \
 	util/vk_enum_to_str.c \
 	util/vk_enum_to_str.h