From c0c36501cfeadc0f526610891b6dd257ce3c8229 Mon Sep 17 00:00:00 2001 From: "Victor A. Santos" Date: Tue, 21 Apr 2020 12:11:18 -0300 Subject: Meson Project: some optimizations * data/meson.build: remove redundant configuration data * meson_options.txt: use `deprecated` as option name to match Gnome Guidelines. --- data/meson.build | 19 ++++++------------- meson_options.txt | 2 +- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/data/meson.build b/data/meson.build index ad34149..627f46d 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,28 +1,22 @@ -preferences_desktop_data = configuration_data() -preferences_desktop_data.set('VERSION', meson.project_version()) +common_desktop_data = configuration_data() +common_desktop_data.set('VERSION', meson.project_version()) preferences_desktop = configure_file( input: 'mate-power-preferences.desktop.in.in', output: 'mate-power-preferences.desktop.in', - configuration: preferences_desktop_data + configuration: common_desktop_data ) -statistics_desktop_data = configuration_data() -statistics_desktop_data.set('VERSION', meson.project_version()) - statistics_desktop = configure_file( input: 'mate-power-statistics.desktop.in.in', output: 'mate-power-statistics.desktop.in', - configuration: statistics_desktop_data + configuration: common_desktop_data ) -mpm_autostart_data = configuration_data() -mpm_autostart_data.set('VERSION', meson.project_version()) - mpm_autostart = configure_file( input: 'mate-power-manager.desktop.in.in', output: 'mate-power-manager.desktop.in', - configuration: mpm_autostart_data + configuration: common_desktop_data ) mpm_service_data = configuration_data() @@ -81,8 +75,7 @@ install_man( 'mate-power-backlight-helper.1', 'mate-power-statistics.1', 'mate-power-preferences.1' - ], - install_dir: mandir_path + ] ) install_data( diff --git a/meson_options.txt b/meson_options.txt index c8ed4ef..f3f1a88 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,4 @@ -option('enable-deprecated', type: 'boolean', value: false, description: 'Warn about deprecated usages') +option('deprecated', type: 'boolean', value: false, description: 'Warn about deprecated usages') option('keyring', type: 'feature', value: 'auto', description: 'Enable the use of gnome-keyring') option('applets', type: 'feature', value: 'enabled', description: 'Build the extra power applets') option('with-dbus-services', type: 'string', description: 'where D-BUS services directory is') -- cgit v1.2.1