[gnome-settings-daemon/benzea/systemd-3-36] meson: Handle common directory separately

[Benjamin Berg <bberg src gnome org>]

commit 4662beeeae7b70eff37c80a11e7ab91f51824f7a
Author: Benjamin Berg <bberg redhat com>
Date:   Thu Dec 12 00:03:08 2019 +0100

    meson: Handle common directory separately
    
    It is not really worth it to use a loop just to set the log domain using
    the cflags. Explicitly name the common subdirectory rather than
    including it in the plugin loop.

 plugins/meson.build | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/plugins/meson.build b/plugins/meson.build
index cffe0cc1..e249d49b 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -50,11 +50,17 @@ plugins_cflags = ['-DGNOME_SETTINGS_LOCALEDIR="@0@"'.format(gsd_localedir)]
 
 enabled_plugins_file = []
 
-foreach plugin: [['common', '']] + enabled_plugins
+cflags = [
+  '-DG_LOG_DOMAIN="common"'
+] + plugins_cflags
+plugin_name = 'common'
+subdir('common')
+
+foreach plugin: enabled_plugins
   plugin_name = plugin[0]
   desktop = 'org.gnome.SettingsDaemon.@0@.desktop'.format(plugin[1])
 
-  if plugin[1] == '' # common or dummy
+  if plugin[1] == '' # dummy
     desktop_in_file = ''
   else
     desktop_in_file = files(join_paths(plugin_name, desktop + '.in'))
@@ -74,7 +80,7 @@ foreach plugin: enabled_plugins_file
     '-DPLUGIN_DBUS_NAME="@0@"'.format(plugin_dbus_name),
   ] + plugins_cflags
 
-  if not ['common', 'dummy'].contains(plugin_name)
+  if plugin_name != 'dummy'
     desktop = 'org.gnome.SettingsDaemon.@0@.desktop'.format(plugin[1])
     desktop_in_file = plugin[2]
     user_target = 'gsd-@0@.target'.format(plugin_name)