diff options
| author | Dylan Baker <[email protected]> | 2017-02-17 11:57:24 -0800 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2017-02-22 13:12:02 -0800 |
| commit | 8e03250fcf4fc5de31e92ca4919959d932888a69 (patch) | |
| tree | f231bc72a0b738c981a4871f0cd7c82308db38c6 /src/vulkan/util | |
| parent | e9dcb17962f7e58a81c93bae7bd33885675b1043 (diff) | |
vulkan: Combine wsi and util makefiles
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/vulkan/util')
| -rw-r--r-- | src/vulkan/util/Makefile.am | 22 | ||||
| -rw-r--r-- | src/vulkan/util/gen_enum_to_str.py | 4 |
2 files changed, 2 insertions, 24 deletions
diff --git a/src/vulkan/util/Makefile.am b/src/vulkan/util/Makefile.am deleted file mode 100644 index 87c96d5e5bb..00000000000 --- a/src/vulkan/util/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src - -EXTRA_DIST = \ - gen_enum_to_str.py - -BUILT_SOURCES = \ - vk_enum_to_str.c \ - vk_enum_to_str.h - -vk_enum_to_str.c vk_enum_to_str.h: gen_enum_to_str.py $(vulkan_api_xml) - $(AM_V_GEN)$(PYTHON2) $(srcdir)/gen_enum_to_str.py - -noinst_LTLIBRARIES = libvulkan_util.la - -libvulkan_util_la_SOURCES = \ - vk_enum_to_str.c \ - vk_enum_to_str.h - diff --git a/src/vulkan/util/gen_enum_to_str.py b/src/vulkan/util/gen_enum_to_str.py index 0564b8e0280..4b6fdf3b3de 100644 --- a/src/vulkan/util/gen_enum_to_str.py +++ b/src/vulkan/util/gen_enum_to_str.py @@ -159,8 +159,8 @@ def xml_parser(filename): def main(): enums = xml_parser(VK_XML) - for template, file_ in [(C_TEMPLATE, 'vk_enum_to_str.c'), - (H_TEMPLATE, 'vk_enum_to_str.h')]: + for template, file_ in [(C_TEMPLATE, 'util/vk_enum_to_str.c'), + (H_TEMPLATE, 'util/vk_enum_to_str.h')]: with open(file_, 'wb') as f: f.write(template.render( file=os.path.basename(__file__), |