mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 10:46:59 +00:00
all: add "nm-glib-aux/nm-default-glib-i18n-prog.h" as replacement for "nm-default.h"
This commit is contained in:
Thomas Haller
parent
bbb86cc11a
commit
8f4f91b667
10
Makefile.am
10
Makefile.am
|
|
@ -398,6 +398,7 @@ shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \
|
|||
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-i18n-prog.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 \
|
||||
|
|
@ -552,8 +553,7 @@ check_programs += shared/nm-platform/tests/test-nm-platform
|
|||
shared_nm_platform_tests_test_nm_platform_CPPFLAGS = \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/shared \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)' \
|
||||
-DG_LOG_DOMAIN=\""test"\" \
|
||||
$(CODE_COVERAGE_CFLAGS) \
|
||||
$(SYSTEMD_JOURNAL_CFLAGS) \
|
||||
$(GLIB_CFLAGS) \
|
||||
|
|
@ -740,8 +740,7 @@ check_programs += shared/nm-glib-aux/tests/test-shared-general
|
|||
shared_nm_glib_aux_tests_test_shared_general_CPPFLAGS = \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/shared \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)' \
|
||||
-DG_LOG_DOMAIN=\""test"\" \
|
||||
$(CODE_COVERAGE_CFLAGS) \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(SANITIZER_LIB_CFLAGS) \
|
||||
|
|
@ -769,8 +768,7 @@ check_programs += shared/nm-glib-aux/tests/test-json-aux
|
|||
shared_nm_glib_aux_tests_test_json_aux_CPPFLAGS = \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/shared \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
-DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)' \
|
||||
-DG_LOG_DOMAIN=\""test"\" \
|
||||
$(CODE_COVERAGE_CFLAGS) \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(JANSSON_CFLAGS) \
|
||||
|
|
|
|||
|
|
@ -22,8 +22,7 @@
|
|||
#error Define NETWORKMANAGER_COMPILATION accordingly
|
||||
#endif
|
||||
|
||||
#if NETWORKMANAGER_COMPILATION \
|
||||
< (NM_NETWORKMANAGER_COMPILATION_GLIB | NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)
|
||||
#if NETWORKMANAGER_COMPILATION < NM_NETWORKMANAGER_COMPILATION_CLIENT
|
||||
#error Dont include this header with such NETWORKMANAGER_COMPILATION
|
||||
#endif
|
||||
|
||||
|
|
|
|||
21
shared/nm-glib-aux/nm-default-glib-i18n-prog.h
Normal file
21
shared/nm-glib-aux/nm-default-glib-i18n-prog.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_PROG_H__
|
||||
#define __NM_DEFAULT_GLIB_I18N_PROG_H__
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define _NETWORKMANAGER_COMPILATION_GLIB_I18N_PROG
|
||||
|
||||
#include "nm-glib-aux/nm-default-glib.h"
|
||||
|
||||
#undef NETWORKMANAGER_COMPILATION
|
||||
#define NETWORKMANAGER_COMPILATION \
|
||||
(NM_NETWORKMANAGER_COMPILATION_GLIB | NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
#endif /* __NM_DEFAULT_GLIB_I18N_PROG_H__ */
|
||||
|
|
@ -4,8 +4,7 @@ exe = executable(
|
|||
'test-shared-general',
|
||||
'test-shared-general.c',
|
||||
c_args: [
|
||||
'-DNETWORKMANAGER_COMPILATION_TEST',
|
||||
'-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)',
|
||||
'-DG_LOG_DOMAIN="test"',
|
||||
],
|
||||
dependencies: libnm_glib_aux_dep,
|
||||
link_with: libnm_systemd_logging_stub,
|
||||
|
|
@ -23,8 +22,7 @@ if jansson_dep.found()
|
|||
'test-json-aux',
|
||||
'test-json-aux.c',
|
||||
c_args: [
|
||||
'-DNETWORKMANAGER_COMPILATION_TEST',
|
||||
'-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)',
|
||||
'-DG_LOG_DOMAIN="test"',
|
||||
],
|
||||
dependencies: [
|
||||
libnm_glib_aux_dep,
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#define NM_TEST_UTILS_NO_LIBNM 1
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-prog.h"
|
||||
|
||||
#include <jansson.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
#define NM_TEST_UTILS_NO_LIBNM 1
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-prog.h"
|
||||
|
||||
#include "nm-std-aux/unaligned.h"
|
||||
#include "nm-glib-aux/nm-random-utils.h"
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@ exe = executable(
|
|||
'test-nm-platform',
|
||||
'test-nm-platform.c',
|
||||
c_args: [
|
||||
'-DNETWORKMANAGER_COMPILATION_TEST',
|
||||
'-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)',
|
||||
'-DG_LOG_DOMAIN="test"',
|
||||
],
|
||||
dependencies: [
|
||||
libnm_log_core_dep,
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#define NM_TEST_UTILS_NO_LIBNM 1
|
||||
|
||||
#include "nm-default.h"
|
||||
#include "nm-glib-aux/nm-default-glib-i18n-prog.h"
|
||||
|
||||
#include "nm-log-core/nm-logging.h"
|
||||
#include "nm-platform/nm-netlink.h"
|
||||
|
|
|
|||
Loading…
Reference in a new issue