Update upstream source from tag 'upstream/1.22.0'

Update to upstream version '1.22.0'
with Debian dir a81ba1028908d08fc4866734c3df4a042bf9a511

1 files changed, 8 insertions, 17 deletions

diff --git a/src/ppp/meson.build b/src/ppp/meson.build
index 04c539e3..0c458768 100644
--- a/src/ppp/meson.build
+++ b/src/ppp/meson.build
@@ -1,39 +1,30 @@
 name = 'nm-pppd-plugin'
 
-deps = [
-  dl_dep,
-  libnm_core_dep,
+c_flags = [
+  '-DG_LOG_DOMAIN="@0@"'.format(name),
+  '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB',
 ]
 
 nm_pppd_plugin = shared_module(
   name,
   name_prefix: '',
   sources: name + '.c',
-  include_directories: src_inc,
-  dependencies: deps,
-  c_args: [
-    '-DG_LOG_DOMAIN="@0@"'.format(name),
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB',
-  ],
+  dependencies: libnm_core_nm_default_dep,
+  c_args: c_flags,
   install: true,
   install_dir: pppd_plugin_dir,
 )
 
 name = 'nm-ppp-plugin'
 
-deps = [
-  nm_dep,
-]
-
 linker_script = join_paths(meson.current_source_dir(), 'nm-ppp-plugin.ver')
 
 core_plugins += shared_module(
   name,
   sources: 'nm-ppp-manager.c',
-  dependencies: deps,
-  link_args: [
-    '-Wl,--version-script,@0@'.format(linker_script),
-  ],
+  dependencies: daemon_nm_default_dep,
+  c_args: daemon_c_flags,
+  link_args: '-Wl,--version-script,@0@'.format(linker_script),
   link_depends: linker_script,
   install: true,
   install_dir: nm_plugindir,