[igt-dev] [PATCH i-g-t 6/7] lib: don't build devinfo info files twice

[Lionel Landwerlin]

We can reuse the content of libigt_chipset.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
---
 lib/meson.build | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/lib/meson.build b/lib/meson.build
index 1a355414..0d1e2b69 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -21,8 +21,6 @@ lib_sources = [
 	'igt_x86.c',
 	'instdone.c',
 	'intel_batchbuffer.c',
-	'intel_chipset.c',
-	'intel_device_info.c',
 	'intel_os.c',
 	'intel_mmio.c',
 	'ioctl_wrappers.c',
@@ -96,7 +94,15 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
 		      fallback : 'NO-GIT',
 		      command : [ 'git', 'log', '-n1', '--pretty=format:g%h' ] )
 
-lib_intermediates = []
+lin_igt_chipset_build = static_library('igt_chipset',
+                                       ['intel_chipset.c',
+                                        'intel_device_info.c'],
+                                       include_directories : inc)
+
+lib_igt_chipset = declare_dependency(link_with : lin_igt_chipset_build,
+                                     include_directories : inc)
+
+lib_intermediates = [lin_igt_chipset_build]
 foreach f: lib_sources
     name = f.underscorify(f)
     lib = static_library('igt-' + name,
@@ -124,14 +130,6 @@ lib_igt = declare_dependency(link_with : lib_igt_build,
 
 igt_deps = [ lib_igt ] + lib_deps
 
-lin_igt_chipset_build = static_library('igt_chipset',
-                                       ['intel_chipset.c',
-                                        'intel_device_info.c'],
-                                       include_directories : inc)
-
-lib_igt_chipset = declare_dependency(link_with : lin_igt_chipset_build,
-                                     include_directories : inc)
-
 lib_igt_perf_build = static_library('igt_perf',
 	['igt_perf.c'],
 	include_directories : inc)
-- 
2.17.1