diff options
| author | Emil Velikov <[email protected]> | 2017-02-28 14:13:09 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-02-28 14:13:09 +0000 |
| commit | 14281c9035d6b30cda08fd6ab573ee3bfafa2c2d (patch) | |
| tree | 0f80101a5dad2326213a65ed564970972d9fa63b /src | |
| parent | 3f2cb699cfe0481f214c709b5a1375caf0a9c7fe (diff) | |
automake: vulkan: rename/reuse VULKAN_UTIL_{GENERATED_,}FILES list
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/vulkan/Android.mk | 5 | ||||
| -rw-r--r-- | src/vulkan/Makefile.am | 5 | ||||
| -rw-r--r-- | 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 b8ed706f1de..0825c1ac108 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 072e45e3469..e28a81c8cf7 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 fbb8bfc51de..7510d7264ed 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 |