diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:24:41 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 11:24:41 +0100 |
| commit | bbae86d3d2997a853ca0365e8eb7a3ca7489ee09 (patch) | |
| tree | 1f7fa49b47ab13aea3effbe839559d221f6323b4 /dispatcher | |
| parent | 404ebe62622150e77e311777dff8617eb974e834 (diff) | |
New upstream version 1.15.2
Diffstat (limited to 'dispatcher')
| -rw-r--r-- | dispatcher/meson.build | 12 | ||||
| -rw-r--r-- | dispatcher/tests/meson.build | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/dispatcher/meson.build b/dispatcher/meson.build index 7c92fc55..05e570d8 100644 --- a/dispatcher/meson.build +++ b/dispatcher/meson.build @@ -15,19 +15,19 @@ configure_file( output: service, install: true, install_dir: dbus_sys_dir, - configuration: service_conf + configuration: service_conf, ) install_data( 'nm-dispatcher.conf', - install_dir: dbus_conf_dir + install_dir: dbus_conf_dir, ) sources = files('nm-dispatcher-utils.c') deps = [ libnm_dep, - nm_core_dep + nm_core_dep, ] cflags = [ @@ -39,7 +39,7 @@ libnm_dispatcher_core = static_library( name + '-core', sources: sources, dependencies: deps, - c_args: cflags + c_args: cflags, ) sources = files('nm-dispatcher.c') @@ -48,7 +48,7 @@ sources += gnome.gdbus_codegen( 'nmdbus-dispatcher', name + '.xml', interface_prefix: 'org.freedesktop', - namespace: 'NMDBus' + namespace: 'NMDBus', ) executable( @@ -60,7 +60,7 @@ executable( link_args: ldflags_linker_script_binary, link_depends: linker_script_binary, install: true, - install_dir: nm_libexecdir + install_dir: nm_libexecdir, ) if enable_tests diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build index b18c66e5..bf54fdff 100644 --- a/dispatcher/tests/meson.build +++ b/dispatcher/tests/meson.build @@ -2,7 +2,7 @@ test_unit = 'test-dispatcher-envp' incs = [ dispatcher_inc, - libnm_inc + libnm_inc, ] exe = executable( @@ -14,11 +14,11 @@ exe = executable( '-DNETWORKMANAGER_COMPILATION_TEST', '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT', ], - link_with: libnm_dispatcher_core + link_with: libnm_dispatcher_core, ) test( 'dispatcher/' + test_unit, test_script, - args: test_args + [exe.full_path()] + args: test_args + [exe.full_path()], ) |