mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 10:46:59 +00:00
shared: move "nm-dbus-compat.h" header to "nm-std-aux/nm-dbus-compat.h"
This commit is contained in:
parent
80db06f768
commit
8183335878
|
@ -302,6 +302,7 @@ shared_nm_std_aux_libnm_std_aux_la_SOURCES = \
|
|||
shared/c-list/src/c-list.h \
|
||||
shared/nm-std-aux/c-list-util.c \
|
||||
shared/nm-std-aux/c-list-util.h \
|
||||
shared/nm-std-aux/nm-dbus-compat.h \
|
||||
shared/nm-std-aux/unaligned.h \
|
||||
$(NULL)
|
||||
|
||||
|
@ -4604,7 +4605,6 @@ EXTRA_DIST += \
|
|||
po/meson.build \
|
||||
\
|
||||
shared/nm-common-macros.h \
|
||||
shared/nm-dbus-compat.h \
|
||||
shared/nm-default.h \
|
||||
shared/nm-dispatcher-api.h \
|
||||
shared/nm-test-libnm-utils.h \
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#error Cannot use this header.
|
||||
#endif
|
||||
|
||||
#include "nm-dbus-compat.h"
|
||||
#include "nm-std-aux/nm-dbus-compat.h"
|
||||
|
||||
GBusType _nm_dbus_bus_type (void);
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#include <sys/wait.h>
|
||||
|
||||
#include "NetworkManager.h"
|
||||
#include "nm-dbus-compat.h"
|
||||
#include "nm-std-aux/nm-dbus-compat.h"
|
||||
|
||||
#include "nm-test-libnm-utils.h"
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include "nm-device-bt.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "platform/nm-platform.h"
|
||||
#include "nm-dbus-compat.h"
|
||||
#include "nm-std-aux/nm-dbus-compat.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
#include "nm-config.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "nm-ip4-config.h"
|
||||
#include "nm-dbus-compat.h"
|
||||
#include "nm-std-aux/nm-dbus-compat.h"
|
||||
|
||||
#include "devices/nm-device-logging.h"
|
||||
_LOG_DECLARE_SELF(NMDeviceTeam);
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#include "nm-config.h"
|
||||
#include "nm-iwd-manager.h"
|
||||
#include "nm-dbus-manager.h"
|
||||
#include "nm-dbus-compat.h"
|
||||
#include "nm-std-aux/nm-dbus-compat.h"
|
||||
|
||||
#include "devices/nm-device-logging.h"
|
||||
_LOG_DECLARE_SELF(NMDeviceIwd);
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#define sd_booted() FALSE
|
||||
#endif
|
||||
|
||||
#include "nm-dbus-compat.h"
|
||||
#include "nm-std-aux/nm-dbus-compat.h"
|
||||
#include "nm-modem.h"
|
||||
#include "nm-modem-broadband.h"
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
#include "nm-setting-connection.h"
|
||||
#include "devices/nm-device.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "nm-dbus-compat.h"
|
||||
#include "nm-std-aux/nm-dbus-compat.h"
|
||||
|
||||
#define SYSTEMD_RESOLVED_DBUS_SERVICE "org.freedesktop.resolve1"
|
||||
#define SYSTEMD_RESOLVED_MANAGER_IFACE "org.freedesktop.resolve1.Manager"
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#include "nm-glib-aux/nm-c-list.h"
|
||||
#include "nm-dbus-interface.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "nm-dbus-compat.h"
|
||||
#include "nm-std-aux/nm-dbus-compat.h"
|
||||
#include "nm-dbus-object.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
#include "nm-core-internal.h"
|
||||
#include "nm-config.h"
|
||||
#include "nm-audit-manager.h"
|
||||
#include "nm-dbus-compat.h"
|
||||
#include "nm-std-aux/nm-dbus-compat.h"
|
||||
#include "nm-checkpoint.h"
|
||||
#include "nm-checkpoint-manager.h"
|
||||
#include "nm-dbus-object.h"
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include <sys/stat.h>
|
||||
#include <gmodule.h>
|
||||
|
||||
#include "nm-dbus-compat.h"
|
||||
#include "nm-std-aux/nm-dbus-compat.h"
|
||||
#include "nm-setting-connection.h"
|
||||
#include "settings/nm-settings-plugin.h"
|
||||
#include "nm-config.h"
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include "NetworkManagerUtils.h"
|
||||
#include "nm-supplicant-config.h"
|
||||
#include "nm-core-internal.h"
|
||||
#include "nm-dbus-compat.h"
|
||||
#include "nm-std-aux/nm-dbus-compat.h"
|
||||
|
||||
#define WPAS_DBUS_IFACE_INTERFACE WPAS_DBUS_INTERFACE ".Interface"
|
||||
#define WPAS_DBUS_IFACE_INTERFACE_WPS WPAS_DBUS_INTERFACE ".Interface.WPS"
|
||||
|
|
Loading…
Reference in a new issue