Update upstream source from tag 'upstream/1.11.4'

Update to upstream version '1.11.4'
with Debian dir d0638aa2e32d5bae4e8daa021b9a66b7c4d6647e

1 files changed, 45 insertions, 37 deletions

diff --git a/shared/meson.build b/shared/meson.build
index a812b588..db6b8a40 100644
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -1,70 +1,78 @@
-shared_c_list_dep = declare_dependency(
-    include_directories: include_directories('c-list/src')
-)
+shared_inc = include_directories('.')
 
 shared_c_siphash = static_library(
     'c-siphash',
-    sources: ['c-siphash/src/c-siphash.c']
+    sources: 'c-siphash/src/c-siphash.c',
 )
 
 shared_c_siphash_dep = declare_dependency(
-    include_directories: include_directories('c-siphash/src'),
-    link_with: shared_c_siphash
+    include_directories: shared_inc,
+    link_with: shared_c_siphash,
 )
 
 shared_n_acd = static_library(
     'n-acd',
-    sources: ['n-acd/src/n-acd.c'],
-    dependencies: [ shared_c_siphash_dep, shared_c_list_dep ]
+    sources: 'n-acd/src/n-acd.c',
+    include_directories: [
+        include_directories('c-siphash/src'),
+        include_directories('c-list/src'),
+    ],
+    dependencies: shared_c_siphash_dep,
 )
 
 shared_n_acd_dep = declare_dependency(
-    include_directories: include_directories('.'),
+    include_directories: shared_inc,
     link_with: shared_n_acd,
 )
 
-shared_inc = include_directories('.')
-
 version_conf = configuration_data()
 version_conf.set('NM_MAJOR_VERSION', nm_major_version)
 version_conf.set('NM_MINOR_VERSION', nm_minor_version)
 version_conf.set('NM_MICRO_VERSION', nm_micro_version)
 
-version = 'nm-version-macros.h'
-
 version_header = configure_file(
-  input: version + '.in',
-  output: version,
-  configuration: version_conf
+    input: 'nm-version-macros.h.in',
+    output: 'nm-version-macros.h',
+    configuration: version_conf,
 )
 
-shared_meta_setting = files('nm-meta-setting.c')
+shared_nm_utils_nm_meta_setting_c = files('nm-meta-setting.c')
 
-shared_test_utils = files('nm-test-utils-impl.c')
+shared_nm_test_utils_impl_c = files('nm-test-utils-impl.c')
 
-shared_siphash = files('nm-utils/siphash24.c')
+shared_nm_utils_nm_vpn_plugin_utils_c = files('nm-utils/nm-vpn-plugin-utils.c')
 
-shared_udev_utils = files('nm-utils/nm-udev-utils.c')
+shared_files_libnm_core = files('''
+    c-siphash/src/c-siphash.c
+    nm-utils/c-list-util.c
+    nm-utils/nm-dedup-multi.c
+    nm-utils/nm-enum-utils.c
+    nm-utils/nm-hash-utils.c
+    nm-utils/nm-random-utils.c
+    nm-utils/nm-shared-utils.c
+    nm-utils/nm-udev-utils.c
+'''.split())
 
-shared_utils = files(
-  'nm-utils/nm-enum-utils.c',
-  'nm-utils/nm-hash-utils.c',
-  'nm-utils/nm-random-utils.c',
-  'nm-utils/nm-shared-utils.c'
-)
+shared_files_clients_common = files('''
+    c-siphash/src/c-siphash.c
+    nm-utils/nm-enum-utils.c
+    nm-utils/nm-hash-utils.c
+    nm-utils/nm-random-utils.c
+    nm-utils/nm-shared-utils.c
+'''.split())
 
-shared_vpn_plugin_utils = files('nm-utils/nm-vpn-plugin-utils.c')
+shared_files_libnm_util = files('''
+    nm-utils/nm-shared-utils.c
+'''.split())
 
-shared_sources = shared_utils + shared_meta_setting + shared_udev_utils + files(
-  'nm-utils/c-list-util.c',
-  'nm-utils/nm-dedup-multi.c'
-)
+shared_files_libnm_glib = files('''
+    nm-utils/nm-udev-utils.c
+'''.split())
 
 shared_dep = declare_dependency(
-  include_directories: [
-    top_inc,
-    shared_inc,
-    include_directories('nm-utils')
-  ],
-  dependencies: glib_dep
+    include_directories: [
+        top_inc,
+        shared_inc,
+    ],
+    dependencies: glib_dep,
 )