all: change G_LOG_DOMAIN to "nm"

glib requires G_LOG_DOMAIN defined so that log messages are labeled to belong to NetworkManager or libnm. However, we don't actually want to use glib logging. Our library libnm MUST not log anything, because it spams the user's stdout/stderr. Instead, a library must report notable events via its API. Note that there is also LIBNM_CLIENT_DEBUG to explicitly enable debug logging, but that doesn't use glib logging either. Also, the daemon does not use glib logging instead it logs to syslog. When run with `--debug`. Hence, it's not useful for us to define different G_LOG_DOMAIN per library/application, because none of our libraries/applications should use glib logging. It also gets slightly confusing, because we have the static library like `src/libnm-core-impl`, which is both linked into `libnm` (the library) and `NetworkManager` (the daemon). Which logging domain should they use? Set the G_LOG_DOMAIN to "nm" everywhere. But no longer do it via `-D` arguments to the compiler. See-also: https://developer.gnome.org/glib/stable/glib-Message-Logging.html#G-LOG-DOMAIN:CAPS
2024-07-09 04:05:56 +00:00 · 2021-02-17 16:11:49 +01:00 · 2021-02-17 16:11:49 +01:00 · 341b6e0704
commit 341b6e0704
parent 243051a8a6
38 changed files with 10 additions and 196 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -355,7 +355,6 @@ shared_nm_std_aux_libnm_std_aux_la_CPPFLAGS = \
 	-I$(srcdir)/shared \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
-	-DG_LOG_DOMAIN=\""libnm"\" \
 	$(NULL)

 shared_nm_std_aux_libnm_std_aux_la_SOURCES = \
@ -384,7 +383,6 @@ shared_nm_glib_aux_cppflags = \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(GLIB_CFLAGS) \
-	-DG_LOG_DOMAIN=\""libnm"\" \
 	$(NULL)

 noinst_LTLIBRARIES += shared/nm-glib-aux/libnm-glib-aux.la
@ -504,7 +502,6 @@ shared_nm_log_core_libnm_log_core_la_CPPFLAGS = \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(SYSTEMD_JOURNAL_CFLAGS) \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	$(NULL)

 shared_nm_log_core_libnm_log_core_la_SOURCES = \
@ -556,7 +553,6 @@ check_programs += shared/nm-platform/tests/test-nm-platform
 shared_nm_platform_tests_test_nm_platform_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
-	-DG_LOG_DOMAIN=\""test"\" \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(SYSTEMD_JOURNAL_CFLAGS) \
 	$(GLIB_CFLAGS) \
@ -595,7 +591,6 @@ src_libnm_core_aux_intern_libnm_core_aux_intern_la_CPPFLAGS = \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
-	-DG_LOG_DOMAIN=\""libnm"\" \
 	$(NULL)

 src_libnm_core_aux_intern_libnm_core_aux_intern_la_SOURCES = \
@ -636,7 +631,6 @@ src_libnm_core_aux_extern_libnm_core_aux_extern_la_CPPFLAGS = \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
-	-DG_LOG_DOMAIN=\""libnm"\" \
 	$(NULL)

 src_libnm_core_aux_extern_libnm_core_aux_extern_la_SOURCES = \
@ -676,7 +670,6 @@ libnm_nm_libnm_aux_libnm_libnm_aux_la_CPPFLAGS = \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
-	-DG_LOG_DOMAIN=\""libnmc"\" \
 	$(NULL)

 libnm_nm_libnm_aux_libnm_libnm_aux_la_SOURCES = \
@ -713,7 +706,6 @@ check_programs += shared/nm-glib-aux/tests/test-shared-general
 shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
-	-DG_LOG_DOMAIN=\""test"\" \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
@ -741,7 +733,6 @@ check_programs += shared/nm-glib-aux/tests/test-json-aux
 shared_nm_glib_aux_tests_test_json_aux_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
-	-DG_LOG_DOMAIN=\""test"\" \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(JANSSON_CFLAGS) \
@ -1211,7 +1202,7 @@ GLIB_GENERATED += \
 	$(NULL)
 nm_core_enum_types_sources = $(src_libnm_core_impl_lib_h_pub_real)

-nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "src/libnm-core-impl/nm-default-libnm-core.h"\n'
+nm_core_enum_types_MKENUMS_C_FLAGS = --fhead '\#undef G_LOG_DOMAIN\n\#include "src/libnm-core-impl/nm-default-libnm-core.h"\n'

 src/libnm-core-public/nm-core-enum-types.h.stamp:                           src/libnm-core-public/.dirstamp
 src/libnm-core-public/nm-core-enum-types.c.stamp:                           src/libnm-core-public/.dirstamp
