diff options
author | emersion <contact@emersion.fr> | 2019-01-18 08:26:44 +0100 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2019-01-18 08:26:44 +0100 |
commit | bb2f007ad3c6be5b03eb60b524b36ee4d7ad9742 (patch) | |
tree | 3c1e46af891b1eb1cf24a9c0b6813e1fb8955284 | |
parent | meson: remove unused dependencies (diff) | |
download | sway-bb2f007ad3c6be5b03eb60b524b36ee4d7ad9742.tar.gz sway-bb2f007ad3c6be5b03eb60b524b36ee4d7ad9742.tar.zst sway-bb2f007ad3c6be5b03eb60b524b36ee4d7ad9742.zip |
meson: remove rpath options
-rw-r--r-- | meson.build | 11 | ||||
-rw-r--r-- | meson_options.txt | 2 | ||||
-rw-r--r-- | sway/meson.build | 1 | ||||
-rw-r--r-- | swaybar/meson.build | 1 | ||||
-rw-r--r-- | swaybg/meson.build | 1 | ||||
-rw-r--r-- | swaymsg/meson.build | 13 | ||||
-rw-r--r-- | swaynag/meson.build | 1 |
7 files changed, 6 insertions, 24 deletions
diff --git a/meson.build b/meson.build index 85d58a35..8f522a3b 100644 --- a/meson.build +++ b/meson.build | |||
@@ -126,17 +126,6 @@ else | |||
126 | endif | 126 | endif |
127 | add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c') | 127 | add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c') |
128 | 128 | ||
129 | if get_option('use_rpath') | ||
130 | if get_option('custom_rpath') == '' | ||
131 | # default to platform specific libdir, one level up from the binary | ||
132 | rpathdir = join_paths('$ORIGIN', '..', '$LIB') | ||
133 | else | ||
134 | rpathdir = get_option('custom_rpath') | ||
135 | endif | ||
136 | else | ||
137 | rpathdir = '' | ||
138 | endif | ||
139 | |||
140 | sway_inc = include_directories('include') | 129 | sway_inc = include_directories('include') |
141 | 130 | ||
142 | subdir('include') | 131 | subdir('include') |
diff --git a/meson_options.txt b/meson_options.txt index 836d171a..04b29e17 100644 --- a/meson_options.txt +++ b/meson_options.txt | |||
@@ -1,6 +1,4 @@ | |||
1 | option('sway-version', type : 'string', description: 'The version string reported in `sway --version`.') | 1 | option('sway-version', type : 'string', description: 'The version string reported in `sway --version`.') |
2 | option('use_rpath', type: 'boolean', value: false, description: 'install binaries with rpath set') | ||
3 | option('custom_rpath', type: 'string', value: '', description: 'override rpath with a custom one') | ||
4 | option('default-wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') | 2 | option('default-wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') |
5 | option('zsh-completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') | 3 | option('zsh-completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') |
6 | option('bash-completions', type: 'boolean', value: true, description: 'Install bash shell completions.') | 4 | option('bash-completions', type: 'boolean', value: true, description: 'Install bash shell completions.') |
diff --git a/sway/meson.build b/sway/meson.build index 2388a66d..94d5abdb 100644 --- a/sway/meson.build +++ b/sway/meson.build | |||
@@ -205,6 +205,5 @@ executable( | |||
205 | include_directories: [sway_inc], | 205 | include_directories: [sway_inc], |
206 | dependencies: sway_deps, | 206 | dependencies: sway_deps, |
207 | link_with: [lib_sway_common], | 207 | link_with: [lib_sway_common], |
208 | install_rpath : rpathdir, | ||
209 | install: true | 208 | install: true |
210 | ) | 209 | ) |
diff --git a/swaybar/meson.build b/swaybar/meson.build index a44c0061..b35f8169 100644 --- a/swaybar/meson.build +++ b/swaybar/meson.build | |||
@@ -42,6 +42,5 @@ executable( | |||
42 | include_directories: [sway_inc], | 42 | include_directories: [sway_inc], |
43 | dependencies: swaybar_deps, | 43 | dependencies: swaybar_deps, |
44 | link_with: [lib_sway_common, lib_sway_client], | 44 | link_with: [lib_sway_common, lib_sway_client], |
45 | install_rpath : rpathdir, | ||
46 | install: true | 45 | install: true |
47 | ) | 46 | ) |
diff --git a/swaybg/meson.build b/swaybg/meson.build index 095c5488..8704de6d 100644 --- a/swaybg/meson.build +++ b/swaybg/meson.build | |||
@@ -14,6 +14,5 @@ executable( | |||
14 | wlroots, | 14 | wlroots, |
15 | ], | 15 | ], |
16 | link_with: [lib_sway_common, lib_sway_client], | 16 | link_with: [lib_sway_common, lib_sway_client], |
17 | install_rpath : rpathdir, | ||
18 | install: true | 17 | install: true |
19 | ) | 18 | ) |
diff --git a/swaymsg/meson.build b/swaymsg/meson.build index 7318349d..b78e6cb0 100644 --- a/swaymsg/meson.build +++ b/swaymsg/meson.build | |||
@@ -1,9 +1,8 @@ | |||
1 | executable( | 1 | executable( |
2 | 'swaymsg', | 2 | 'swaymsg', |
3 | 'main.c', | 3 | 'main.c', |
4 | include_directories: [sway_inc], | 4 | include_directories: [sway_inc], |
5 | dependencies: [jsonc, wlroots], | 5 | dependencies: [jsonc, wlroots], |
6 | link_with: [lib_sway_common], | 6 | link_with: [lib_sway_common], |
7 | install_rpath : rpathdir, | 7 | install: true |
8 | install: true | ||
9 | ) | 8 | ) |
diff --git a/swaynag/meson.build b/swaynag/meson.build index 223a0bc7..2ba3ed95 100644 --- a/swaynag/meson.build +++ b/swaynag/meson.build | |||
@@ -19,6 +19,5 @@ executable( | |||
19 | wlroots, | 19 | wlroots, |
20 | ], | 20 | ], |
21 | link_with: [lib_sway_common, lib_sway_client], | 21 | link_with: [lib_sway_common, lib_sway_client], |
22 | install_rpath : rpathdir, | ||
23 | install: true | 22 | install: true |
24 | ) | 23 | ) |