From 37efbbd8211bd40e2d1f1732e27bd7d3ca504a12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 17 Apr 2017 19:25:00 -0400 Subject: meson: reindent all files with 8 spaces The indentation for emacs'es meson-mode is added .dir-locals. All files are reindented automatically, using the lasest meson-mode from git. Indentation should now be fairly consistent. --- src/udev/meson.build | 168 +++++++++++++++++++++++++-------------------------- 1 file changed, 83 insertions(+), 85 deletions(-) (limited to 'src/udev/meson.build') diff --git a/src/udev/meson.build b/src/udev/meson.build index 1eac8754eb..e3d3fa2462 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -1,120 +1,118 @@ -# -*- mode: meson -*- - udevadm_sources = files(''' - udevadm.c - udevadm-info.c - udevadm-control.c - udevadm-monitor.c - udevadm-hwdb.c - udevadm-settle.c - udevadm-trigger.c - udevadm-test.c - udevadm-test-builtin.c - udevadm-util.c - udevadm-util.h + udevadm.c + udevadm-info.c + udevadm-control.c + udevadm-monitor.c + udevadm-hwdb.c + udevadm-settle.c + udevadm-trigger.c + udevadm-test.c + udevadm-test-builtin.c + udevadm-util.c + udevadm-util.h '''.split()) systemd_udevd_sources = files('udevd.c') libudev_core_sources = ''' - udev.h - udev-event.c - udev-watch.c - udev-node.c - udev-rules.c - udev-ctrl.c - udev-builtin.c - udev-builtin-btrfs.c - udev-builtin-hwdb.c - udev-builtin-input_id.c - udev-builtin-keyboard.c - udev-builtin-net_id.c - udev-builtin-net_setup_link.c - udev-builtin-path_id.c - udev-builtin-usb_id.c - net/link-config.c - net/link-config.h - net/ethtool-util.c - net/ethtool-util.h + udev.h + udev-event.c + udev-watch.c + udev-node.c + udev-rules.c + udev-ctrl.c + udev-builtin.c + udev-builtin-btrfs.c + udev-builtin-hwdb.c + udev-builtin-input_id.c + udev-builtin-keyboard.c + udev-builtin-net_id.c + udev-builtin-net_setup_link.c + udev-builtin-path_id.c + udev-builtin-usb_id.c + net/link-config.c + net/link-config.h + net/ethtool-util.c + net/ethtool-util.h '''.split() if conf.get('HAVE_KMOD', 0) == 1 - libudev_core_sources += ['udev-builtin-kmod.c'] + libudev_core_sources += ['udev-builtin-kmod.c'] endif if conf.get('HAVE_BLKID', 0) == 1 - libudev_core_sources += ['udev-builtin-blkid.c'] + libudev_core_sources += ['udev-builtin-blkid.c'] endif if conf.get('HAVE_ACL', 0) == 1 - libudev_core_sources += ['udev-builtin-uaccess.c', - logind_acl_c, - sd_login_c] + libudev_core_sources += ['udev-builtin-uaccess.c', + logind_acl_c, + sd_login_c] endif ############################################################ generate_keyboard_keys_list = find_program('generate-keyboard-keys-list.sh') keyboard_keys_list_txt = custom_target( - 'keyboard-keys-list.txt', - output : 'keyboard-keys-list.txt', - command : [generate_keyboard_keys_list, cpp], - capture : true) + 'keyboard-keys-list.txt', + output : 'keyboard-keys-list.txt', + command : [generate_keyboard_keys_list, cpp], + capture : true) fname = 'keyboard-keys-from-name.gperf' gperf_file = custom_target( - fname, - input : keyboard_keys_list_txt, - output : fname, - command : [generate_gperfs, 'key', '', '@INPUT@'], - capture : true) + fname, + input : keyboard_keys_list_txt, + output : fname, + command : [generate_gperfs, 'key', '', '@INPUT@'], + capture : true) fname = 'keyboard-keys-from-name.h' keyboard_keys_from_name_h = custom_target( - fname, - input : gperf_file, - output : fname, - command : [gperf, - '-L', 'ANSI-C', '-t', '--ignore-case', - '-N', 'keyboard_lookup_key', - '-H', 'hash_key_name', - '-p', '-C', - '@INPUT@'], - capture : true) + fname, + input : gperf_file, + output : fname, + command : [gperf, + '-L', 'ANSI-C', '-t', '--ignore-case', + '-N', 'keyboard_lookup_key', + '-H', 'hash_key_name', + '-p', '-C', + '@INPUT@'], + capture : true) ############################################################ link_config_gperf_c = custom_target( - 'link-config-gperf.c', - input : 'net/link-config-gperf.gperf', - output : 'link-config-gperf.c', - command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) + 'link-config-gperf.c', + input : 'net/link-config-gperf.gperf', + output : 'link-config-gperf.c', + command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@']) ############################################################ if get_option('link-udev-shared') - libudev_link_with = [libshared] - rpath = rootlibexecdir + libudev_link_with = [libshared] + rpath = rootlibexecdir else - libudev_link_with = [libshared_static, - libsystemd_internal] - rpath = '' + libudev_link_with = [libshared_static, + libsystemd_internal] + rpath = '' endif libudev_internal = static_library( - 'udev', - libudev_sources, - include_directories : includes, - link_with : libudev_link_with) + 'udev', + libudev_sources, + include_directories : includes, + link_with : libudev_link_with) libudev_core_includes = [includes, include_directories('net')] libudev_core = static_library( - 'udev-core', - libudev_core_sources, - link_config_gperf_c, - keyboard_keys_from_name_h, - include_directories : libudev_core_includes, - link_with : libudev_link_with) + 'udev-core', + libudev_core_sources, + link_config_gperf_c, + keyboard_keys_from_name_h, + include_directories : libudev_core_includes, + link_with : libudev_link_with) foreach prog : [['ata_id/ata_id.c'], ['cdrom_id/cdrom_id.c'], @@ -128,22 +126,22 @@ foreach prog : [['ata_id/ata_id.c'], 'mtd_probe/mtd_probe.h', 'mtd_probe/probe_smartmedia.c']] - executable(prog[0].split('/')[0], - prog, - include_directories : includes, - link_with : [libudev_internal], - install_rpath : rpath, - install : true, - install_dir : udevlibexecdir) + executable(prog[0].split('/')[0], + prog, + include_directories : includes, + link_with : [libudev_internal], + install_rpath : rpath, + install : true, + install_dir : udevlibexecdir) endforeach install_data('udev.conf', install_dir : join_paths(sysconfdir, 'udev')) udev_pc = configure_file( - input : 'udev.pc.in', - output : 'udev.pc', - configuration : substs) + input : 'udev.pc.in', + output : 'udev.pc', + configuration : substs) install_data(udev_pc, install_dir : pkgconfigdatadir) -- cgit v1.2.1