@ -1232,7 +1223,6 @@ $(src_core_devices_ovs_libnm_device_plugin_ovs_la_OBJECTS):                 $(sr
 src_libnm_core_impl_libnm_core_impl_la_CPPFLAGS = \
 	$(dflt_cppflags_libnm_core) \
 	-I$(srcdir)/src/libnm-core-intern/ \
-	-DG_LOG_DOMAIN=\""libnm"\" \
 	$(NULL)

 src_libnm_core_impl_libnm_core_impl_la_SOURCES = \
@ -1332,7 +1322,7 @@ GLIB_GENERATED += \
 	src/libnm-core-impl/tests/nm-core-tests-enum-types.h \
 	src/libnm-core-impl/tests/nm-core-tests-enum-types.c
 nm_core_tests_enum_types_sources = src/libnm-core-impl/tests/test-general-enums.h
-nm_core_tests_enum_types_MKENUMS_C_FLAGS = --fhead '\#include "src/libnm-core-impl/nm-default-libnm-core.h"\n'
+nm_core_tests_enum_types_MKENUMS_C_FLAGS = --fhead '\#undef G_LOG_DOMAIN\n\#include "src/libnm-core-impl/nm-default-libnm-core.h"\n'

 src/libnm-core-impl/tests/nm-core-tests-enum-types.h.stamp: src/libnm-core-impl/tests/.dirstamp
 src/libnm-core-impl/tests/nm-core-tests-enum-types.c.stamp: src/libnm-core-impl/tests/.dirstamp
@ -1344,7 +1334,6 @@ src_libnm_core_impl_tests_cppflags = \
 	-I$(srcdir)/src/libnm-core-impl/tests \
 	-I$(srcdir)/src/libnm-core-impl \
 	$(dflt_cppflags_libnm_core) \
-	-DG_LOG_DOMAIN=\""test"\" \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)

@ -1582,7 +1571,6 @@ libnm_libnm_static_la_CPPFLAGS = \
 	-I$(srcdir)/libnm \
 	-I$(srcdir)/src \
 	$(dflt_cppflags_libnm_core) \
-	-DG_LOG_DOMAIN=\""libnm"\" \
 	$(INTROSPECTION_CFLAGS) \
 	$(NULL)

@ -1627,8 +1615,8 @@ GLIB_GENERATED += \
 nm_enum_types_sources = \
 	$(libnm_lib_h_pub_mkenums) \
 	$(libnm_lib_h_pub_real)
-nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include "nm-core-enum-types.h"\n'
-nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "libnm/nm-default-libnm.h"\n'
+nm_enum_types_MKENUMS_H_FLAGS = --fhead '\#include "nm-core-enum-types.h"\n'
+nm_enum_types_MKENUMS_C_FLAGS = --fhead '\#undef G_LOG_DOMAIN\n\#include "libnm/nm-default-libnm.h"\n'

 $(dispatcher_nm_dispatcher_OBJECTS):                    $(libnm_lib_h_pub_mkenums)
 $(dispatcher_libnm_dispatcher_core_la_OBJECTS):         $(libnm_lib_h_pub_mkenums)
@ -1640,7 +1628,6 @@ libnm_libnm_la_CPPFLAGS = \
 	-I$(srcdir)/libnm \
 	-I$(srcdir)/src \
 	$(dflt_cppflags_libnm_core) \
-	-DG_LOG_DOMAIN=\""libnm"\" \
 	$(LIBUDEV_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
 	$(NULL)
@ -1793,7 +1780,6 @@ libnm_tests_cppflags = \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
 	$(dflt_cppflags_libnm_core) \
-	-DG_LOG_DOMAIN=\""test"\" \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)

@ -1872,7 +1858,6 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
 	-I$(builddir)/libnm \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_EXEC_CFLAGS) \
-	-DG_LOG_DOMAIN=\""test"\" \
 	$(NULL)

 libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \
@ -1889,7 +1874,6 @@ EXTRA_DIST += \
 src_core_cppflags_base = \
 	-I$(srcdir)/src/core \
 	$(dflt_cppflags_libnm_core) \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(NULL)

@ -1959,7 +1943,6 @@ noinst_LTLIBRARIES += shared/systemd/libnm-systemd-logging-stub.la

 shared_systemd_libnm_systemd_logging_stub_la_CPPFLAGS = \
 	$(libsystemd_cppflags) \
-	-DG_LOG_DOMAIN=\""libnm"\" \
 	$(NULL)

 shared_systemd_libnm_systemd_logging_stub_la_SOURCES = \
@ -1975,7 +1958,6 @@ noinst_LTLIBRARIES += shared/systemd/libnm-systemd-shared.la

 shared_systemd_libnm_systemd_shared_la_CPPFLAGS = \
 	$(libsystemd_cppflags) \
-	-DG_LOG_DOMAIN=\""libnm"\" \
 	$(NULL)

 shared_systemd_libnm_systemd_shared_la_SOURCES = \
