aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Crisci <tony@dubstepdish.com>2017-11-30 06:25:13 -0500
committerTony Crisci <tony@dubstepdish.com>2017-11-30 06:25:13 -0500
commitcc310cffb0bf4cd2333be26a2ae16848655a306b (patch)
tree83fe5f45fbcb7866a32ce7a9c9f132acb2860f6c
parent739bafbd8ecdbbf2eb3fd42e1b3d9249236a3fcf (diff)
downloadsway-cc310cffb0bf4cd2333be26a2ae16848655a306b.tar.xz
meson: common static library
-rw-r--r--common/meson.build17
-rw-r--r--sway/meson.build5
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]
)