summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/devices/adsl/meson.build1
-rw-r--r--src/core/devices/bluetooth/meson.build4
-rw-r--r--src/core/devices/ovs/meson.build1
-rw-r--r--src/core/devices/team/meson.build1
-rw-r--r--src/core/devices/wifi/meson.build2
-rw-r--r--src/core/devices/wwan/meson.build2
-rw-r--r--src/core/dhcp/meson.build3
-rw-r--r--src/core/initrd/meson.build2
-rw-r--r--src/core/meson.build11
-rw-r--r--src/core/nm-test-utils-core.h2
-rw-r--r--src/core/ppp/meson.build4
-rw-r--r--src/core/settings/plugins/ifcfg-rh/meson.build2
-rw-r--r--src/core/settings/plugins/ifupdown/meson.build2
-rw-r--r--src/core/systemd/meson.build3
-rw-r--r--src/core/tests/meson.build3
15 files changed, 2 insertions, 41 deletions
diff --git a/src/core/devices/adsl/meson.build b/src/core/devices/adsl/meson.build
index 95f61d958a..ef87c6e8c5 100644
--- 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,
diff --git a/src/core/devices/bluetooth/meson.build b/src/core/devices/bluetooth/meson.build
index 086b0dee80..32168b0c2b 100644
--- 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(
diff --git a/src/core/devices/ovs/meson.build b/src/core/devices/ovs/meson.build
index 81c29bd6d4..1974ff4c6b 100644
--- 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,
diff --git a/src/core/devices/team/meson.build b/src/core/devices/team/meson.build
index d0ff4caa93..b1ee910386 100644
--- 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,
diff --git a/src/core/devices/wifi/meson.build b/src/core/devices/wifi/meson.build
index 743937dbda..85553c5310 100644
--- 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,
diff --git a/src/core/devices/wwan/meson.build b/src/core/devices/wwan/meson.build
index 87af042949..37ef738c48 100644
--- 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,
diff --git a/src/core/dhcp/meson.build b/src/core/dhcp/meson.build
index 1bb004cd20..6743568ea6 100644
--- 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,
diff --git a/src/core/initrd/meson.build b/src/core/initrd/meson.build
index 5fa575c023..6544fe8e25 100644
--- 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,
diff --git a/src/core/meson.build b/src/core/meson.build
index 0cbe817344..b466771eb0 100644
--- 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,
diff --git a/src/core/nm-test-utils-core.h b/src/core/nm-test-utils-core.h
index 5bde9cdaab..a765e1a3c2 100644
--- 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)
diff --git a/src/core/ppp/meson.build b/src/core/ppp/meson.build
index 6ba36a70ef..348d056abe 100644
--- 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,
diff --git a/src/core/settings/plugins/ifcfg-rh/meson.build b/src/core/settings/plugins/ifcfg-rh/meson.build
index a2f11a927e..c62fa89d67 100644
--- 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,
diff --git a/src/core/settings/plugins/ifupdown/meson.build b/src/core/settings/plugins/ifupdown/meson.build
index dd2527836c..1bff815529 100644
--- 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,
diff --git a/src/core/systemd/meson.build b/src/core/systemd/meson.build
index 518b0053c3..1e198eec77 100644
--- 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,
)
diff --git a/src/core/tests/meson.build b/src/core/tests/meson.build
index 5997b70d36..62351f9316 100644
--- 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(
View Lorry Controller Status