@ -2125,7 +2107,6 @@ src_core_libnm_systemd_core_la_cppflags = \
 	-I$(srcdir)/src/core/systemd/src/systemd \
 	-I$(srcdir)/src/core/systemd/src/libsystemd-network \
 	-I$(srcdir)/src/core/systemd/src/libsystemd/sd-event \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	$(NULL)

 src_core_libnm_systemd_core_la_libadd = \
@ -2974,7 +2955,6 @@ src_core_dhcp_nm_dhcp_helper_CPPFLAGS = \
 	$(dflt_cppflags) \
 	-I$(srcdir)/shared \
 	-I$(builddir)/shared \
-	-DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \
 	$(GLIB_CFLAGS) \
 	$(NULL)

@ -3037,7 +3017,6 @@ src_core_ppp_nm_pppd_plugin_la_CPPFLAGS = \
 	-I$(builddir)/shared \
 	-I$(builddir)/src/libnm-core-public \
 	-I$(srcdir)/src/libnm-core-public \
-	-DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \
 	$(GLIB_CFLAGS)

 src_core_ppp_nm_pppd_plugin_la_SOURCES = \
@ -4376,7 +4355,6 @@ dispatcher_cppflags = \
 	-I$(srcdir)/libnm \
 	-I$(srcdir)/src \
 	$(GLIB_CFLAGS) \
-	-DG_LOG_DOMAIN=\""nm-dispatcher"\" \
 	$(NULL)

 dispatcher_libnm_dispatcher_core_la_SOURCES = \
@ -4458,7 +4436,6 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
 	-I$(srcdir)/src \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_EXEC_CFLAGS) \
 	$(INTROSPECTION_EXTRA_CFLAGS) \
@ -4513,7 +4490,6 @@ clients_nm_online_CPPFLAGS = \
 	-I$(srcdir)/libnm \
 	-I$(builddir)/libnm \
 	$(GLIB_CFLAGS) \
-	-DG_LOG_DOMAIN=\""nm-online"\" \
 	$(NULL)

 clients_nm_online_LDFLAGS = \
@ -4574,7 +4550,6 @@ EXTRA_DIST += \

 clients_common_libnmc_base_la_CPPFLAGS = \
 	$(clients_cppflags) \
-	-DG_LOG_DOMAIN=\""libnmc"\" \
 	$(NULL)

 clients_common_libnmc_base_la_LIBADD = \
@ -4622,7 +4597,6 @@ clients_common_libnmc_la_SOURCES = \

 clients_common_libnmc_la_CPPFLAGS = \
 	$(clients_cppflags) \
-	-DG_LOG_DOMAIN=\""libnmc"\" \
 	$(NULL)

 clients_common_libnmc_la_LIBADD = \
@ -4645,7 +4619,6 @@ endif
 clients_common_tests_test_clients_common_CPPFLAGS = \
 	-I$(srcdir)/clients/common/tests \
 	$(clients_cppflags) \
-	-DG_LOG_DOMAIN=\""test"\" \
 	$(NULL)

 clients_common_tests_test_clients_common_LDFLAGS = \
@ -4687,7 +4660,6 @@ clients_common_tests_test_libnm_core_aux_CPPFLAGS = \
 	-I$(builddir)/libnm \
 	-I$(srcdir)/libnm \
 	-I$(srcdir)/src \
-	-DG_LOG_DOMAIN=\""test"\" \
 	$(CODE_COVERAGE_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(SANITIZER_LIB_CFLAGS) \
@ -4741,7 +4713,6 @@ clients_cli_nmcli_SOURCES = \
 clients_cli_nmcli_CPPFLAGS = \
 	-I$(srcdir)/clients/cli \
 	$(clients_cppflags) \
-	-DG_LOG_DOMAIN=\""nmcli"\" \
 	$(NULL)

 clients_cli_nmcli_LDADD = \
@ -4789,7 +4760,6 @@ clients_cli_generate_docs_nm_settings_nmcli_SOURCES = \
 clients_cli_generate_docs_nm_settings_nmcli_CPPFLAGS = \
 	-I$(srcdir)/clients/common \
 	$(clients_cppflags) \
-	-DG_LOG_DOMAIN=\""nmcli"\" \
 	$(NULL)

 clients_cli_generate_docs_nm_settings_nmcli_LDADD = \
@ -4878,7 +4848,6 @@ clients_tui_newt_libnmt_newt_a_SOURCES = \

 clients_tui_newt_libnmt_newt_a_CPPFLAGS = \
 	$(clients_cppflags) \
-	-DG_LOG_DOMAIN=\""nmtui"\" \
 	$(NEWT_CFLAGS) \
 	$(NULL)

@ -4974,7 +4943,6 @@ clients_tui_nmtui_SOURCES = \
 clients_tui_nmtui_CPPFLAGS = \
 	-I$(srcdir)/clients/tui/newt \
 	$(clients_cppflags) \
-	-DG_LOG_DOMAIN=\""nmtui"\" \
 	$(NEWT_CFLAGS) \
 	$(NULL)

