diff --git a/meson.build b/meson.build index cca0a644..fa4e278b 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('sysprof', ['c', 'cpp'], +project('sysprof', 'c', 'cpp', license: 'GPL-3.0-or-later OR GPL-2.0-or-later', version: '45.alpha', meson_version: '>=0.62.0', @@ -135,7 +135,7 @@ has_clockid = cc.has_member('struct perf_event_attr', config_h.set('HAVE_PERF_CLOCKID', has_use_clockid and has_clockid) # For config.h -add_project_arguments(['-I'+meson.current_build_dir()], language: 'c') +add_project_arguments('-I' + meson.current_build_dir(), language: 'c') global_c_args = [ '-DSYSPROF_COMPILATION', diff --git a/src/libsysprof-capture/meson.build b/src/libsysprof-capture/meson.build index 64a87795..828b8ed2 100644 --- a/src/libsysprof-capture/meson.build +++ b/src/libsysprof-capture/meson.build @@ -1,6 +1,6 @@ install_static = not meson.is_subproject() and get_option('install-static') -libsysprof_capture_headers = files([ +libsysprof_capture_headers = files( 'sysprof-address.h', 'sysprof-clock.h', 'sysprof-capture-condition.h', @@ -13,17 +13,17 @@ libsysprof_capture_headers = files([ 'sysprof-platform.h', 'sysprof-capture.h', 'sysprof-version-macros.h', -]) +) if not meson.is_subproject() install_headers(libsysprof_capture_headers, subdir: sysprof_header_subdir) endif -mapped_ring_buffer_sources = files([ +mapped_ring_buffer_sources = files( 'mapped-ring-buffer.c', -]) +) -libsysprof_capture_sources = files([ +libsysprof_capture_sources = files( 'sysprof-address.c', 'sysprof-capture-condition.c', 'sysprof-capture-cursor.c', @@ -34,7 +34,7 @@ libsysprof_capture_sources = files([ 'sysprof-collector.c', 'sysprof-clock.c', 'sysprof-platform.c', -]) +) configure_file( input: 'sysprof-version.h.in', diff --git a/src/sysprof-agent/meson.build b/src/sysprof-agent/meson.build index ccd9a463..d85b828f 100644 --- a/src/sysprof-agent/meson.build +++ b/src/sysprof-agent/meson.build @@ -22,6 +22,6 @@ sysprof_agent = executable('sysprof-agent', sysprof_agent_sources, install: true, ) -install_data(['org.gnome.Sysprof.Agent.xml'], +install_data('org.gnome.Sysprof.Agent.xml', install_dir: join_paths(datadir, 'dbus-1/interfaces'), ) diff --git a/src/sysprofd/meson.build b/src/sysprofd/meson.build index 254c4d6c..34901f44 100644 --- a/src/sysprofd/meson.build +++ b/src/sysprofd/meson.build @@ -80,9 +80,8 @@ i18n.merge_file( install_dir: join_paths(datadir, 'polkit-1/actions'), ) -install_data([ - 'org.gnome.Sysprof3.Profiler.xml', - 'org.gnome.Sysprof3.Service.xml', - ], +install_data( + 'org.gnome.Sysprof3.Profiler.xml', + 'org.gnome.Sysprof3.Service.xml', install_dir: join_paths(datadir, 'dbus-1/interfaces'), )