6 files changed, 37 insertions, 38 deletions
diff --git a/dispatcher/meson.build b/dispatcher/meson.build
index 9a691082..d12e4714 100644
--- a/dispatcher/meson.build
+++ b/dispatcher/meson.build
@@ -1,9 +1,7 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
 
 dispatcher_inc = include_directories('.')
 
-name = 'nm-dispatcher'
-
 configure_file(
   input: 'org.freedesktop.nm_dispatcher.service.in',
   output: '@BASENAME@',
@@ -16,36 +14,37 @@ install_data(
   install_dir: dbus_conf_dir,
 )
 
-deps = [
-  libnm_dep,
-  libnm_nm_default_dep,
-  libnm_libnm_aux_dep,
-]
-
-c_flags = [
-  '-DG_LOG_DOMAIN="@0@"'.format(name),
-  '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
-]
-
 libnm_dispatcher_core = static_library(
-  name + '-core',
+  'nm-dispatcher-core',
   sources: 'nm-dispatcher-utils.c',
-  dependencies: deps,
-  c_args: c_flags,
+  dependencies: [
+    libnm_dep,
+    libnm_nm_default_dep,
+    libnm_libnm_aux_dep,
+  ],
+  c_args: [
+    '-DG_LOG_DOMAIN="nm-dispatcher"',
+  ],
 )
 
 nmdbus_dispatcher_sources = gnome.gdbus_codegen(
   'nmdbus-dispatcher',
-  name + '.xml',
+  'nm-dispatcher.xml',
   interface_prefix: 'org.freedesktop',
   namespace: 'NMDBus',
 )
 
 executable(
-  name,
-  name + '.c',
-  dependencies: deps,
-  c_args: c_flags,
+  'nm-dispatcher',
+  'nm-dispatcher.c',
+  dependencies: [
+    libnm_dep,
+    libnm_nm_default_dep,
+    libnm_libnm_aux_dep,
+  ],
+  c_args: [
+    '-DG_LOG_DOMAIN="nm-dispatcher"',
+  ],
   link_with: libnm_dispatcher_core,
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
diff --git a/dispatcher/nm-dispatcher-utils.c b/dispatcher/nm-dispatcher-utils.c
index 57a7864c..f1ec979f 100644
--- a/dispatcher/nm-dispatcher-utils.c
+++ b/dispatcher/nm-dispatcher-utils.c
@@ -1,9 +1,9 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C) 2008 - 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-client.h"
 
 #include "nm-dispatcher-utils.h"
 
diff --git a/dispatcher/nm-dispatcher-utils.h b/dispatcher/nm-dispatcher-utils.h
index 106a1357..cb40d146 100644
--- a/dispatcher/nm-dispatcher-utils.h
+++ b/dispatcher/nm-dispatcher-utils.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C) 2008 - 2011 Red Hat, Inc.
  */
diff --git a/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c
index e14cc40b..9891bf3d 100644
--- a/dispatcher/nm-dispatcher.c
+++ b/dispatcher/nm-dispatcher.c
@@ -1,9 +1,9 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C) 2008 - 2012 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-client.h"
 
 #include <syslog.h>
 #include <stdio.h>
diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build
index 53108e79..84b4b61c 100644
--- a/dispatcher/tests/meson.build
+++ b/dispatcher/tests/meson.build
@@ -1,24 +1,24 @@
-# SPDX-License-Identifier: LGPL-2.1+
-
-test_unit = 'test-dispatcher-envp'
+# SPDX-License-Identifier: LGPL-2.1-or-later
 
 exe = executable(
-  test_unit,
-  [test_unit + '.c', nmdbus_dispatcher_sources],
+  'test-dispatcher-envp',
+  [
+    'test-dispatcher-envp.c',
+    nmdbus_dispatcher_sources,
+  ],
   include_directories: dispatcher_inc,
   dependencies: [
     libnm_nm_default_dep,
-    libnm_utils_base_dep,
+    libnm_glib_aux_dep,
   ],
   c_args: [
-    '-DNETWORKMANAGER_COMPILATION_TEST',
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
+    '-DG_LOG_DOMAIN="test"',
   ] + introspection_extra_cflags,
   link_with: libnm_dispatcher_core,
 )
 
 test(
-  'dispatcher/' + test_unit,
+  'dispatcher/test-dispatcher-envp',
   test_script,
   args: test_args + [exe.full_path()],
 )
diff --git a/dispatcher/tests/test-dispatcher-envp.c b/dispatcher/tests/test-dispatcher-envp.c
index 2e64dc58..4c37dd6c 100644
--- a/dispatcher/tests/test-dispatcher-envp.c
+++ b/dispatcher/tests/test-dispatcher-envp.c
@@ -1,9 +1,9 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  * Copyright (C) 2011 Red Hat, Inc.
  */
 
-#include "nm-default.h"
+#include "libnm/nm-default-client.h"
 
 #include <arpa/inet.h>
 #include <stdlib.h>