@ -5047,7 +5015,6 @@ clients_cloud_setup_libnm_cloud_setup_core_a_SOURCES = \

 clients_cloud_setup_libnm_cloud_setup_core_a_CPPFLAGS = \
 	$(clients_cppflags) \
-	-DG_LOG_DOMAIN=\""nm-cloud-setup"\" \
 	$(LIBCURL_CFLAGS) \
 	$(NULL)

@ -5062,7 +5029,6 @@ clients_cloud_setup_nm_cloud_setup_SOURCES = \

 clients_cloud_setup_nm_cloud_setup_CPPFLAGS = \
 	$(clients_cppflags) \
-	-DG_LOG_DOMAIN=\""nm-cloud-setup"\" \
 	$(LIBCURL_CFLAGS) \
 	$(NULL)

@ -5128,7 +5094,6 @@ check_programs += clients/cloud-setup/tests/test-cloud-setup-general
 clients_cloud_setup_tests_test_cloud_setup_general_CPPFLAGS = \
 	$(clients_cppflags) \
 	-I$(srcdir)/clients/cloud-setup \
-	-DG_LOG_DOMAIN=\""tests"\" \
 	$(LIBCURL_CFLAGS) \
 	$(NULL)

--- a/clients/cli/meson.build
+++ b/clients/cli/meson.build
@ -31,9 +31,6 @@ executable(
    libnm_glib_aux_dep_link,
    readline_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="nmcli"',
-  ],
  link_args: ldflags_linker_script_binary,
  link_depends: linker_script_binary,
  install: true,
@ -55,9 +52,6 @@ generate_docs_nm_settings_nmcli = executable(
    libnm_base_dep_link,
    libnm_glib_aux_dep_link,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="nmcli"',
-  ],
  link_args: ldflags_linker_script_binary,
  link_depends: linker_script_binary,
 )
--- a/clients/cloud-setup/meson.build
+++ b/clients/cloud-setup/meson.build
@ -37,9 +37,6 @@ libnm_cloud_setup_core = static_library(
    libcurl_dep,
    libnm_libnm_aux_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="nm-cloud-setup"',
-  ],
 )

 libnm_cloud_setup_core_dep = declare_dependency(
@ -61,9 +58,6 @@ executable(
    libnm_glib_aux_dep_link,
    libcurl_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="nm-cloud-setup"',
-  ],
  link_with: libnm_systemd_logging_stub,
  link_args: ldflags_linker_script_binary,
  link_depends: linker_script_binary,
--- a/clients/cloud-setup/tests/meson.build
+++ b/clients/cloud-setup/tests/meson.build
@ -9,9 +9,6 @@ exe = executable(
    libnmc_dep,
    libnm_glib_aux_dep_link,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="test"',
-  ],
 )

 test(
--- a/clients/common/meson.build
+++ b/clients/common/meson.build
@ -14,9 +14,6 @@ libnmc_base = static_library(
    libnm_dep,
    libnm_nm_default_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="libnmc"',
-  ],
 )

 libnmc_base_dep = declare_dependency(
@ -78,9 +75,6 @@ libnmc = static_library(
    libnm_nm_default_dep,
    libnm_core_aux_extern_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="libnmc"',
-  ],
  link_depends: settings_docs_source,
 )

--- a/clients/common/tests/meson.build
+++ b/clients/common/tests/meson.build
@ -11,9 +11,6 @@ exe = executable(
    libnm_glib_aux_dep_link,
    libnm_base_dep_link,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="test"',
-  ],
 )

 test(
@ -31,9 +28,6 @@ exe = executable(
    libnm_nm_default_dep,
    libnm_glib_aux_dep_link,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="test"',
-  ],
  link_with: libnm_systemd_logging_stub,
 )

--- a/clients/meson.build
+++ b/clients/meson.build
@ -9,9 +9,6 @@ executable(
    libnm_libnm_aux_dep,
    libnm_glib_aux_dep_link,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="nm-online"',
-  ],
  link_args: ldflags_linker_script_binary,
  link_depends: linker_script_binary,
  install: true,
--- a/clients/tui/meson.build
+++ b/clients/tui/meson.build
@ -56,9 +56,6 @@ executable(
    libnm_base_dep_link,
    libnm_glib_aux_dep_link,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="nmtui"',
-  ],
  link_with: libnm_systemd_logging_stub,
  link_args: ldflags_linker_script_binary,
  link_depends: linker_script_binary,
