From 82d0b59f02ba7041b12836874f1eb3dd2b58d979 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 20 Apr 2016 18:09:22 +0100 Subject: [PATCH] anv: use the GENERATED_FILES variable ... rather than having duplicates files through the sources lists. Splitting things as is, has the side effect of making things clearer and easing a potential android build. The latter of which automatically adds BUILT_SOURCES to the binary. Signed-off-by: Emil Velikov Acked-by: Jason Ekstrand --- src/intel/vulkan/Makefile.am | 1 + src/intel/vulkan/Makefile.sources | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index c7baf176fbb..8a545a89657 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -69,6 +69,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = -DVK_USE_PLATFORM_XCB_KHR -Wno-override-init -msse2 VULKAN_SOURCES = \ + $(VULKAN_GENERATED_FILES) \ $(VULKAN_FILES) \ $(VULKAN_WSI_X11_FILES) diff --git a/src/intel/vulkan/Makefile.sources b/src/intel/vulkan/Makefile.sources index a3b6a90bcf2..ab34bfa6e01 100644 --- a/src/intel/vulkan/Makefile.sources +++ b/src/intel/vulkan/Makefile.sources @@ -26,8 +26,6 @@ VULKAN_FILES := \ anv_descriptor_set.c \ anv_device.c \ anv_dump.c \ - anv_entrypoints.c \ - anv_entrypoints.h \ anv_formats.c \ anv_image.c \ anv_intel.c \ -- 2.30.2