diff --git a/Makefile.am b/Makefile.am index 714b341697..72eb8c77df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1960,7 +1960,6 @@ noinst_LTLIBRARIES += shared/systemd/libnm-systemd-logging-stub.la shared_systemd_libnm_systemd_logging_stub_la_CPPFLAGS = \ $(libsystemd_cppflags) \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED \ -DG_LOG_DOMAIN=\""libnm"\" \ $(NULL) @@ -1977,11 +1976,11 @@ noinst_LTLIBRARIES += shared/systemd/libnm-systemd-shared.la shared_systemd_libnm_systemd_shared_la_CPPFLAGS = \ $(libsystemd_cppflags) \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED \ -DG_LOG_DOMAIN=\""libnm"\" \ $(NULL) shared_systemd_libnm_systemd_shared_la_SOURCES = \ + shared/systemd/nm-default-systemd-shared.h \ shared/systemd/nm-sd-utils-shared.c \ shared/systemd/nm-sd-utils-shared.h \ shared/systemd/sd-adapt-shared/architecture.h \ @@ -2126,7 +2125,7 @@ src_core_libnm_systemd_core_la_cppflags = \ -I$(srcdir)/src/core/systemd/src/systemd \ -I$(srcdir)/src/core/systemd/src/libsystemd-network \ -I$(srcdir)/src/core/systemd/src/libsystemd/sd-event \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \ + -DG_LOG_DOMAIN=\""NetworkManager"\" \ $(NULL) src_core_libnm_systemd_core_la_libadd = \ @@ -2135,6 +2134,7 @@ src_core_libnm_systemd_core_la_libadd = \ $(NULL) src_core_libnm_systemd_core_la_SOURCES = \ + src/core/systemd/nm-default-systemd.h \ src/core/systemd/nm-sd-utils-core.c \ src/core/systemd/nm-sd-utils-core.h \ src/core/systemd/nm-sd.c \ @@ -4318,7 +4318,6 @@ $(src_core_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums) src_core_tests_test_systemd_CPPFLAGS = \ $(src_core_libnm_systemd_core_la_cppflags) \ - -DNETWORKMANAGER_COMPILATION_TEST \ $(NULL) src_core_tests_test_systemd_LDFLAGS = \ diff --git a/shared/meson.build b/shared/meson.build index e311e8ab91..e961e9637f 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -278,7 +278,6 @@ libnm_systemd_shared = static_library( dependencies: glib_nm_default_dep, c_args: [ '-DG_LOG_DOMAIN="libnm"', - '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED', ], ) @@ -298,7 +297,6 @@ libnm_systemd_logging_stub = static_library( dependencies: glib_nm_default_dep, c_args: [ '-DG_LOG_DOMAIN="libnm"', - '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED', ], ) diff --git a/shared/nm-default.h b/shared/nm-default.h index 90968b4a4c..7a8f02506d 100644 --- a/shared/nm-default.h +++ b/shared/nm-default.h @@ -22,9 +22,7 @@ #error Define NETWORKMANAGER_COMPILATION accordingly #endif -#if NETWORKMANAGER_COMPILATION < NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED - #error Dont include this header with such NETWORKMANAGER_COMPILATION -#endif +#error We don't expect this header to be used anymore. #ifndef G_LOG_DOMAIN #if defined(NETWORKMANAGER_COMPILATION_TEST) diff --git a/shared/nm-glib-aux/tests/test-json-aux.c b/shared/nm-glib-aux/tests/test-json-aux.c index efbeec48c4..b07d673fa6 100644 --- a/shared/nm-glib-aux/tests/test-json-aux.c +++ b/shared/nm-glib-aux/tests/test-json-aux.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#define NM_TEST_UTILS_NO_LIBNM 1 - #include "nm-glib-aux/nm-default-glib-i18n-prog.h" #include diff --git a/shared/nm-glib-aux/tests/test-shared-general.c b/shared/nm-glib-aux/tests/test-shared-general.c index 8fa8617729..f42c6fb108 100644 --- a/shared/nm-glib-aux/tests/test-shared-general.c +++ b/shared/nm-glib-aux/tests/test-shared-general.c @@ -3,8 +3,6 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#define NM_TEST_UTILS_NO_LIBNM 1 - #include "nm-glib-aux/nm-default-glib-i18n-prog.h" #include "nm-std-aux/unaligned.h" diff --git a/shared/nm-platform/tests/test-nm-platform.c b/shared/nm-platform/tests/test-nm-platform.c index 3c5e41f0f1..a3e9ff13ba 100644 --- a/shared/nm-platform/tests/test-nm-platform.c +++ b/shared/nm-platform/tests/test-nm-platform.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ -#define NM_TEST_UTILS_NO_LIBNM 1 - #include "nm-glib-aux/nm-default-glib-i18n-prog.h" #include "nm-log-core/nm-logging.h" diff --git a/shared/nm-utils/nm-test-utils.h b/shared/nm-utils/nm-test-utils.h index 295e84cbdb..14446562f4 100644 --- a/shared/nm-utils/nm-test-utils.h +++ b/shared/nm-utils/nm-test-utils.h @@ -92,10 +92,6 @@ #include #include -#ifndef NM_TEST_UTILS_NO_LIBNM - #include "nm-utils.h" -#endif - /*****************************************************************************/ #define NMTST_G_RETURN_MSG_S(expr) "*: assertion '" NM_ASSERT_G_RETURN_EXPR(expr) "' failed" diff --git a/shared/systemd/nm-default-systemd-shared.h b/shared/systemd/nm-default-systemd-shared.h new file mode 100644 index 0000000000..bc0e6c4ca0 --- /dev/null +++ b/shared/systemd/nm-default-systemd-shared.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2015 Red Hat, Inc. + */ + +#ifndef __NM_DEFAULT_SYSTEMD_SHARED_H__ +#define __NM_DEFAULT_SYSTEMD_SHARED_H__ + +/*****************************************************************************/ + +#include "nm-glib-aux/nm-default-glib.h" + +#undef NETWORKMANAGER_COMPILATION +#define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED + +/*****************************************************************************/ + +#endif /* __NM_DEFAULT_SYSTEMD_SHARED_H__ */ diff --git a/shared/systemd/nm-logging-stub.c b/shared/systemd/nm-logging-stub.c index b875e61696..8db90cd9eb 100644 --- a/shared/systemd/nm-logging-stub.c +++ b/shared/systemd/nm-logging-stub.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "nm-default.h" +#include "shared/systemd/nm-default-systemd-shared.h" #include "nm-glib-aux/nm-logging-fwd.h" diff --git a/shared/systemd/nm-sd-utils-shared.c b/shared/systemd/nm-sd-utils-shared.c index 55854854e5..c93e89c630 100644 --- a/shared/systemd/nm-sd-utils-shared.c +++ b/shared/systemd/nm-sd-utils-shared.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "nm-default.h" +#include "shared/systemd/nm-default-systemd-shared.h" #include "nm-sd-utils-shared.h" diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h index 41cfb1c976..b094ce40b6 100644 --- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h +++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h @@ -6,7 +6,7 @@ #ifndef __NM_SD_ADAPT_SHARED_H__ #define __NM_SD_ADAPT_SHARED_H__ -#include "nm-default.h" +#include "shared/systemd/nm-default-systemd-shared.h" #include "nm-glib-aux/nm-logging-fwd.h" diff --git a/src/core/systemd/meson.build b/src/core/systemd/meson.build index 4f3a63eda4..70f6b54295 100644 --- a/src/core/systemd/meson.build +++ b/src/core/systemd/meson.build @@ -45,7 +45,9 @@ libnm_systemd_core = static_library( libnm_core_dep, libnm_systemd_shared_dep, ], - c_args: '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD', + c_args: [ + '-DG_LOG_DOMAIN="NetworkManager"', + ], link_with: libc_siphash, ) diff --git a/src/core/systemd/nm-default-systemd.h b/src/core/systemd/nm-default-systemd.h new file mode 100644 index 0000000000..1979d9c990 --- /dev/null +++ b/src/core/systemd/nm-default-systemd.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2015 Red Hat, Inc. + */ + +#ifndef __NM_DEFAULT_SYSTEMD_H__ +#define __NM_DEFAULT_SYSTEMD_H__ + +/*****************************************************************************/ + +#include "nm-default-daemon.h" + +#undef NETWORKMANAGER_COMPILATION +#define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_SYSTEMD + +/*****************************************************************************/ + +#endif /* __NM_DEFAULT_SYSTEMD_H__ */ diff --git a/src/core/systemd/nm-sd-utils-core.c b/src/core/systemd/nm-sd-utils-core.c index c7d4aadafa..af68603ec0 100644 --- a/src/core/systemd/nm-sd-utils-core.c +++ b/src/core/systemd/nm-sd-utils-core.c @@ -3,7 +3,7 @@ * Copyright (C) 2018 Red Hat, Inc. */ -#include "nm-default.h" +#include "src/core/systemd/nm-default-systemd.h" #include "nm-sd-utils-core.h" diff --git a/src/core/systemd/nm-sd-utils-dhcp.c b/src/core/systemd/nm-sd-utils-dhcp.c index bafc8fcc68..b5aa315a97 100644 --- a/src/core/systemd/nm-sd-utils-dhcp.c +++ b/src/core/systemd/nm-sd-utils-dhcp.c @@ -3,7 +3,7 @@ * Copyright (C) 2019 Red Hat, Inc. */ -#include "nm-default.h" +#include "src/core/systemd/nm-default-systemd.h" #include "nm-sd-utils-dhcp.h" diff --git a/src/core/systemd/nm-sd.c b/src/core/systemd/nm-sd.c index 6543321312..11f3abbd36 100644 --- a/src/core/systemd/nm-sd.c +++ b/src/core/systemd/nm-sd.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 - 2016 Red Hat, Inc. */ -#include "nm-default.h" +#include "src/core/systemd/nm-default-systemd.h" #include "nm-sd.h" diff --git a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c index c03d4d97bd..9339b33dc8 100644 --- a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c +++ b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c @@ -3,7 +3,7 @@ * Copyright (C) 2014 - 2016 Red Hat, Inc. */ -#include "nm-default.h" +#include "src/core/systemd/nm-default-systemd.h" #include "nm-sd-adapt-core.h" diff --git a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h index a7332914f0..f627d7d471 100644 --- a/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h +++ b/src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h @@ -6,13 +6,16 @@ #ifndef __NM_SD_ADAPT_CORE_H__ #define __NM_SD_ADAPT_CORE_H__ -#include "nm-default.h" +#include "src/core/systemd/nm-default-systemd.h" #include #include #include +#undef NETWORKMANAGER_COMPILATION #include "systemd/sd-adapt-shared/nm-sd-adapt-shared.h" +#undef NETWORKMANAGER_COMPILATION +#define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_SYSTEMD #ifndef HAVE_SYS_AUXV_H #define HAVE_SYS_AUXV_H 0 diff --git a/src/core/tests/meson.build b/src/core/tests/meson.build index f4125396c2..994563c42c 100644 --- a/src/core/tests/meson.build +++ b/src/core/tests/meson.build @@ -41,8 +41,7 @@ exe = executable( libnm_systemd_shared_dep, ], c_args: [ - '-DNETWORKMANAGER_COMPILATION_TEST', - '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD', + '-DG_LOG_DOMAIN="test"', ], ) diff --git a/src/core/tests/test-systemd.c b/src/core/tests/test-systemd.c index aa87660c98..03576c133c 100644 --- a/src/core/tests/test-systemd.c +++ b/src/core/tests/test-systemd.c @@ -3,7 +3,7 @@ * Copyright (C) 2016 Red Hat, Inc. */ -#include "nm-default.h" +#include "src/core/systemd/nm-default-systemd.h" #include "systemd/nm-sd.h" #include "systemd/nm-sd-utils-shared.h"