--- a/clients/tui/newt/meson.build
+++ b/clients/tui/newt/meson.build
@ -28,9 +28,6 @@ libnmt_newt = static_library(
    libnm_nm_default_dep,
    newt_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="nmtui"',
-  ],
 )

 libnmt_newt_dep = declare_dependency(
--- a/dispatcher/meson.build
+++ b/dispatcher/meson.build
@ -22,9 +22,6 @@ libnm_dispatcher_core = static_library(
    libnm_nm_default_dep,
    libnm_libnm_aux_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="nm-dispatcher"',
-  ],
 )

 nmdbus_dispatcher_sources = gnome.gdbus_codegen(
@ -43,9 +40,6 @@ executable(
    libnm_core_aux_extern_dep_link,
    libnm_glib_aux_dep_link,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="nm-dispatcher"',
-  ],
  link_with: libnm_dispatcher_core,
  link_args: ldflags_linker_script_binary,
  link_depends: linker_script_binary,
--- a/dispatcher/tests/meson.build
+++ b/dispatcher/tests/meson.build
@ -11,9 +11,7 @@ exe = executable(
    libnm_nm_default_dep,
    libnm_glib_aux_dep_link,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="test"',
-  ] + introspection_extra_cflags,
+  c_args: introspection_extra_cflags,
  link_with: libnm_dispatcher_core,
 )

--- a/libnm/meson.build
+++ b/libnm/meson.build
@ -147,9 +147,6 @@ libnm_static = static_library(
    libnm_udev_aux_dep,
    libudev_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="libnm"',
-  ],
  link_with: libnm_systemd_logging_stub,
 )

@ -214,7 +211,6 @@ if enable_introspection
    header: 'NetworkManager.h',
    export_packages: libnm_name,
    extra_args: [
-      '-DG_LOG_DOMAIN="libnm"',
      '-DNETWORKMANAGER_COMPILATION',
    ],
    install: true,
