mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 20:45:32 +00:00
build: use NetworkManager logging domain for device and settings plugins
First of all, G_LOG_DOMAIN only matters when using g_log() directly. Inside core, we always want to log via nm-logging. Every call to a g_log() is a bug in the first place (like a failed assertion that logs a g_critical() during g_return_if_fail()). So, for all practic purposes, the logging domain is not used. For nm-logging, the G_LOG_DOMAIN has no effect. Unless we find a proper use of this domain, G_LOG_DOMAIN should not differ from what the rest of core.
This commit is contained in:
parent
fbaba4c1c3
commit
a63867a40b
|
@ -14,7 +14,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_builddir)/shared \
|
||||
-I${top_builddir}/libnm-core \
|
||||
-I${top_srcdir}/libnm-core \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-adsl"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
$(GUDEV_CFLAGS)
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_builddir)/shared \
|
||||
-I${top_builddir}/libnm-core \
|
||||
-I${top_srcdir}/libnm-core \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-bluetooth"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
$(GLIB_CFLAGS)
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_builddir)/shared \
|
||||
-I${top_builddir}/libnm-core \
|
||||
-I${top_srcdir}/libnm-core \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-team"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
$(GLIB_CFLAGS)
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_builddir)/shared \
|
||||
-I${top_builddir}/libnm-core \
|
||||
-I${top_srcdir}/libnm-core \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-wifi"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
$(GLIB_CFLAGS)
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/src/devices/wifi \
|
||||
-I$(top_builddir)/src \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-wifi"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
$(GLIB_CFLAGS)
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_builddir)/shared \
|
||||
-I${top_srcdir}/libnm-core \
|
||||
-I${top_builddir}/libnm-core \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-wwan"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(LIBSYSTEMD_CFLAGS) \
|
||||
|
|
|
@ -20,7 +20,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_builddir)/libnm-core \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
$(GLIB_CFLAGS) \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-ibft"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
-DSBINDIR=\"$(sbindir)\"
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_srcdir)/src/platform \
|
||||
-I$(top_srcdir)/src/settings \
|
||||
-I$(srcdir)/../ \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-ibft"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
-DTEST_IBFT_DIR=\"$(abs_srcdir)\" \
|
||||
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\"
|
||||
|
|
|
@ -50,7 +50,7 @@ AM_CPPFLAGS = \
|
|||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(NSS_CFLAGS) \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
-DSBINDIR=\"$(sbindir)\"
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_srcdir)/src/platform \
|
||||
-I$(top_srcdir)/src/settings \
|
||||
-I$(srcdir)/../ \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-ifcfg-rh"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
-DTEST_IFCFG_DIR=\"$(abs_srcdir)\" \
|
||||
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\" \
|
||||
|
|
|
@ -10,7 +10,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_builddir)/shared \
|
||||
-I$(top_srcdir)/libnm-core \
|
||||
-I$(top_builddir)/libnm-core \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
$(GLIB_CFLAGS) \
|
||||
-DSYSCONFDIR=\"$(sysconfdir)\"
|
||||
|
@ -24,7 +24,7 @@ libnm_settings_plugin_ifnet_la_SOURCES = \
|
|||
nm-ifnet-connection.c \
|
||||
nm-ifnet-connection.h \
|
||||
plugin.c \
|
||||
plugin.h
|
||||
plugin.h
|
||||
|
||||
libnm_settings_plugin_ifnet_la_LDFLAGS = -module -avoid-version
|
||||
|
||||
|
|
|
@ -13,7 +13,7 @@ AM_CPPFLAGS= \
|
|||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/src/settings \
|
||||
-I$(top_srcdir)/src/platform \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-ifnet"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
$(CHECK_CFLAGS) \
|
||||
$(GLIB_CFLAGS) \
|
||||
|
|
|
@ -9,7 +9,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_builddir)/shared \
|
||||
-I$(top_srcdir)/libnm-core \
|
||||
-I$(top_builddir)/libnm-core \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(GUDEV_CFLAGS) \
|
||||
|
|
|
@ -10,7 +10,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_srcdir)/src \
|
||||
-I$(top_srcdir)/src/settings \
|
||||
-I$(srcdir)/../ \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-ifupdown"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
$(GLIB_CFLAGS) \
|
||||
-DTEST_ENI_DIR=\"$(abs_srcdir)\"
|
||||
|
|
|
@ -9,7 +9,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_builddir)/shared \
|
||||
-I$(top_srcdir)/libnm-core \
|
||||
-I$(top_builddir)/libnm-core \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
$(GLIB_CFLAGS) \
|
||||
-DNMCONFDIR=\"$(nmconfdir)\"
|
||||
|
|
|
@ -14,7 +14,7 @@ AM_CPPFLAGS = \
|
|||
-I$(srcdir)/../ \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(CODE_COVERAGE_CFLAGS) \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager-keyfile"\" \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
|
||||
-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/keyfiles\" \
|
||||
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\" \
|
||||
|
|
Loading…
Reference in a new issue