mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-06 17:14:02 +00:00
platform: move "platform/{wifi,wpan}/" to "src/libnm-platform/"
This commit is contained in:
parent
f435454615
commit
3b6e57961d
27
Makefile.am
27
Makefile.am
|
@ -581,8 +581,22 @@ src_libnm_platform_libnm_platform_la_SOURCES = \
|
||||||
src/libnm-platform/nmp-base.h \
|
src/libnm-platform/nmp-base.h \
|
||||||
src/libnm-platform/nmp-netns.c \
|
src/libnm-platform/nmp-netns.c \
|
||||||
src/libnm-platform/nmp-netns.h \
|
src/libnm-platform/nmp-netns.h \
|
||||||
|
src/libnm-platform/wifi/nm-wifi-utils-nl80211.c \
|
||||||
|
src/libnm-platform/wifi/nm-wifi-utils-nl80211.h \
|
||||||
|
src/libnm-platform/wifi/nm-wifi-utils-private.h \
|
||||||
|
src/libnm-platform/wifi/nm-wifi-utils.c \
|
||||||
|
src/libnm-platform/wifi/nm-wifi-utils.h \
|
||||||
|
src/libnm-platform/wpan/nm-wpan-utils.c \
|
||||||
|
src/libnm-platform/wpan/nm-wpan-utils.h \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
if WITH_WEXT
|
||||||
|
src_libnm_platform_libnm_platform_la_SOURCES += \
|
||||||
|
src/libnm-platform/wifi/nm-wifi-utils-wext.c \
|
||||||
|
src/libnm-platform/wifi/nm-wifi-utils-wext.h \
|
||||||
|
$(NULL)
|
||||||
|
endif
|
||||||
|
|
||||||
src_libnm_platform_libnm_platform_la_LDFLAGS = \
|
src_libnm_platform_libnm_platform_la_LDFLAGS = \
|
||||||
$(CODE_COVERAGE_LDFLAGS) \
|
$(CODE_COVERAGE_LDFLAGS) \
|
||||||
$(SANITIZER_LIB_LDFLAGS) \
|
$(SANITIZER_LIB_LDFLAGS) \
|
||||||
|
@ -2321,13 +2335,6 @@ src_core_libNetworkManagerBase_la_SOURCES = \
|
||||||
src/core/platform/nm-linux-platform.h \
|
src/core/platform/nm-linux-platform.h \
|
||||||
src/core/platform/nmp-rules-manager.c \
|
src/core/platform/nmp-rules-manager.c \
|
||||||
src/core/platform/nmp-rules-manager.h \
|
src/core/platform/nmp-rules-manager.h \
|
||||||
src/core/platform/wifi/nm-wifi-utils-nl80211.c \
|
|
||||||
src/core/platform/wifi/nm-wifi-utils-nl80211.h \
|
|
||||||
src/core/platform/wifi/nm-wifi-utils-private.h \
|
|
||||||
src/core/platform/wifi/nm-wifi-utils.c \
|
|
||||||
src/core/platform/wifi/nm-wifi-utils.h \
|
|
||||||
src/core/platform/wpan/nm-wpan-utils.c \
|
|
||||||
src/core/platform/wpan/nm-wpan-utils.h \
|
|
||||||
\
|
\
|
||||||
src/core/ndisc/nm-lndp-ndisc.c \
|
src/core/ndisc/nm-lndp-ndisc.c \
|
||||||
src/core/ndisc/nm-lndp-ndisc.h \
|
src/core/ndisc/nm-lndp-ndisc.h \
|
||||||
|
@ -2371,12 +2378,6 @@ src_core_libNetworkManagerBase_la_SOURCES = \
|
||||||
\
|
\
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
if WITH_WEXT
|
|
||||||
src_core_libNetworkManagerBase_la_SOURCES += \
|
|
||||||
src/core/platform/wifi/nm-wifi-utils-wext.c \
|
|
||||||
src/core/platform/wifi/nm-wifi-utils-wext.h
|
|
||||||
endif
|
|
||||||
|
|
||||||
src_core_libNetworkManagerBase_la_LIBADD = \
|
src_core_libNetworkManagerBase_la_LIBADD = \
|
||||||
$(GLIB_LIBS) \
|
$(GLIB_LIBS) \
|
||||||
$(LIBUDEV_LIBS) \
|
$(LIBUDEV_LIBS) \
|
||||||
|
|
|
@ -34,11 +34,6 @@ subdir('systemd')
|
||||||
|
|
||||||
core_plugins = []
|
core_plugins = []
|
||||||
|
|
||||||
platform_wifi_wext_source = files()
|
|
||||||
if enable_wext
|
|
||||||
platform_wifi_wext_source += files('platform/wifi/nm-wifi-utils-wext.c')
|
|
||||||
endif
|
|
||||||
|
|
||||||
libNetworkManagerBase = static_library(
|
libNetworkManagerBase = static_library(
|
||||||
'NetworkManagerBase',
|
'NetworkManagerBase',
|
||||||
sources: files(
|
sources: files(
|
||||||
|
@ -50,9 +45,6 @@ libNetworkManagerBase = static_library(
|
||||||
'dhcp/nm-dhcp-options.c',
|
'dhcp/nm-dhcp-options.c',
|
||||||
'ndisc/nm-lndp-ndisc.c',
|
'ndisc/nm-lndp-ndisc.c',
|
||||||
'ndisc/nm-ndisc.c',
|
'ndisc/nm-ndisc.c',
|
||||||
'platform/wifi/nm-wifi-utils-nl80211.c',
|
|
||||||
'platform/wifi/nm-wifi-utils.c',
|
|
||||||
'platform/wpan/nm-wpan-utils.c',
|
|
||||||
'platform/nm-linux-platform.c',
|
'platform/nm-linux-platform.c',
|
||||||
'platform/nm-platform.c',
|
'platform/nm-platform.c',
|
||||||
'platform/nmp-object.c',
|
'platform/nmp-object.c',
|
||||||
|
@ -69,7 +61,7 @@ libNetworkManagerBase = static_library(
|
||||||
'nm-ip-config.c',
|
'nm-ip-config.c',
|
||||||
'nm-ip4-config.c',
|
'nm-ip4-config.c',
|
||||||
'nm-ip6-config.c',
|
'nm-ip6-config.c',
|
||||||
) + platform_wifi_wext_source,
|
),
|
||||||
dependencies: [
|
dependencies: [
|
||||||
core_default_dep,
|
core_default_dep,
|
||||||
libnm_core_public_dep,
|
libnm_core_public_dep,
|
||||||
|
|
|
@ -46,9 +46,9 @@
|
||||||
#include "libnm-platform/nmp-netns.h"
|
#include "libnm-platform/nmp-netns.h"
|
||||||
#include "libnm-platform/nm-platform-utils.h"
|
#include "libnm-platform/nm-platform-utils.h"
|
||||||
#include "nm-platform-private.h"
|
#include "nm-platform-private.h"
|
||||||
#include "wifi/nm-wifi-utils.h"
|
#include "libnm-platform/wifi/nm-wifi-utils.h"
|
||||||
#include "wifi/nm-wifi-utils-wext.h"
|
#include "libnm-platform/wifi/nm-wifi-utils-wext.h"
|
||||||
#include "wpan/nm-wpan-utils.h"
|
#include "libnm-platform/wpan/nm-wpan-utils.h"
|
||||||
#include "libnm-glib-aux/nm-io-utils.h"
|
#include "libnm-glib-aux/nm-io-utils.h"
|
||||||
#include "libnm-udev-aux/nm-udev-utils.h"
|
#include "libnm-udev-aux/nm-udev-utils.h"
|
||||||
|
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
#include "nm-core-utils.h"
|
#include "nm-core-utils.h"
|
||||||
#include "libnm-platform/nm-platform-utils.h"
|
#include "libnm-platform/nm-platform-utils.h"
|
||||||
|
|
||||||
#include "wifi/nm-wifi-utils.h"
|
#include "libnm-platform/wifi/nm-wifi-utils.h"
|
||||||
#include "wpan/nm-wpan-utils.h"
|
#include "libnm-platform/wpan/nm-wpan-utils.h"
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,10 @@ libnm_platform = static_library(
|
||||||
'nm-netlink.c',
|
'nm-netlink.c',
|
||||||
'nm-platform-utils.c',
|
'nm-platform-utils.c',
|
||||||
'nmp-netns.c',
|
'nmp-netns.c',
|
||||||
],
|
'wifi/nm-wifi-utils-nl80211.c',
|
||||||
|
'wifi/nm-wifi-utils.c',
|
||||||
|
'wpan/nm-wpan-utils.c',
|
||||||
|
] + (enable_wext ? [ 'wifi/nm-wifi-utils-wext.c' ] : []),
|
||||||
include_directories: [
|
include_directories: [
|
||||||
src_inc,
|
src_inc,
|
||||||
top_inc,
|
top_inc,
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
* Copyright (C) 2011 Intel Corporation. All rights reserved.
|
* Copyright (C) 2011 Intel Corporation. All rights reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "src/core/nm-default-daemon.h"
|
#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||||
|
|
||||||
#include "nm-wifi-utils-nl80211.h"
|
#include "nm-wifi-utils-nl80211.h"
|
||||||
|
|
||||||
|
@ -15,6 +15,7 @@
|
||||||
#include <linux/nl80211.h>
|
#include <linux/nl80211.h>
|
||||||
#include <linux/if.h>
|
#include <linux/if.h>
|
||||||
|
|
||||||
|
#include "libnm-log-core/nm-logging.h"
|
||||||
#include "libnm-platform/nm-netlink.h"
|
#include "libnm-platform/nm-netlink.h"
|
||||||
#include "nm-wifi-utils-private.h"
|
#include "nm-wifi-utils-private.h"
|
||||||
#include "libnm-platform/nm-platform-utils.h"
|
#include "libnm-platform/nm-platform-utils.h"
|
|
@ -4,7 +4,7 @@
|
||||||
* Copyright (C) 2006 - 2008 Novell, Inc.
|
* Copyright (C) 2006 - 2008 Novell, Inc.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "src/core/nm-default-daemon.h"
|
#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||||
|
|
||||||
#include "nm-wifi-utils-wext.h"
|
#include "nm-wifi-utils-wext.h"
|
||||||
|
|
||||||
|
@ -21,6 +21,7 @@
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <linux/wireless.h>
|
#include <linux/wireless.h>
|
||||||
|
|
||||||
|
#include "libnm-log-core/nm-logging.h"
|
||||||
#include "nm-wifi-utils-private.h"
|
#include "nm-wifi-utils-private.h"
|
||||||
#include "libnm-platform/nm-platform-utils.h"
|
#include "libnm-platform/nm-platform-utils.h"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
* Copyright (C) 2006 - 2008 Novell, Inc.
|
* Copyright (C) 2006 - 2008 Novell, Inc.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "src/core/nm-default-daemon.h"
|
#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||||
|
|
||||||
#include "nm-wifi-utils.h"
|
#include "nm-wifi-utils.h"
|
||||||
|
|
|
@ -3,12 +3,13 @@
|
||||||
* Copyright (C) 2018 Red Hat, Inc.
|
* Copyright (C) 2018 Red Hat, Inc.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "src/core/nm-default-daemon.h"
|
#include "libnm-glib-aux/nm-default-glib-i18n-lib.h"
|
||||||
|
|
||||||
#include "nm-wpan-utils.h"
|
#include "nm-wpan-utils.h"
|
||||||
|
|
||||||
#include <linux/if.h>
|
#include <linux/if.h>
|
||||||
|
|
||||||
|
#include "libnm-log-core/nm-logging.h"
|
||||||
#include "libnm-platform/nm-netlink.h"
|
#include "libnm-platform/nm-netlink.h"
|
||||||
#include "linux-headers/nl802154.h"
|
#include "linux-headers/nl802154.h"
|
||||||
#include "libnm-platform/nm-platform-utils.h"
|
#include "libnm-platform/nm-platform-utils.h"
|
Loading…
Reference in a new issue