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

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

diff --git a/src/vulkan/Android.mk b/src/vulkan/Android.mk
index b8ed706f1dec259f0d8cc1e4a0b86f3e94a068dc..0825c1ac108b1e6c7386656a761bec8bb1d42ddb 100644 (file)
--- 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 072e45e3469b966eaf7856ec88f3ee643cc670d3..e28a81c8cf7025dbdc909980cb9ec2056e3a7684 100644 (file)
--- 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 fbb8bfc51decc1592e67368482e9d087594dbd31..7510d7264ed1c70518701364ec2e4adcf1906154 100644 (file)
--- 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