From b6c7a3020c495e06cf25e243e6a5b97042235624 Mon Sep 17 00:00:00 2001
From: Pekka Paalanen <pekka.paalanen@collabora.com>
Date: Fri, 5 Apr 2019 13:50:43 +0300
Subject: [PATCH] build: use dependency for matrix.c

matrix.c needs to be built differently for a test program vs. everything else,
so it cannot be in a helper lib. Instead, make a dependency object for it for
easy use which always gets all the paths correct automatically.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
---
 clients/meson.build   | 10 +++-------
 libweston/meson.build |  2 +-
 shared/meson.build    |  6 ++++++
 tests/meson.build     |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/clients/meson.build b/clients/meson.build
index ff6246db..135e54e7 100644
--- a/clients/meson.build
+++ b/clients/meson.build
@@ -163,11 +163,8 @@ tools_enabled = get_option('tools')
 tools_list = [
 	{
 		'name': 'calibrator',
-		'sources': [
-			'calibrator.c',
-			'../shared/matrix.c',
-		],
-		'deps': [ dep_toytoolkit ],
+		'sources': [ 'calibrator.c' ],
+		'deps': [ dep_toytoolkit, dep_matrix_c ],
 	},
 	{
 		'name': 'debug',
@@ -202,11 +199,10 @@ tools_list = [
 		'name': 'touch-calibrator',
 		'sources': [
 			'touch-calibrator.c',
-			'../shared/matrix.c',
 			weston_touch_calibration_client_protocol_h,
 			weston_touch_calibration_protocol_c,
 		],
-		'deps': [ dep_toytoolkit ],
+		'deps': [ dep_toytoolkit, dep_matrix_c ],
 	},
 ]
 
diff --git a/libweston/meson.build b/libweston/meson.build
index d8d3fc07..a10bf348 100644
--- a/libweston/meson.build
+++ b/libweston/meson.build
@@ -5,6 +5,7 @@ deps_libweston = [
 	dep_libdl,
 	dep_libdrm_headers,
 	dep_xkbcommon,
+	dep_matrix_c
 ]
 srcs_libweston = [
 	git_version_h,
@@ -31,7 +32,6 @@ srcs_libweston = [
 	'weston-log-flight-rec.c',
 	'weston-log.c',
 	'zoom.c',
-	'../shared/matrix.c',
 	linux_dmabuf_unstable_v1_protocol_c,
 	linux_dmabuf_unstable_v1_server_protocol_h,
 	linux_explicit_synchronization_unstable_v1_protocol_c,
diff --git a/shared/meson.build b/shared/meson.build
index eb897c10..081b5732 100644
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -76,3 +76,9 @@ dep_lib_cairo_shared = declare_dependency(
 	link_with: lib_cairo_shared,
 	dependencies: deps_cairo_shared
 )
+
+dep_matrix_c = declare_dependency(
+	sources: 'matrix.c',
+	include_directories: public_inc,
+	dependencies: dep_libm
+)
diff --git a/tests/meson.build b/tests/meson.build
index b1f6807c..0b880d17 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -97,7 +97,7 @@ dep_zucmain = declare_dependency(
 
 tests_standalone = [
 	['config-parser', [], [ dep_zucmain ]],
-	['matrix', [ '../shared/matrix.c' ], [ dep_libm, dep_libshared.partial_dependency(includes: true) ]],
+	['matrix', [], [ dep_libm, dep_libshared.partial_dependency(includes: true), dep_matrix_c ]],
 	['string'],
 	[ 'vertex-clip', [], [ dep_test_client, dep_vertex_clipping ]],
 	['timespec', [], [ dep_zucmain ]],