Revert "build: Make monitors build commands common"

This reverts commit c25bc351bb2605e57bc9a6d9250c9d4748c3d9e0.

1 files changed, 9 insertions, 61 deletions

diff --git a/monitor/meson.build b/monitor/meson.build
index 53e18806..f841bdce 100644
--- a/monitor/meson.build
+++ b/monitor/meson.build
@@ -1,73 +1,21 @@
 subdir('proxy')
 
-# [[service name suffix, install monitor test data]]
-monitors = []
-
-if enable_afc
-  monitors += [['Afc', true]]
+if enable_udisks2
+  subdir('udisks2')
 endif
 
-if enable_goa
-  monitors += [['Goa', false]]
+if enable_gphoto2
+  subdir('gphoto2')
 endif
 
-if enable_gphoto2
-  monitors += [['GPhoto2', true]]
+if enable_afc
+  subdir('afc')
 endif
 
 if enable_mtp
-  monitors += [['MTP', false]]
+  subdir('mtp')
 endif
 
-if enable_udisks2
-  monitors += [['UDisks2', true]]
+if enable_goa
+  subdir('goa')
 endif
-
-monitors_test_data = []
-foreach monitor: monitors
-  monitor_name = monitor[0].to_lower()
-
-  dbus_service = '@0@.@1@VolumeMonitor'.format(gvfs_namespace, monitor[0])
-  dbus_exec = 'gvfs-@0@-volume-monitor'.format(monitor_name)
-  dbus_systemd_service = ''
-
-  if install_systemd_user_unit_dir
-    service = dbus_exec + '.service'
-
-    configure_file(
-      input: join_paths(monitor_name, service + '.in'),
-      output: service,
-      install: true,
-      install_dir: systemd_user_unit_dir,
-      configuration: service_conf
-    )
-
-    dbus_systemd_service = 'SystemdService=' + service
-  endif
-
-  monitor_data = files(join_paths(monitor_name, monitor_name + '.monitor'))
-
-  install_data(
-    monitor_data,
-    install_dir: gvfs_remote_volume_monitors_dir
-  )
-
-  dbus_service_conf = configuration_data()
-  dbus_service_conf.set('service', dbus_service)
-  dbus_service_conf.set('exec', join_paths(gvfs_libexecdir, dbus_exec))
-  dbus_service_conf.set('systemd_service', dbus_systemd_service)
-
-  monitor_service = configure_file(
-    input: dbus_service_in,
-    output: dbus_service + '.service',
-    install: true,
-    install_dir: dbus_service_dir,
-    configuration: dbus_service_conf
-  )
-
-  if monitor[1]
-    monitors_test_data += [monitor_data, monitor_service]
-  endif
-
-  subdir(monitor_name)
-endforeach