diff options
| author | Thomas Haller <thaller@redhat.com> | 2021-02-04 08:48:06 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-02-09 12:38:17 +0100 |
| commit | bbb86cc11a190f3f51f0c1753974a9139cdf4908 (patch) | |
| tree | 7e65957c3d35e5f20ef0ab394f50dd01b65318fe /shared/meson.build | |
| parent | d69f12f9e7c13e6fe02462fcbf1117f00714286d (diff) | |
| download | NetworkManager-bbb86cc11a190f3f51f0c1753974a9139cdf4908.tar.gz | |
all: add "nm-glib-aux/nm-default-glib-i18n-lib.h" as replacement for "nm-default.h"
Diffstat (limited to 'shared/meson.build')
| -rw-r--r-- | shared/meson.build | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/shared/meson.build b/shared/meson.build index eacd5e0160..e311e8ab91 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -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', ], ) |