From 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Apr 2019 21:09:51 +0200 Subject: New upstream version 1.18.0 --- libnm-glib/meson.build | 4 ++-- libnm-glib/nm-client.c | 2 +- libnm-glib/nm-device.c | 2 +- libnm-glib/tests/meson.build | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'libnm-glib') diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build index 3882d59a..5f08141e 100644 --- a/libnm-glib/meson.build +++ b/libnm-glib/meson.build @@ -5,7 +5,7 @@ dbus_binding_tool = find_program('dbus-binding-tool') common_deps = [ dbus_dep, dbus_glib_dep, - shared_nm_utils_base_dep, + shared_nm_glib_aux_dep, ] common_cflags = [ @@ -196,7 +196,7 @@ libnm_glib = shared_library( dependencies: common_deps + [ libnm_util_dep, libudev_dep, - shared_nm_utils_udev_dep, + shared_nm_udev_aux_dep, ], c_args: cflags, link_whole: libdeprecated_nm_glib, diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c index 16fee714..8f1524e3 100644 --- a/libnm-glib/nm-client.c +++ b/libnm-glib/nm-client.c @@ -27,7 +27,7 @@ #include #include "nm-utils.h" -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "nm-device-ethernet.h" #include "nm-device-wifi.h" diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index 6179b757..e9b3b30f 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -26,7 +26,7 @@ #include "NetworkManager.h" -#include "nm-utils/nm-udev-utils.h" +#include "nm-udev-aux/nm-udev-utils.h" #include "nm-device-ethernet.h" #include "nm-device-adsl.h" #include "nm-device-wifi.h" diff --git a/libnm-glib/tests/meson.build b/libnm-glib/tests/meson.build index 7d6007cb..de74f3b2 100644 --- a/libnm-glib/tests/meson.build +++ b/libnm-glib/tests/meson.build @@ -3,7 +3,7 @@ deps = [ dbus_glib_dep, libnm_glib_dep, libnm_util_dep, - shared_nm_utils_base_dep, + shared_nm_glib_aux_dep, ] test_units = [ -- cgit 1.3.0-6-gf8a5