diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2022-01-11 20:46:29 -0500 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-01-11 21:27:30 -0500 |
| commit | 2c34cef5ef2004d8479475db5523c572eb409a6b (patch) | |
| tree | dfa7d48732348d49aa221572093fb7a37085cc3f | |
| parent | f4256533d1ffdc203c3f8c6ee42e8dcde470a93f (diff) | |
remove pointless copying of files into build directory
I'm not entirely sure what this did, but it seems to be obsoleted by
commit 93bad825406d13ed5eb2cf27541dc58194bef8f3.
| -rw-r--r-- | doc/dbus/meson.build | 6 | ||||
| -rw-r--r-- | src/meson.build | 20 | ||||
| -rw-r--r-- | src/net.reactivated.Fprint.Device.xml (renamed from src/device.xml) | 0 | ||||
| -rw-r--r-- | src/net.reactivated.Fprint.Manager.xml (renamed from src/manager.xml) | 0 |
4 files changed, 9 insertions, 17 deletions
diff --git a/doc/dbus/meson.build b/doc/dbus/meson.build index 861da64..431127d 100644 --- a/doc/dbus/meson.build +++ b/doc/dbus/meson.build @@ -9,13 +9,13 @@ docbook_xml_header = custom_target('docbook_xml_header', ) dbus_interfaces_refs = [] -foreach interface_file: dbus_interfaces_files - basename = run_command('basename', interface_file.full_path(), '.xml').stdout().strip() +foreach interface_file: dbus_interfaces + basename = run_command('basename', interface_file, '.xml').stdout().strip() dbus_interfaces_refs += custom_target(basename + '_ref', input: docbook_xml_header, output: basename + '.ref.xml', build_by_default: true, - depends: interface_file, + depend_files: interface_file, capture: true, command: [ bash, '-c', diff --git a/src/meson.build b/src/meson.build index 1df6216..a7ce3fe 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,22 +1,14 @@ bash = find_program('bash') -dbus_interfaces = ['Manager', 'Device'] -dbus_interfaces_files = [] +dbus_interfaces = files( + 'net.reactivated.Fprint.Manager.xml', + 'net.reactivated.Fprint.Device.xml', +) -foreach interface_name: dbus_interfaces - interface = interface_name.to_lower() - interface_file = interface + '.xml' - dbus_interfaces_files += custom_target('dbus_interface_' + interface, - input: interface_file, - output: 'net.reactivated.Fprint.@0@.xml'.format(interface_name), - command: ['cp', '@INPUT@', '@OUTPUT@'], - install: true, - install_dir: dbus_interfaces_dir, - ) -endforeach +install_data(dbus_interfaces, install_dir: dbus_interfaces_dir) # NOTE: We should pass "--glib-min-required 2.64" but cannot fprintd_dbus_sources_base = gnome.gdbus_codegen('fprintd-dbus', - sources: dbus_interfaces_files, + sources: dbus_interfaces, autocleanup: 'all', interface_prefix: 'net.reactivated.Fprint.', namespace: 'FprintDBus', diff --git a/src/device.xml b/src/net.reactivated.Fprint.Device.xml index a3c1dbe..a3c1dbe 100644 --- a/src/device.xml +++ b/src/net.reactivated.Fprint.Device.xml diff --git a/src/manager.xml b/src/net.reactivated.Fprint.Manager.xml index 2d0ba28..2d0ba28 100644 --- a/src/manager.xml +++ b/src/net.reactivated.Fprint.Manager.xml |