summaryrefslogtreecommitdiff
path: root/src/vulkan
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2017-02-17 11:57:24 -0800
committerDylan Baker <dylan@pnwbakers.com>2017-02-22 13:12:02 -0800
commit8e03250fcf4fc5de31e92ca4919959d932888a69 (patch)
treef231bc72a0b738c981a4871f0cd7c82308db38c6 /src/vulkan
parente9dcb17962f7e58a81c93bae7bd33885675b1043 (diff)
vulkan: Combine wsi and util makefiles
Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/vulkan')
-rw-r--r--src/vulkan/Makefile.am (renamed from src/vulkan/wsi/Makefile.am)16
-rw-r--r--src/vulkan/Makefile.sources16
-rw-r--r--src/vulkan/util/Makefile.am22
-rw-r--r--src/vulkan/util/gen_enum_to_str.py4
-rw-r--r--src/vulkan/wsi/Makefile.sources12
5 files changed, 32 insertions, 38 deletions
diff --git a/src/vulkan/wsi/Makefile.am b/src/vulkan/Makefile.am
index b5ccf986ac3..fa72d63d65f 100644
--- a/src/vulkan/wsi/Makefile.am
+++ b/src/vulkan/Makefile.am
@@ -1,9 +1,21 @@
-
include Makefile.sources
+noinst_LTLIBRARIES = libvulkan_wsi.la libvulkan_util.la
+
vulkan_includedir = $(includedir)/vulkan
+vulkan_api_xml = $(top_srcdir)/src/vulkan/registry/vk.xml
+
+EXTRA_DIST = \
+ util/gen_enum_to_str.py
+
+BUILT_SOURCES = \
+ util/vk_enum_to_str.c \
+ util/vk_enum_to_str.h
+
+util/vk_enum_to_str.c util/vk_enum_to_str.h: util/gen_enum_to_str.py $(vulkan_api_xml)
+ $(AM_V_GEN)$(PYTHON2) $(srcdir)/util/gen_enum_to_str.py
-noinst_LTLIBRARIES = libvulkan_wsi.la
+libvulkan_util_la_SOURCES = $(VULKAN_UTIL_FILES)
AM_CPPFLAGS = \
$(DEFINES) \
diff --git a/src/vulkan/Makefile.sources b/src/vulkan/Makefile.sources
new file mode 100644
index 00000000000..fbb8bfc51de
--- /dev/null
+++ b/src/vulkan/Makefile.sources
@@ -0,0 +1,16 @@
+
+VULKAN_WSI_FILES := \
+ wsi/wsi_common.h \
+ wsi/wsi_common_queue.h
+
+VULKAN_WSI_WAYLAND_FILES := \
+ wsi/wsi_common_wayland.c \
+ wsi/wsi_common_wayland.h
+
+VULKAN_WSI_X11_FILES := \
+ wsi/wsi_common_x11.c \
+ wsi/wsi_common_x11.h
+
+VULKAN_UTIL_FILES := \
+ util/vk_enum_to_str.c \
+ util/vk_enum_to_str.h
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__),
diff --git a/src/vulkan/wsi/Makefile.sources b/src/vulkan/wsi/Makefile.sources
deleted file mode 100644
index 50660f9a541..00000000000
--- a/src/vulkan/wsi/Makefile.sources
+++ /dev/null
@@ -1,12 +0,0 @@
-
-VULKAN_WSI_FILES := \
- wsi_common.h \
- wsi_common_queue.h
-
-VULKAN_WSI_WAYLAND_FILES := \
- wsi_common_wayland.c \
- wsi_common_wayland.h
-
-VULKAN_WSI_X11_FILES := \
- wsi_common_x11.c \
- wsi_common_x11.h \ No newline at end of file