@ -307,9 +303,6 @@ libnm_libnm_aux = static_library(
  sources: files(
    'nm-libnm-aux/nm-libnm-aux.c',
  ),
-  c_args: [
-    '-DG_LOG_DOMAIN="libnmc"',
-  ],
  dependencies: [
    libnm_core_aux_intern_dep,
    libnm_dep,
--- a/libnm/nm-enum-types.c.template
+++ b/libnm/nm-enum-types.c.template
@ -1,9 +1,7 @@
 /*** BEGIN file-header ***/
-#include "config.h"
+#include "libnm/nm-default-libnm.h"

 #include "nm-enum-types.h"
-#
-#include "libnm/nm-default-libnm.h"

 #include "nm-version-macros.h"
 #include "NetworkManager.h"
--- a/libnm/tests/meson.build
+++ b/libnm/tests/meson.build
@ -19,9 +19,6 @@ foreach test_unit: test_units
      libnm_core_impl_dep_link,
      libnm_nm_default_dep,
    ],
-    c_args: [
-      '-DG_LOG_DOMAIN="test"',
-    ],
    link_with: [
      libnm_static,
      libnm_base,
@ -42,7 +39,4 @@ libnm_vpn_plugin_utils_test = static_library(
  sources: nm_vpn_plugin_utils_source + [libnm_enum_sources[1]],
  include_directories: libnm_inc,
  dependencies: libnm_nm_default_dep,
-  c_args: [
-    '-DG_LOG_DOMAIN="test"',
-  ],
 )
--- a/shared/meson.build
+++ b/shared/meson.build
@ -105,9 +105,6 @@ libnm_std_aux = static_library(
    'nm-std-aux/nm-std-utils.c',
  ],
  include_directories: top_inc,
-  c_args: [
-    '-DG_LOG_DOMAIN="libnm"',
-  ],
 )

 libnm_glib_aux = static_library(
@ -129,9 +126,6 @@ libnm_glib_aux = static_library(
    'nm-glib-aux/nm-time-utils.c',
  ),
  dependencies: glib_nm_default_dep,
-  c_args: [
-    '-DG_LOG_DOMAIN="libnm"',
-  ],
  link_with: [
    libc_siphash,
    libnm_std_aux,
@ -160,9 +154,6 @@ libnm_udev_aux = static_library(
    glib_nm_default_dep,
    libudev_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="libnm"',
-  ],
 )

 libnm_udev_aux_dep = declare_dependency(
@ -176,9 +167,6 @@ libnm_base = static_library(
    'nm-base/nm-ethtool-base.c',
  ),
  dependencies: libnm_glib_aux_dep_link,
-  c_args: [
-    '-DG_LOG_DOMAIN="libnm"',
-  ],
 )

 libnm_base_dep = declare_dependency(
@ -198,9 +186,6 @@ libnm_log_core = static_library(
    glib_nm_default_dep,
    libsystemd_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="NetworkManager"',
-  ],
 )

 libnm_log_core_dep = declare_dependency(
@ -221,9 +206,6 @@ libnm_platform = static_library(
  dependencies: [
    glib_nm_default_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="NetworkManager"',
-  ],
 )

 libnm_platform_dep = declare_dependency(
@ -282,9 +264,6 @@ libnm_systemd_shared = static_library(
    'systemd/src/shared',
  ),
  dependencies: glib_nm_default_dep,
-  c_args: [
-    '-DG_LOG_DOMAIN="libnm"',
-  ],
 )

 libnm_systemd_shared_dep = declare_dependency(
@ -301,9 +280,6 @@ libnm_systemd_logging_stub = static_library(
  'nm-systemd-logging-stub',
  sources: 'systemd/nm-logging-stub.c',
  dependencies: glib_nm_default_dep,
-  c_args: [
-    '-DG_LOG_DOMAIN="libnm"',
-  ],
 )

 if enable_tests
--- a/shared/nm-glib-aux/tests/meson.build
+++ b/shared/nm-glib-aux/tests/meson.build
@ -3,9 +3,6 @@
 exe = executable(
  'test-shared-general',
  'test-shared-general.c',
-  c_args: [
-    '-DG_LOG_DOMAIN="test"',
-  ],
  dependencies: libnm_glib_aux_dep_link,
  link_with: libnm_systemd_logging_stub,
 )
@ -21,9 +18,6 @@ if jansson_dep.found()
  exe = executable(
    'test-json-aux',
    'test-json-aux.c',
-    c_args: [
-      '-DG_LOG_DOMAIN="test"',
-    ],
    dependencies: [
      libnm_glib_aux_dep_link,
      jansson_dep,
--- a/shared/nm-platform/tests/meson.build
+++ b/shared/nm-platform/tests/meson.build
@ -3,9 +3,6 @@
 exe = executable(
  'test-nm-platform',
  'test-nm-platform.c',
-  c_args: [
-    '-DG_LOG_DOMAIN="test"',
-  ],
  dependencies: [
    libnm_log_core_dep,
    libnm_platform_dep,
--- a/shared/nm-std-aux/nm-default-std.h
+++ b/shared/nm-std-aux/nm-default-std.h
@ -12,9 +12,7 @@
    #error Dont define NETWORKMANAGER_COMPILATION
 #endif

-#ifndef G_LOG_DOMAIN
-    #error Define G_LOG_DOMAIN
-#endif
+#define G_LOG_DOMAIN "nm"

 /*****************************************************************************/

--- a/shared/nm-utils/nm-test-utils.h
+++ b/shared/nm-utils/nm-test-utils.h
@ -733,7 +733,7 @@ nmtst_test_quick(void)

 #define NMTST_EXPECT(domain, level, msg) g_test_expect_message(domain, level, msg)

-#define NMTST_EXPECT_LIBNM(level, msg) NMTST_EXPECT("libnm", level, msg)
+#define NMTST_EXPECT_LIBNM(level, msg) NMTST_EXPECT("nm", level, msg)

 #define NMTST_EXPECT_LIBNM_WARNING(msg)  NMTST_EXPECT_LIBNM(G_LOG_LEVEL_WARNING, msg)
 #define NMTST_EXPECT_LIBNM_CRITICAL(msg) NMTST_EXPECT_LIBNM(G_LOG_LEVEL_CRITICAL, msg)
--- a/src/core/devices/adsl/meson.build
+++ b/src/core/devices/adsl/meson.build
@ -7,7 +7,6 @@ libnm_device_plugin_adsl = shared_module(
    'nm-device-adsl.c',
  ),
  dependencies: core_plugin_dep,
-  c_args: daemon_c_flags,
  link_args: ldflags_linker_script_devices,
  link_depends: linker_script_devices,
  install: true,
--- a/src/core/devices/bluetooth/meson.build
+++ b/src/core/devices/bluetooth/meson.build
@ -7,9 +7,6 @@ libnm_device_plugin_bluetooth_static = static_library(
    'nm-bt-error.c',
    'nm-device-bt.c',
  ) + (enable_bluez5_dun ? files('nm-bluez5-dun.c') : files()),
-  c_args: [
-    '-DG_LOG_DOMAIN="NetworkManager"',
-  ],
  dependencies: [
    libnm_core_public_dep,
    libnm_core_intern_dep,
@ -17,7 +14,6 @@ libnm_device_plugin_bluetooth_static = static_library(
    libnm_wwan_dep,
    bluez5_dep,
  ],
-  c_args: daemon_c_flags,
 )

 libnm_device_plugin_bluetooth_static_dep = declare_dependency(
--- a/src/core/devices/ovs/meson.build
+++ b/src/core/devices/ovs/meson.build
@ -13,7 +13,6 @@ libnm_device_plugin_ovs = shared_module(
    core_plugin_dep,
    jansson_dep,
  ],
-  c_args: daemon_c_flags,
  link_args: ldflags_linker_script_devices,
  link_depends: linker_script_devices,
  install: true,
--- a/src/core/devices/team/meson.build
+++ b/src/core/devices/team/meson.build
@ -11,7 +11,6 @@ libnm_device_plugin_team = shared_module(
    jansson_dep,
    libteamdctl_dep,
  ],
-  c_args: daemon_c_flags,
  link_args: ldflags_linker_script_devices,
  link_depends: linker_script_devices,
  install: true,
--- a/src/core/devices/wifi/meson.build
+++ b/src/core/devices/wifi/meson.build
@ -22,7 +22,6 @@ libnm_device_plugin_wifi_static = static_library(
  dependencies: [
    core_plugin_dep,
  ],
-  c_args: daemon_c_flags,
 )

 libnm_device_plugin_wifi_static_dep = declare_dependency(
@ -38,7 +37,6 @@ libnm_device_plugin_wifi = shared_module(
    core_plugin_dep,
    libnm_device_plugin_wifi_static_dep
  ],
-  c_args: daemon_c_flags,
  link_args: ldflags_linker_script_devices,
  link_depends: linker_script_devices,
  install: true,
--- a/src/core/devices/wwan/meson.build
+++ b/src/core/devices/wwan/meson.build
@ -17,7 +17,6 @@ libnm_wwan = shared_module(
    libsystemd_dep,
    mm_glib_dep,
  ],
-  c_args: daemon_c_flags,
  link_args: '-Wl,--version-script,@0@'.format(linker_script),
  link_depends: linker_script,
  install: true,
@ -51,7 +50,6 @@ libnm_device_plugin_wwan = shared_module(
    libsystemd_dep,
    mm_glib_dep,
  ],
-  c_args: daemon_c_flags,
  link_with: libnm_wwan,
  link_args: ldflags_linker_script_devices,
  link_depends: linker_script_devices,
--- a/src/core/dhcp/meson.build
+++ b/src/core/dhcp/meson.build
@ -4,9 +4,6 @@ executable(
  'nm-dhcp-helper',
  'nm-dhcp-helper.c',
  dependencies: glib_nm_default_dep,
-  c_args: [
-    '-DG_LOG_DOMAIN="nm-dhcp-helper"',
-  ],
  link_args: ldflags_linker_script_binary,
  link_depends: linker_script_binary,
  install: true,
--- a/src/core/initrd/meson.build
+++ b/src/core/initrd/meson.build
@ -8,14 +8,12 @@ libnmi_core = static_library(
    'nmi-ibft-reader.c',
  ),
  dependencies: core_default_dep,
-  c_args: daemon_c_flags,
 )

 executable(
  'nm-initrd-generator',
  'nm-initrd-generator.c',
  dependencies: core_default_dep,
-  c_args: daemon_c_flags,
  link_with: [
    libNetworkManagerBase,
    libnmi_core,
--- a/src/core/meson.build
+++ b/src/core/meson.build
@ -39,10 +39,6 @@ subdir('systemd')

 core_plugins = []

-daemon_c_flags = [
-  '-DG_LOG_DOMAIN="NetworkManager"',
-]
-
 platform_wifi_wext_source = files()
 if enable_wext
  platform_wifi_wext_source += files('platform/wifi/nm-wifi-utils-wext.c')
@ -88,7 +84,6 @@ libNetworkManagerBase = static_library(
    libsystemd_dep,
    libudev_dep,
  ],
-  c_args: daemon_c_flags,
 )

 nm_deps = [
@ -201,7 +196,6 @@ libNetworkManager = static_library(
    'nm-sleep-monitor.c',
  ),
  dependencies: nm_deps,
-  c_args: daemon_c_flags,
  link_with: [
    libNetworkManagerBase,
    libnm_systemd_core,
@ -221,7 +215,6 @@ executable(
    libnm_glib_aux_dep_link,
    libnm_core_impl_dep_link,
  ],
-  c_args: daemon_c_flags,
  link_with: [
    libNetworkManagerBase,
    libnm_systemd_core,
@ -236,7 +229,7 @@ executable(
 )

 if enable_tests
-  test_c_flags = daemon_c_flags
+  test_c_flags = []
  if require_root_tests
    test_c_flags += ['-DREQUIRE_ROOT_TESTS=1']
  endif
@ -290,7 +283,6 @@ NetworkManager_all_sym = executable(
  'NetworkManager-all-sym',
  'main.c',
  dependencies: nm_deps,
-  c_args: daemon_c_flags,
  link_args: '-Wl,--no-gc-sections',
  link_whole: [
    libNetworkManager,
@ -318,7 +310,6 @@ NetworkManager = executable(
  'NetworkManager',
  'main.c',
  dependencies: nm_deps,
-  c_args: daemon_c_flags,
  link_with: [
    libNetworkManager,
    libNetworkManagerBase,
--- a/src/core/nm-test-utils-core.h
+++ b/src/core/nm-test-utils-core.h
@ -15,7 +15,7 @@

 /*****************************************************************************/

-#define NMTST_EXPECT_NM(level, msg) NMTST_EXPECT("NetworkManager", level, msg)
+#define NMTST_EXPECT_NM(level, msg) NMTST_EXPECT("nm", level, msg)

 #define NMTST_EXPECT_NM_ERROR(msg) NMTST_EXPECT_NM(G_LOG_LEVEL_MESSAGE, "*<error> [*] " msg)
 #define NMTST_EXPECT_NM_WARN(msg)  NMTST_EXPECT_NM(G_LOG_LEVEL_MESSAGE, "*<warn>  [*] " msg)
--- a/src/core/ppp/meson.build
+++ b/src/core/ppp/meson.build
@ -9,9 +9,6 @@ nm_pppd_plugin = shared_module(
    libnm_glib_aux_dep_link,
    glib_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="nm-pppd-plugin"',
-  ],
  install: true,
  install_dir: pppd_plugin_dir,
 )
@ -24,7 +21,6 @@ core_plugins += shared_module(
    'nm-ppp-manager.c',
  ],
  dependencies: core_plugin_dep,
-  c_args: daemon_c_flags,
  link_args: '-Wl,--version-script,@0@'.format(linker_script),
  link_depends: linker_script,
  install: true,
--- a/src/core/settings/plugins/ifcfg-rh/meson.build
+++ b/src/core/settings/plugins/ifcfg-rh/meson.build
@ -28,7 +28,6 @@ libnms_ifcfg_rh_core = static_library(
    'shvar.c',
  ),
  dependencies: core_default_dep,
-  c_args: daemon_c_flags,
 )

 libnm_settings_plugin_ifcfg_rh = shared_module(
@ -38,7 +37,6 @@ libnm_settings_plugin_ifcfg_rh = shared_module(
    'nms-ifcfg-rh-plugin.c',
  ),
  dependencies: core_plugin_dep,
-  c_args: daemon_c_flags,
  link_with: libnms_ifcfg_rh_core,
  link_args: ldflags_linker_script_settings,
  link_depends: linker_script_settings,
--- a/src/core/settings/plugins/ifupdown/meson.build
+++ b/src/core/settings/plugins/ifupdown/meson.build
@ -7,14 +7,12 @@ libnms_ifupdown_core = static_library(
    'nms-ifupdown-parser.c',
  ),
  dependencies: core_default_dep,
-  c_args: daemon_c_flags,
 )

 libnm_settings_plugin_ifupdown = shared_module(
  'nm-settings-plugin-ifupdown',
  sources: 'nms-ifupdown-plugin.c',
  dependencies: core_plugin_dep,
-  c_args: daemon_c_flags,
  link_with: libnms_ifupdown_core,
  link_args: ldflags_linker_script_settings,
  link_depends: linker_script_settings,
--- a/src/core/systemd/meson.build
+++ b/src/core/systemd/meson.build
@ -47,9 +47,6 @@ libnm_systemd_core = static_library(
    libnm_core_impl_dep,
    libnm_systemd_shared_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="NetworkManager"',
-  ],
  link_with: libc_siphash,
 )

--- a/src/core/tests/meson.build
+++ b/src/core/tests/meson.build
@ -41,9 +41,6 @@ exe = executable(
    libnm_systemd_core_dep,
    libnm_systemd_shared_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="test"',
-  ],
 )

 test(
--- a/src/libnm-core-aux-extern/meson.build
+++ b/src/libnm-core-aux-extern/meson.build
@ -11,9 +11,6 @@ libnm_core_aux_extern = static_library(
    libnm_glib_aux_dep,
    glib_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="libnm"',
-  ],
 )

 libnm_core_aux_extern_dep = declare_dependency(
--- a/src/libnm-core-aux-intern/meson.build
+++ b/src/libnm-core-aux-intern/meson.build
@ -11,9 +11,6 @@ libnm_core_aux_intern = static_library(
    libnm_glib_aux_dep,
    glib_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="libnm"',
-  ],
 )

 libnm_core_aux_intern_dep = declare_dependency(
--- a/src/libnm-core-impl/meson.build
+++ b/src/libnm-core-impl/meson.build
@ -10,9 +10,6 @@ libnm_crypto_nss = static_library(
    libnm_glib_aux_dep_link,
    crypto_nss_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="libnm"',
-  ],
 )

 libnm_crypto_gnutls = static_library(
@ -23,9 +20,6 @@ libnm_crypto_gnutls = static_library(
    libnm_glib_aux_dep_link,
    crypto_gnutls_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="libnm"',
-  ],
 )

 if crypto == 'nss'
@ -123,9 +117,6 @@ libnm_core_impl = static_library(
    libnm_glib_aux_dep_link,
    uuid_dep,
  ],
-  c_args: [
-    '-DG_LOG_DOMAIN="libnm"',
-  ],
  link_with: [
    libnm_crypto,
    libnm_core_aux_intern,
--- a/src/libnm-core-impl/tests/meson.build
+++ b/src/libnm-core-impl/tests/meson.build
@ -30,9 +30,6 @@ foreach test_unit: test_units
      libnm_core_impl_dep_link,
      libnm_base_dep_link,
    ],
-    c_args: [
-      '-DG_LOG_DOMAIN="test"',
-    ],
    link_with: libnm_systemd_logging_stub,
  )