meson: Use preferred syntax everywhere
Meson files are normally using 4-spaces to indent and functions use first parameter on the same line while others at next indentation level, not following the parenthesis indentation. So adapt libfprint to follow the meson standard.
This commit is contained in:
parent
dd7d1baece
commit
099fa9f005
7 changed files with 116 additions and 116 deletions
|
@ -1,4 +1,5 @@
|
||||||
gtk_test_resources = gnome.compile_resources('gtk-test-resources', 'gtk-libfprint-test.gresource.xml',
|
gtk_test_resources = gnome.compile_resources('gtk-test-resources',
|
||||||
|
'gtk-libfprint-test.gresource.xml',
|
||||||
source_dir : '.',
|
source_dir : '.',
|
||||||
c_name : 'gtk_test')
|
c_name : 'gtk_test')
|
||||||
|
|
||||||
|
@ -12,8 +13,10 @@ executable('gtk-libfprint-test',
|
||||||
include_directories: [
|
include_directories: [
|
||||||
root_inc,
|
root_inc,
|
||||||
],
|
],
|
||||||
c_args: [ common_cflags,
|
c_args: [
|
||||||
'-DPACKAGE_VERSION="' + meson.project_version() + '"' ],
|
common_cflags,
|
||||||
|
'-DPACKAGE_VERSION="' + meson.project_version() + '"'
|
||||||
|
],
|
||||||
install: true,
|
install: true,
|
||||||
install_dir: bindir)
|
install_dir: bindir)
|
||||||
|
|
||||||
|
|
|
@ -7,4 +7,6 @@ ent_conf.set('PACKAGE_TARNAME', 'libfprint-' + meson.project_version())
|
||||||
ent_conf.set('PACKAGE_URL', 'https://fprint.freedesktop.org/')
|
ent_conf.set('PACKAGE_URL', 'https://fprint.freedesktop.org/')
|
||||||
ent_conf.set('PACKAGE_VERSION', meson.project_version())
|
ent_conf.set('PACKAGE_VERSION', meson.project_version())
|
||||||
ent_conf.set('PACKAGE_API_VERSION', '1.0')
|
ent_conf.set('PACKAGE_API_VERSION', '1.0')
|
||||||
configure_file(input: 'gtkdocentities.ent.in', output: 'gtkdocentities.ent', configuration: ent_conf)
|
configure_file(input: 'gtkdocentities.ent.in',
|
||||||
|
output: 'gtkdocentities.ent',
|
||||||
|
configuration: ent_conf)
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
examples = [ 'enroll', 'verify', 'manage-prints' ]
|
examples = [ 'enroll', 'verify', 'manage-prints' ]
|
||||||
foreach example: examples
|
foreach example: examples
|
||||||
executable(example,
|
executable(example,
|
||||||
[example + '.c', 'storage.c', 'utilities.c'],
|
[ example + '.c', 'storage.c', 'utilities.c' ],
|
||||||
dependencies: [libfprint_dep, glib_dep],
|
dependencies: [ libfprint_dep, glib_dep ],
|
||||||
include_directories: [
|
include_directories: [
|
||||||
root_inc,
|
root_inc,
|
||||||
],
|
],
|
||||||
|
|
|
@ -201,7 +201,7 @@ libfprint = library('fprint',
|
||||||
libfprint_dep = declare_dependency(link_with: libfprint,
|
libfprint_dep = declare_dependency(link_with: libfprint,
|
||||||
sources: [ fp_enums_h ],
|
sources: [ fp_enums_h ],
|
||||||
include_directories: root_inc,
|
include_directories: root_inc,
|
||||||
dependencies: [glib_dep, gusb_dep, gio_dep])
|
dependencies: [ glib_dep, gusb_dep, gio_dep ])
|
||||||
|
|
||||||
install_headers(['fprint.h'] + libfprint_public_headers, subdir: 'libfprint')
|
install_headers(['fprint.h'] + libfprint_public_headers, subdir: 'libfprint')
|
||||||
|
|
||||||
|
@ -256,8 +256,7 @@ if get_option('introspection')
|
||||||
'GObject-2.0',
|
'GObject-2.0',
|
||||||
'GUsb-1.0',
|
'GUsb-1.0',
|
||||||
],
|
],
|
||||||
install : true
|
install : true)
|
||||||
)
|
|
||||||
libfprint_gir = libfprint_girtarget[0]
|
libfprint_gir = libfprint_girtarget[0]
|
||||||
libfprint_typelib = libfprint_girtarget[1]
|
libfprint_typelib = libfprint_girtarget[1]
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -166,5 +166,4 @@ pkgconfig.generate(
|
||||||
libraries: libfprint,
|
libraries: libfprint,
|
||||||
subdirs: 'libfprint',
|
subdirs: 'libfprint',
|
||||||
filebase: 'libfprint2',
|
filebase: 'libfprint2',
|
||||||
install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
|
install_dir: join_paths(get_option('libdir'), 'pkgconfig'))
|
||||||
)
|
|
||||||
|
|
|
@ -16,8 +16,7 @@ envs.set('NO_AT_BRIDGE', '1')
|
||||||
|
|
||||||
if get_option('introspection')
|
if get_option('introspection')
|
||||||
if 'virtual_image' in drivers
|
if 'virtual_image' in drivers
|
||||||
test(
|
test('virtual-image',
|
||||||
'virtual-image',
|
|
||||||
find_program('virtual-image.py'),
|
find_program('virtual-image.py'),
|
||||||
args: '--verbose',
|
args: '--verbose',
|
||||||
env: envs,
|
env: envs,
|
||||||
|
@ -26,8 +25,7 @@ if get_option('introspection')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if 'vfs5011' in drivers
|
if 'vfs5011' in drivers
|
||||||
test(
|
test('vfs5011',
|
||||||
'vfs5011',
|
|
||||||
find_program('umockdev-test.py'),
|
find_program('umockdev-test.py'),
|
||||||
args: join_paths(meson.current_source_dir(), 'vfs5011'),
|
args: join_paths(meson.current_source_dir(), 'vfs5011'),
|
||||||
env: envs,
|
env: envs,
|
||||||
|
@ -37,8 +35,7 @@ if get_option('introspection')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if 'synaptics' in drivers
|
if 'synaptics' in drivers
|
||||||
test(
|
test('synaptics',
|
||||||
'synaptics',
|
|
||||||
find_program('umockdev-test.py'),
|
find_program('umockdev-test.py'),
|
||||||
args: join_paths(meson.current_source_dir(), 'synaptics'),
|
args: join_paths(meson.current_source_dir(), 'synaptics'),
|
||||||
env: envs,
|
env: envs,
|
||||||
|
|
Loading…
Reference in a new issue