From cc310cffb0bf4cd2333be26a2ae16848655a306b Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Thu, 30 Nov 2017 06:25:13 -0500 Subject: [PATCH] meson: common static library --- common/meson.build | 17 ++++++++++------- sway/meson.build | 5 +++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/common/meson.build b/common/meson.build index ca1f1752..3a4282ad 100644 --- a/common/meson.build +++ b/common/meson.build @@ -1,8 +1,11 @@ -sway_common = files( - 'log.c', - 'list.c', - 'util.c', - 'stringop.c', - 'readline.c', - 'ipc-client.c' +lib_sway_common = static_library('sway-common', + files( + 'log.c', + 'list.c', + 'util.c', + 'stringop.c', + 'readline.c', + 'ipc-client.c' + ), + include_directories: sway_inc ) diff --git a/sway/meson.build b/sway/meson.build index 1f17ed31..b02506c8 100644 --- a/sway/meson.build +++ b/sway/meson.build @@ -1,4 +1,4 @@ -sway_sources = sway_common + files( +sway_sources = files( 'main.c', 'server.c', 'commands.c', @@ -25,5 +25,6 @@ executable( 'sway', sway_sources, include_directories: [sway_inc], - dependencies: sway_deps + dependencies: sway_deps, + link_with: [lib_sway_common] )