Update rootston to use new option

meson.build

@@ -161,14 +161,12 @@ summary = [
 message('\n'.join(summary))
 
 
-if get_option('enable-rootston')
-	subdir('rootston')
-endif
-
 if get_option('enable-examples')
 	subdir('examples')
 endif
 
+subdir('rootston')
+
 pkgconfig = import('pkgconfig')
 pkgconfig.generate(
 	libraries: lib_wlr,

meson_options.txt

@@ -1,4 +1,3 @@
-option('enable-rootston', type: 'boolean', value: true, description: 'Build the rootston example compositor')
 option('enable-examples', type: 'boolean', value: true, description: 'Build example applications')
 option('libcap', type: 'feature', value: 'auto', description: 'Enable support for rootless session via capabilities (cap_sys_admin)')
 option('logind', type: 'feature', value: 'auto', description: 'Enable support for rootless session via logind')

rootston/meson.build

@@ -11,8 +11,8 @@ sources = [
 	'seat.c',
 	'virtual_keyboard.c',
 	'wl_shell.c',
-	'xdg_shell_v6.c',
 	'xdg_shell.c',
+	'xdg_shell_v6.c',
 ]
 
 if conf_data.get('WLR_HAS_XWAYLAND', false)
@@ -20,5 +20,8 @@ if conf_data.get('WLR_HAS_XWAYLAND', false)
 endif
 
 executable(
-	'rootston', sources, dependencies: [wlroots, wlr_protos, pixman]
+	'rootston',
+	sources,
+	dependencies: [wlroots, wlr_protos, pixman],
+	build_by_default: get_option('rootston'),
 )