diff options
Diffstat (limited to 'libnm-glib/meson.build')
| -rw-r--r-- | libnm-glib/meson.build | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build index 016aa638..5c7db73e 100644 --- a/libnm-glib/meson.build +++ b/libnm-glib/meson.build @@ -5,7 +5,7 @@ dbus_binding_tool = find_program('dbus-binding-tool') common_deps = [ dbus_dep, dbus_glib_dep, - shared_dep + shared_dep, ] common_cflags = [ @@ -13,13 +13,13 @@ common_cflags = [ ] cflags = common_cflags + [ - '-DG_LOG_DOMAIN="@0@"'.format(libnm_glib_name) + '-DG_LOG_DOMAIN="@0@"'.format(libnm_glib_name), ] vpn_headers = files( 'nm-vpn-plugin.h', 'nm-vpn-plugin-ui-interface.h', - 'nm-vpn-plugin-utils.h' + 'nm-vpn-plugin-utils.h', ) headers = files( @@ -50,14 +50,14 @@ headers = files( 'nm-secret-agent.h', 'nm-types.h', 'nm-vpn-connection.h', - 'nm-wimax-nsp.h' + 'nm-wimax-nsp.h', ) deprecated_headers = files('libnm_glib.h') install_headers( headers + vpn_headers + deprecated_headers, - subdir: libnm_glib_name + subdir: libnm_glib_name, ) libdeprecated_nm_glib = static_library( @@ -74,7 +74,7 @@ libdeprecated_nm_glib = static_library( sources = files( 'nm-vpn-plugin.c', 'nm-vpn-plugin-ui-interface.c', - 'nm-vpn-plugin-utils.c' + 'nm-vpn-plugin-utils.c', ) glue = 'nm-vpn-plugin-glue.h' @@ -88,7 +88,7 @@ libnm_glib_vpn_enum = gnome.mkenums( c_template: enum_types + '.c.template', h_template: enum_types + '.h.template', install_header: true, - install_dir: libnm_glib_pkgincludedir + install_dir: libnm_glib_pkgincludedir, ) deps = common_deps + [libnm_util_dep] @@ -116,12 +116,12 @@ libnm_glib_vpn = shared_library( '-Wl,--version-script,@0@'.format(linker_script), ], link_depends: linker_script, - install: true + install: true, ) libnm_glib_vpn_dep = declare_dependency( include_directories: libnm_glib_inc, - link_with: libnm_glib_vpn + link_with: libnm_glib_vpn, ) pkg.generate( @@ -132,7 +132,7 @@ pkg.generate( filebase: libnm_glib_vpn_name, subdirs: libnm_glib_name, requires: 'NetworkManager >= ' + nm_version + ' glib-2.0 dbus-glib-1', - variables: 'exec_prefix=${prefix}' + variables: 'exec_prefix=${prefix}', ) libnm_glib_sources = shared_files_libnm_glib + files( @@ -165,7 +165,7 @@ libnm_glib_sources = shared_files_libnm_glib + files( 'nm-secret-agent.c', 'nm-types.c', 'nm-vpn-connection.c', - 'nm-wimax-nsp.c' + 'nm-wimax-nsp.c', ) glue = 'nm-secret-agent-glue.h' @@ -174,7 +174,7 @@ nm_secret_agent_glue = custom_target( glue, input: ifaces_secret_agent_xml, output: glue, - command: [dbus_binding_tool, '--prefix=nm_secret_agent', '--mode=glib-server', '--output=@OUTPUT@', '@INPUT@'] + command: [dbus_binding_tool, '--prefix=nm_secret_agent', '--mode=glib-server', '--output=@OUTPUT@', '@INPUT@'], ) enum_types = 'nm-glib-enum-types' @@ -186,12 +186,12 @@ libnm_glib_enum = gnome.mkenums( c_template: enum_types + '.c.template', h_template: enum_types + '.h.template', install_header: true, - install_dir: libnm_glib_pkgincludedir + install_dir: libnm_glib_pkgincludedir, ) deps = common_deps + [ libnm_util_dep, - libudev_dep + libudev_dep, ] linker_script = join_paths(meson.current_source_dir(), 'libnm-glib.ver') @@ -207,12 +207,12 @@ libnm_glib = shared_library( '-Wl,--version-script,@0@'.format(linker_script), ], link_depends: linker_script, - install: true + install: true, ) libnm_glib_dep = declare_dependency( include_directories: libnm_glib_inc, - link_with: libnm_glib + link_with: libnm_glib, ) pkg.generate( @@ -223,7 +223,7 @@ pkg.generate( filebase: libnm_glib_name, subdirs: libnm_glib_name, requires: 'libnm-util >= ' + nm_version + ' NetworkManager >= ' + nm_version + ' gobject-2.0 dbus-glib-1', - variables: 'exec_prefix=${prefix}' + variables: 'exec_prefix=${prefix}', ) if enable_introspection @@ -232,12 +232,12 @@ if enable_introspection deps = [ dbus_glib_dep, libnm_glib_dep, - libnm_util_gir_dep + libnm_util_gir_dep, ] gir_includes = [ 'DBusGLib-1.0', - 'Gio-2.0' + 'Gio-2.0', ] libnm_glib_gir = gnome.generate_gir( @@ -253,7 +253,7 @@ if enable_introspection extra_args: cflags + [ '--include-uninstalled=' + libnm_util_gir[0].full_path(), ], - install: true + install: true, ) endif @@ -266,7 +266,7 @@ executable( name + '.c', dependencies: deps, c_args: cflags, - link_with: libnm_glib + link_with: libnm_glib, ) test( @@ -290,6 +290,6 @@ pkg.generate( 'exec_prefix=${prefix}', 'libgnome_serverdir=' + nm_libexecdir, 'plugindir=' + nm_vpndir, - 'configdir=' + nm_pkgconfdir - ] + 'configdir=' + nm_pkgconfdir, + ], ) |