mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-15 12:34:55 +00:00
all: add "nm-glib-aux/nm-default-glib-i18n-lib.h" as replacement for "nm-default.h"
This commit is contained in:
parent
d69f12f9e7
commit
bbb86cc11a
|
@ -383,7 +383,6 @@ shared_nm_glib_aux_cppflags = \
|
|||
$(SANITIZER_LIB_CFLAGS) \
|
||||
$(GLIB_CFLAGS) \
|
||||
-DG_LOG_DOMAIN=\""libnm"\" \
|
||||
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
|
||||
$(NULL)
|
||||
|
||||
noinst_LTLIBRARIES += shared/nm-glib-aux/libnm-glib-aux.la
|
||||
|
@ -398,6 +397,7 @@ shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \
|
|||
shared/nm-glib-aux/nm-dbus-aux.h \
|
||||
shared/nm-glib-aux/nm-dedup-multi.c \
|
||||
shared/nm-glib-aux/nm-dedup-multi.h \
|
||||
shared/nm-glib-aux/nm-default-glib-i18n-lib.h \
|
||||
shared/nm-glib-aux/nm-default-glib.h \
|
||||
shared/nm-glib-aux/nm-enum-utils.c \
|
||||
shared/nm-glib-aux/nm-enum-utils.h \
|
||||
|
@ -501,7 +501,6 @@ shared_nm_log_core_libnm_log_core_la_CPPFLAGS = \
|
|||
$(GLIB_CFLAGS) \
|
||||
$(SYSTEMD_JOURNAL_CFLAGS) \
|
||||
-DG_LOG_DOMAIN=\""NetworkManager"\" \
|
||||
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
|
||||
$(NULL)
|
||||
|
||||
shared_nm_log_core_libnm_log_core_la_SOURCES = \
|
||||
|
@ -632,7 +631,6 @@ libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS = \
|
|||
$(GLIB_CFLAGS) \
|
||||
$(SANITIZER_LIB_CFLAGS) \
|
||||
-DG_LOG_DOMAIN=\""libnm"\" \
|
||||
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \
|
||||
$(NULL)
|
||||
|
||||
libnm_core_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES = \
|
||||
|
|
|
@ -226,8 +226,7 @@ libnm_libnm_core_aux = static_library(
|
|||
) + [libnm_core_enum_sources[1]],
|
||||
dependencies: libnm_glib_aux_dep,
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
|
||||
'-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
|
||||
'-DG_LOG_DOMAIN="libnm"',
|
||||
],
|
||||
link_with: [
|
||||
libnm_libnm_core_intern,
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2019 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-libnm-core-aux.h"
|
||||
|
||||
|
|
|
@ -138,8 +138,7 @@ libnm_glib_aux = static_library(
|
|||
),
|
||||
dependencies: glib_nm_default_dep,
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
|
||||
'-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
|
||||
'-DG_LOG_DOMAIN="libnm"',
|
||||
],
|
||||
link_with: [
|
||||
libc_siphash,
|
||||
|
@ -160,8 +159,7 @@ libnm_udev_aux = static_library(
|
|||
libudev_dep,
|
||||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
|
||||
'-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
|
||||
'-DG_LOG_DOMAIN="libnm"',
|
||||
],
|
||||
)
|
||||
|
||||
|
@ -177,8 +175,7 @@ libnm_base = static_library(
|
|||
),
|
||||
dependencies: libnm_glib_aux_dep,
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
|
||||
'-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
|
||||
'-DG_LOG_DOMAIN="libnm"',
|
||||
],
|
||||
)
|
||||
|
||||
|
@ -197,7 +194,6 @@ libnm_log_core = static_library(
|
|||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="NetworkManager"',
|
||||
'-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
|
||||
],
|
||||
)
|
||||
|
||||
|
@ -221,7 +217,6 @@ libnm_platform = static_library(
|
|||
],
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="NetworkManager"',
|
||||
'-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
|
||||
],
|
||||
)
|
||||
|
||||
|
@ -282,7 +277,7 @@ libnm_systemd_shared = static_library(
|
|||
),
|
||||
dependencies: glib_nm_default_dep,
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
|
||||
'-DG_LOG_DOMAIN="libnm"',
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED',
|
||||
],
|
||||
)
|
||||
|
@ -302,7 +297,7 @@ libnm_systemd_logging_stub = static_library(
|
|||
sources: 'systemd/nm-logging-stub.c',
|
||||
dependencies: glib_nm_default_dep,
|
||||
c_args: [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
|
||||
'-DG_LOG_DOMAIN="libnm"',
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED',
|
||||
],
|
||||
)
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-ethtool-base.h"
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#endif
|
||||
|
||||
#if NETWORKMANAGER_COMPILATION \
|
||||
< (NM_NETWORKMANAGER_COMPILATION_GLIB | NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)
|
||||
< (NM_NETWORKMANAGER_COMPILATION_GLIB | NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)
|
||||
#error Dont include this header with such NETWORKMANAGER_COMPILATION
|
||||
#endif
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2019 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-dbus-aux.h"
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2017 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-dedup-multi.h"
|
||||
|
||||
|
|
21
shared/nm-glib-aux/nm-default-glib-i18n-lib.h
Normal file
21
shared/nm-glib-aux/nm-default-glib-i18n-lib.h
Normal file
|
@ -0,0 +1,21 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
/*
|
||||
* Copyright (C) 2015 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#ifndef __NM_DEFAULT_GLIB_I18N_LIB_H__
|
||||
#define __NM_DEFAULT_GLIB_I18N_LIB_H__
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define _NETWORKMANAGER_COMPILATION_GLIB_I18N_LIB
|
||||
|
||||
#include "nm-glib-aux/nm-default-glib.h"
|
||||
|
||||
#undef NETWORKMANAGER_COMPILATION
|
||||
#define NETWORKMANAGER_COMPILATION \
|
||||
(NM_NETWORKMANAGER_COMPILATION_GLIB | NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
#endif /* __NM_DEFAULT_GLIB_I18N_LIB_H__ */
|
|
@ -6,6 +6,8 @@
|
|||
#ifndef __NM_DEFAULT_GLIB_H__
|
||||
#define __NM_DEFAULT_GLIB_H__
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
#include "nm-std-aux/nm-default-std.h"
|
||||
|
||||
#undef NETWORKMANAGER_COMPILATION
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2017 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-enum-utils.h"
|
||||
#include "nm-str-buf.h"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-errno.h"
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2017 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-hash-utils.h"
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-io-utils.h"
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2017 - 2019 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-json-aux.h"
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2019 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-keyfile-aux.h"
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-logging-base.h"
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2017 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-random-utils.h"
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-ref-string.h"
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* Copyright (C) 2015 - 2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-secret-utils.h"
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2016 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-shared-utils.h"
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-time-utils.h"
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* Copyright (C) 2006 - 2008 Novell, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-logging.h"
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2018 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-netlink.h"
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2015 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-platform-utils.h"
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2016 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nmp-netns.h"
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
* Copyright (C) 2017 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||
|
||||
#include "nm-udev-utils.h"
|
||||
|
||||
|
|
Loading…
Reference in a new issue