meson: Improve the shared build file

The `shared` build file has been improved by applying a set of
changes:

- Indentation has been fixed to be consistent.
- Unused libraries and dependencies have been removed.
- Dependencies have been reviewed to store the necessary data.
- Set of objects used in targets have been grouped together.
- Header files have been removed from sources lists as it's
  unnecessary.
- Library variable names have been changed to `lib{name}` pattern
  following their filename pattern.
- `shared` prefix has been removed from all variables using it.
- `version_header` its related configuration `version_conf`
  variables have been renamed to `nm_version_macro*` following
  its input and final file names.

clients/common/meson.build

@@ -55,7 +55,7 @@ libnmc = static_library(
   sources: files(
     'nm-meta-setting-access.c',
     'nm-meta-setting-desc.c',
-  ) + shared_nm_meta_setting_c + [settings_docs_source],
+  ) + nm_meta_setting_source + [settings_docs_source],
   dependencies: deps,
   c_args: cflags,
   link_with: libnmc_base,

libnm-core/meson.build

@@ -129,7 +129,7 @@ libnm_core_sources = libnm_core_settings_sources + files(
   'nm-vpn-plugin-info.c',
 )
 
-enum_headers = libnm_core_headers + [version_header]
+enum_headers = libnm_core_headers + [nm_version_macro_header]
 enum_types = 'nm-core-enum-types'
 
 libnm_core_enum = gnome.mkenums(
@@ -156,42 +156,25 @@ shared_nm_libnm_core_intern = static_library(
         '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
         '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
     ],
-    include_directories: [
+    include_directories: libnm_core_inc,
-        top_inc,
-        shared_inc,
-        libnm_core_inc,
-    ],
     dependencies: [
-        glib_dep,
-        shared_c_siphash_dep,
-        shared_nm_glib_aux_dep,
         libnm_core_enum_dep,
+        libnm_utils_base_dep,
     ],
 )
 
 shared_nm_libnm_core_intern_dep = declare_dependency(
+    dependencies: libnm_systemd_shared_dep,
     link_with: shared_nm_libnm_core_intern,
-    include_directories: [
-        top_inc,
-        shared_inc,
-    ],
-    dependencies: [
-        glib_dep,
-        shared_nm_glib_aux_dep,
-        libnm_systemd_shared_dep,
-    ],
 )
 
 ###############################################################################
 
 deps = [
   dl_dep,
+  libnm_utils_base_dep,
   libudev_dep,
   uuid_dep,
-  glib_dep,
-  shared_c_siphash_dep,
-  shared_nm_glib_aux_dep,
-  shared_nm_udev_aux_dep,
   shared_nm_libnm_core_intern_dep,
 ]
 
@@ -233,8 +216,8 @@ endif
 
 libnm_core_sources_all =  libnm_core_sources
 libnm_core_sources_all += libnm_core_enum
-libnm_core_sources_all += shared_nm_meta_setting_c
+libnm_core_sources_all += nm_meta_setting_source
-libnm_core_sources_all += [version_header]
+libnm_core_sources_all += [nm_version_macro_header]
 
 libnm_core = static_library(
   'nm-core',
@@ -248,10 +231,8 @@ libnm_core_dep = declare_dependency(
   sources: libnm_core_enum[1],
   include_directories: libnm_core_inc,
   dependencies: [
-    shared_nm_libnm_core_intern_dep,
-    shared_nm_glib_aux_dep,
-    shared_c_siphash_dep,
     libnm_systemd_shared_dep,
+    shared_nm_libnm_core_intern_dep,
   ],
 )
 
@@ -264,29 +245,17 @@ shared_nm_libnm_core_aux = static_library(
         '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
         '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
     ],
-    include_directories: [
+    include_directories: libnm_core_inc,
-        top_inc,
-        shared_inc,
-        libnm_core_inc,
-    ],
     dependencies: [
-        glib_dep,
-        shared_c_siphash_dep,
-        shared_nm_glib_aux_dep,
         libnm_core_dep,
+        libnm_utils_base_dep,
     ],
 )
 
 shared_nm_libnm_core_aux_dep = declare_dependency(
     link_with: shared_nm_libnm_core_aux,
-    include_directories: [
-        top_inc,
-        shared_inc,
-    ],
     dependencies: [
         libnm_core_dep,
-        glib_dep,
-        shared_nm_glib_aux_dep,
         libnm_systemd_shared_dep,
     ],
 )

libnm-core/tests/meson.build

@@ -33,15 +33,15 @@ foreach test_unit: test_units
   exe = executable(
     'libnm-core-' + test_unit,
     [test_unit + '.c'] + enum,
-    dependencies: [
+    dependencies: libnm_core_dep,
-      libnm_core_dep,
-      libnm_systemd_shared_no_logging_dep,
-    ],
     c_args: [
         '-DNETWORKMANAGER_COMPILATION_TEST',
         '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
       ],
-    link_with: libnm_core,
+    link_with: [
+      libnm_core,
+      libnm_systemd_logging_stub,
+    ],
   )
   test(
     'libnm-core/' + test_unit,

libnm/meson.build

@@ -55,11 +55,11 @@ libnm_headers = files(
 )
 
 install_headers(
-  libnm_core_headers + libnm_headers + [version_header],
+  libnm_core_headers + libnm_headers + [nm_version_macro_header],
   subdir: libnm_name,
 )
 
-enum_headers = libnm_headers + [version_header]
+enum_headers = libnm_headers + [nm_version_macro_header]
 enum_types = 'nm-enum-types'
 
 libnm_enum = gnome.mkenums(
@@ -137,12 +137,13 @@ liblibnm = static_library(
     libnmdbus_dep,
     dl_dep,
     libudev_dep,
-    shared_nm_glib_aux_dep,
     libnm_core_dep,
+    libnm_utils_base_dep,
+    libnm_udev_aux_dep,
     uuid_dep,
-    libnm_systemd_shared_no_logging_dep,
   ],
   c_args: cflags,
+  link_with: libnm_systemd_logging_stub,
 )
 
 liblibnm_dep = declare_dependency(
@@ -153,13 +154,13 @@ liblibnm_dep = declare_dependency(
   ],
   dependencies: [
     libnm_core_dep,
-    libnm_systemd_shared_no_logging_dep,
     libnmdbus_dep,
-    shared_nm_glib_aux_dep,
+    libnm_utils_base_dep,
     libudev_dep,
     dl_dep,
     uuid_dep,
   ],
+  link_with: libnm_systemd_logging_stub,
 )
 
 libnm = shared_library(
@@ -170,7 +171,7 @@ libnm = shared_library(
     libnm_core,
     libnm_systemd_logging_stub,
     libnmdbus,
-    shared_nm_glib_aux,
+    libnm_utils_base,
   ],
   dependencies: liblibnm_dep,
   link_args: [
@@ -210,7 +211,7 @@ test(
 )
 
 if enable_introspection
-  gir_sources = libnm_core_enum + libnm_core_headers + libnm_core_sources + libnm_enum + libnm_headers + libnm_sources + [version_header]
+  gir_sources = libnm_core_enum + libnm_core_headers + libnm_core_sources + libnm_enum + libnm_headers + libnm_sources + [nm_version_macro_header]
 
   libnm_gir = gnome.generate_gir(
     libnm,

libnm/tests/meson.build

@@ -15,16 +15,14 @@ foreach test_unit: test_units
     test_unit[0],
     [
       test_unit[0] + '.c',
-      shared_nm_test_utils_impl_c,
+      nm_test_utils_impl_source,
-    ],
-    dependencies: [
-      liblibnm_dep,
-      libnm_systemd_shared_no_logging_dep,
     ],
+    dependencies: liblibnm_dep,
     c_args: cflags,
     link_with: [
       liblibnm,
       libnm_core,
+      libnm_systemd_logging_stub,
     ],
   )
 
@@ -39,7 +37,7 @@ endforeach
 # just test, that we can build "nm-vpn-plugin-utils.c"
 libnm_vpn_plugin_utils_test = static_library(
   'nm-vpn-plugin-utils-test',
-  sources: shared_nm_utils_nm_vpn_plugin_utils_c + [libnm_enum[1]],
+  sources: nm_vpn_plugin_utils_source + [libnm_enum[1]],
   include_directories: libnm_inc,
   dependencies: libnm_core_dep,
   c_args: cflags,

shared/meson.build

@@ -1,334 +1,259 @@
 shared_inc = include_directories('.')
 
-###############################################################################
+libc_siphash = static_library(
-
+  'c-siphash',
-shared_c_stdaux = static_library(
+  sources: 'c-siphash/src/c-siphash.c',
-    'c-stdaux',
+  include_directories: include_directories('c-stdaux/src'),
-    c_args: '-std=c11',
-    sources: files('c-stdaux/src/c-stdaux.h'),
 )
 
-shared_c_stdaux_dep = declare_dependency(
+libc_rbtree = static_library(
-    include_directories: shared_inc,
+  'c-rbtree',
+  sources: 'c-rbtree/src/c-rbtree.c',
+  include_directories: include_directories('c-stdaux/src'),
+  c_args: '-std=c11',
 )
 
-###############################################################################
+sources = files(
-
+  'n-acd/src/n-acd.c',
-shared_c_siphash = static_library(
+  'n-acd/src/n-acd-probe.c',
-    'c-siphash',
+  'n-acd/src/util/timer.c',
-    include_directories: [
-        include_directories('c-stdaux/src'),
-    ],
-    sources: 'c-siphash/src/c-siphash.c',
 )
 
-shared_c_siphash_dep = declare_dependency(
-    include_directories: shared_inc,
-    link_with: shared_c_siphash,
-)
-
-###############################################################################
-
-shared_c_rbtree = static_library(
-    'c-rbtree',
-    c_args: '-std=c11',
-    include_directories: [
-        include_directories('c-stdaux/src'),
-    ],
-    sources: files('c-rbtree/src/c-rbtree.c',
-                   'c-rbtree/src/c-rbtree.h',
-                   'c-rbtree/src/c-rbtree-private.h'),
-)
-
-shared_c_rbtree_dep = declare_dependency(
-    include_directories: shared_inc,
-    link_with: shared_c_rbtree,
-)
-
-###############################################################################
-
 if enable_ebpf
-    shared_n_acd_bpf_files = files('n-acd/src/n-acd-bpf.c')
+  sources += files('n-acd/src/n-acd-bpf.c')
 else
-    shared_n_acd_bpf_files = files('n-acd/src/n-acd-bpf-fallback.c')
+  sources += files('n-acd/src/n-acd-bpf-fallback.c')
 endif
 
-shared_n_acd = static_library(
+incs = include_directories(
-    'n-acd',
+  'c-list/src',
-    sources: files('n-acd/src/n-acd.c',
+  'c-rbtree/src',
-                   'n-acd/src/n-acd.h',
+  'c-siphash/src',
-                   'n-acd/src/n-acd-private.h',
+  'c-stdaux/src',
-                   'n-acd/src/n-acd-probe.c',
-                   'n-acd/src/util/timer.c',
-                   'n-acd/src/util/timer.h')
-             + shared_n_acd_bpf_files,
-    c_args: [
-        '-D_GNU_SOURCE',
-        '-DSO_ATTACH_BPF=50',
-        '-std=c11',
-        '-Wno-pointer-arith',
-        '-Wno-vla',
-    ],
-    include_directories: [
-        include_directories('c-stdaux/src'),
-        include_directories('c-siphash/src'),
-        include_directories('c-list/src'),
-        include_directories('c-rbtree/src'),
-    ],
-    dependencies: [
-        shared_c_siphash_dep,
-        shared_c_rbtree_dep,
-    ],
 )
 
-shared_n_acd_dep = declare_dependency(
+c_flags = [
-    include_directories: shared_inc,
+  '-D_GNU_SOURCE',
-    link_with: shared_n_acd,
+  '-DSO_ATTACH_BPF=50',
-)
+  '-std=c11',
-
+  '-Wno-pointer-arith',
-###############################################################################
+  '-Wno-vla',
-
-shared_n_dhcp4 = static_library(
-    'n-dhcp4',
-    sources: files('n-dhcp4/src/n-dhcp4-c-connection.c',
-                   'n-dhcp4/src/n-dhcp4-c-lease.c',
-                   'n-dhcp4/src/n-dhcp4-c-probe.c',
-                   'n-dhcp4/src/n-dhcp4-client.c',
-                   'n-dhcp4/src/n-dhcp4-incoming.c',
-                   'n-dhcp4/src/n-dhcp4-outgoing.c',
-                   'n-dhcp4/src/n-dhcp4-private.h',
-                   'n-dhcp4/src/n-dhcp4-socket.c',
-                   'n-dhcp4/src/n-dhcp4.h',
-                   'n-dhcp4/src/util/packet.c',
-                   'n-dhcp4/src/util/packet.h',
-                   'n-dhcp4/src/util/socket.c',
-                   'n-dhcp4/src/util/socket.h'),
-    c_args: [
-        '-D_GNU_SOURCE',
-        '-Wno-declaration-after-statement',
-        '-Wno-pointer-arith',
-    ],
-    include_directories: [
-        include_directories('c-list/src'),
-        include_directories('c-siphash/src'),
-        include_directories('c-stdaux/src'),
-    ],
-    dependencies: [
-        shared_c_siphash_dep,
-    ],
-)
-
-shared_n_dhcp4_dep = declare_dependency(
-    include_directories: shared_inc,
-    link_with: shared_n_dhcp4,
-)
-
-###############################################################################
-
-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_header = configure_file(
-    input: 'nm-version-macros.h.in',
-    output: '@BASENAME@',
-    configuration: version_conf,
-)
-
-shared_nm_meta_setting_c = files('nm-meta-setting.c')
-
-shared_nm_test_utils_impl_c = files('nm-test-utils-impl.c')
-
-shared_nm_utils_nm_vpn_plugin_utils_c = files('nm-utils/nm-vpn-plugin-utils.c')
-
-###############################################################################
-
-shared_nm_std_aux = static_library(
-    'nm-std-aux',
-    sources: files('nm-std-aux/c-list-util.c'),
-    c_args: [
-      '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
-      '-DNETWORKMANAGER_COMPILATION=0',
-    ],
-    include_directories: [
-        top_inc,
-        shared_inc,
-    ],
-    dependencies: [
-    ],
-)
-
-shared_nm_std_aux_dep = declare_dependency(
-    link_with: shared_nm_std_aux,
-    include_directories: [
-        top_inc,
-        shared_inc,
-    ],
-)
-
-###############################################################################
-
-shared_nm_glib_aux_c_args = [
-    '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
-    '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
 ]
 
-shared_nm_glib_aux = static_library(
+links = [
-    'nm-utils-base',
+  libc_rbtree,
-    sources: files('nm-glib-aux/nm-dbus-aux.c',
+  libc_siphash,
-                   'nm-glib-aux/nm-dedup-multi.c',
+]
-                   'nm-glib-aux/nm-enum-utils.c',
+
-                   'nm-glib-aux/nm-errno.c',
+libn_acd = static_library(
-                   'nm-glib-aux/nm-hash-utils.c',
+  'n-acd',
-                   'nm-glib-aux/nm-io-utils.c',
+  sources: sources,
-                   'nm-glib-aux/nm-json-aux.c',
+  include_directories: incs,
-                   'nm-glib-aux/nm-keyfile-aux.c',
+  c_args: c_flags,
-                   'nm-glib-aux/nm-random-utils.c',
+  link_with: links,
-                   'nm-glib-aux/nm-ref-string.c',
-                   'nm-glib-aux/nm-secret-utils.c',
-                   'nm-glib-aux/nm-shared-utils.c',
-                   'nm-glib-aux/nm-time-utils.c'),
-    c_args: shared_nm_glib_aux_c_args,
-    include_directories: [
-        top_inc,
-        shared_inc,
-    ],
-    dependencies: [
-        glib_dep,
-        shared_nm_std_aux_dep,
-    ],
 )
 
-shared_nm_glib_aux_dep = declare_dependency(
+libn_acd_dep = declare_dependency(
-    link_with: shared_nm_glib_aux,
+  include_directories: shared_inc,
-    include_directories: [
+  link_with: libn_acd,
-        top_inc,
-        shared_inc,
-    ],
-    dependencies: glib_dep,
 )
 
-###############################################################################
+sources = files(
-
+  'n-dhcp4/src/n-dhcp4-c-connection.c',
-shared_nm_udev_aux = static_library(
+  'n-dhcp4/src/n-dhcp4-c-lease.c',
-    'nm-udev-aux',
+  'n-dhcp4/src/n-dhcp4-client.c',
-    sources: files('nm-udev-aux/nm-udev-utils.c'),
+  'n-dhcp4/src/n-dhcp4-c-probe.c',
-    c_args: shared_nm_glib_aux_c_args,
+  'n-dhcp4/src/n-dhcp4-incoming.c',
-    include_directories: [
+  'n-dhcp4/src/n-dhcp4-outgoing.c',
-        top_inc,
+  'n-dhcp4/src/n-dhcp4-socket.c',
-        shared_inc,
+  'n-dhcp4/src/util/packet.c',
-    ],
+  'n-dhcp4/src/util/socket.c',
-    dependencies: [
-        glib_dep,
-        shared_nm_glib_aux_dep,
-        libudev_dep,
-    ],
 )
 
-shared_nm_udev_aux_dep = declare_dependency(
+incs = include_directories(
-    link_with: shared_nm_udev_aux,
+  'c-list/src',
-    include_directories: [
+  'c-siphash/src',
-        top_inc,
+  'c-stdaux/src',
-        shared_inc,
-    ],
-    dependencies: [
-        glib_dep,
-        shared_nm_glib_aux_dep,
-        libudev_dep,
-    ],
 )
 
-###############################################################################
+c_flags = [
+  '-D_GNU_SOURCE',
+  '-Wno-declaration-after-statement',
+  '-Wno-pointer-arith',
+]
+
+libn_dhcp4 = static_library(
+  'n-dhcp4',
+  sources: sources,
+  c_args: c_flags,
+  include_directories: incs,
+  link_with: libc_siphash,
+)
+
+libn_dhcp4_dep = declare_dependency(
+  include_directories: shared_inc,
+  link_with: libn_dhcp4,
+)
+
+nm_version_macro_conf = configuration_data()
+nm_version_macro_conf.set('NM_MAJOR_VERSION', nm_major_version)
+nm_version_macro_conf.set('NM_MINOR_VERSION', nm_minor_version)
+nm_version_macro_conf.set('NM_MICRO_VERSION', nm_micro_version)
+
+nm_version_macro_header = configure_file(
+  input: 'nm-version-macros.h.in',
+  output: '@BASENAME@',
+  configuration: nm_version_macro_conf,
+)
+
+nm_meta_setting_source = files('nm-meta-setting.c')
+
+nm_test_utils_impl_source = files('nm-test-utils-impl.c')
+
+nm_vpn_plugin_utils_source = files('nm-utils/nm-vpn-plugin-utils.c')
+
+c_flags = [
+  '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
+  '-DNETWORKMANAGER_COMPILATION=0',
+]
+
+libnm_std_aux = static_library(
+  'nm-std-aux',
+  sources: 'nm-std-aux/c-list-util.c',
+  c_args: c_flags,
+)
+
+sources = files(
+  'nm-glib-aux/nm-dbus-aux.c',
+  'nm-glib-aux/nm-dedup-multi.c',
+  'nm-glib-aux/nm-enum-utils.c',
+  'nm-glib-aux/nm-errno.c',
+  'nm-glib-aux/nm-hash-utils.c',
+  'nm-glib-aux/nm-io-utils.c',
+  'nm-glib-aux/nm-json-aux.c',
+  'nm-glib-aux/nm-keyfile-aux.c',
+  'nm-glib-aux/nm-random-utils.c',
+  'nm-glib-aux/nm-ref-string.c',
+  'nm-glib-aux/nm-secret-utils.c',
+  'nm-glib-aux/nm-shared-utils.c',
+  'nm-glib-aux/nm-time-utils.c'
+)
+
+c_flags = [
+  '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
+  '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)',
+]
+
+links = [
+  libc_siphash,
+  libnm_std_aux,
+]
+
+libnm_utils_base = static_library(
+  'nm-utils-base',
+  sources: sources,
+  include_directories: top_inc,
+  dependencies: glib_dep,
+  c_args: c_flags,
+  link_with: links,
+)
+
+incs = [
+  top_inc,
+  shared_inc,
+]
+
+libnm_utils_base_dep = declare_dependency(
+  include_directories: incs,
+  dependencies: glib_dep,
+  link_with: libnm_utils_base,
+)
+
+deps = [
+  libudev_dep,
+  libnm_utils_base_dep,
+]
+
+libnm_udev_aux = static_library(
+  'nm-udev-aux',
+  sources: 'nm-udev-aux/nm-udev-utils.c',
+  c_args: c_flags,
+  dependencies: deps,
+)
+
+libnm_udev_aux_dep = declare_dependency(
+  include_directories: shared_inc,
+  link_with: libnm_udev_aux,
+)
+
+sources = files(
+  'systemd/src/basic/alloc-util.c',
+  'systemd/src/basic/escape.c',
+  'systemd/src/basic/env-file.c',
+  'systemd/src/basic/env-util.c',
+  'systemd/src/basic/ether-addr-util.c',
+  'systemd/src/basic/extract-word.c',
+  'systemd/src/basic/fd-util.c',
+  'systemd/src/basic/fileio.c',
+  'systemd/src/basic/format-util.c',
+  'systemd/src/basic/fs-util.c',
+  'systemd/src/basic/hash-funcs.c',
+  'systemd/src/basic/hashmap.c',
+  'systemd/src/basic/hexdecoct.c',
+  'systemd/src/basic/hostname-util.c',
+  'systemd/src/basic/in-addr-util.c',
+  'systemd/src/basic/io-util.c',
+  'systemd/src/basic/memory-util.c',
+  'systemd/src/basic/mempool.c',
+  'systemd/src/basic/parse-util.c',
+  'systemd/src/basic/path-util.c',
+  'systemd/src/basic/prioq.c',
+  'systemd/src/basic/process-util.c',
+  'systemd/src/basic/random-util.c',
+  'systemd/src/basic/socket-util.c',
+  'systemd/src/basic/stat-util.c',
+  'systemd/src/basic/string-table.c',
+  'systemd/src/basic/string-util.c',
+  'systemd/src/basic/strv.c',
+  'systemd/src/basic/strxcpyx.c',
+  'systemd/src/basic/time-util.c',
+  'systemd/src/basic/tmpfile-util.c',
+  'systemd/src/basic/utf8.c',
+  'systemd/src/basic/util.c',
+  'systemd/src/shared/dns-domain.c',
+  'systemd/nm-sd-utils-shared.c',
+)
+
+incs = include_directories(
+  'systemd/sd-adapt-shared',
+  'systemd/src/basic',
+  'systemd/src/shared',
+)
+
+c_flags = [
+  '-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
+  '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED',
+]
 
 libnm_systemd_shared = static_library(
   'nm-systemd-shared',
-  sources: files(
+  sources: sources,
-    'systemd/src/basic/alloc-util.c',
+  include_directories: incs,
-    'systemd/src/basic/escape.c',
+  dependencies: libnm_utils_base_dep,
-    'systemd/src/basic/env-file.c',
+  c_args: c_flags,
-    'systemd/src/basic/env-util.c',
-    'systemd/src/basic/ether-addr-util.c',
-    'systemd/src/basic/extract-word.c',
-    'systemd/src/basic/fd-util.c',
-    'systemd/src/basic/fileio.c',
-    'systemd/src/basic/format-util.c',
-    'systemd/src/basic/fs-util.c',
-    'systemd/src/basic/hash-funcs.c',
-    'systemd/src/basic/hashmap.c',
-    'systemd/src/basic/hexdecoct.c',
-    'systemd/src/basic/hostname-util.c',
-    'systemd/src/basic/in-addr-util.c',
-    'systemd/src/basic/io-util.c',
-    'systemd/src/basic/memory-util.c',
-    'systemd/src/basic/mempool.c',
-    'systemd/src/basic/parse-util.c',
-    'systemd/src/basic/path-util.c',
-    'systemd/src/basic/prioq.c',
-    'systemd/src/basic/process-util.c',
-    'systemd/src/basic/random-util.c',
-    'systemd/src/basic/socket-util.c',
-    'systemd/src/basic/stat-util.c',
-    'systemd/src/basic/string-table.c',
-    'systemd/src/basic/string-util.c',
-    'systemd/src/basic/strv.c',
-    'systemd/src/basic/strxcpyx.c',
-    'systemd/src/basic/time-util.c',
-    'systemd/src/basic/tmpfile-util.c',
-    'systemd/src/basic/utf8.c',
-    'systemd/src/basic/util.c',
-    'systemd/src/shared/dns-domain.c',
-    'systemd/nm-sd-utils-shared.c',
-  ),
-  include_directories: include_directories(
-    'systemd/sd-adapt-shared',
-    'systemd/src/basic',
-    'systemd/src/shared',
-  ),
-  dependencies: shared_nm_glib_aux_dep,
-  c_args: [
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED',
-    '-DG_LOG_DOMAIN="libnm"',
-  ],
 )
 
 libnm_systemd_shared_dep = declare_dependency(
-  include_directories: include_directories(
+  include_directories: incs,
-    'systemd/sd-adapt-shared',
+  dependencies: libnm_utils_base_dep,
-    'systemd/src/basic',
+  link_with: libnm_systemd_shared,
-    'systemd/src/shared',
-  ),
-  dependencies: [
-    shared_nm_glib_aux_dep,
-  ],
-  link_with: [
-    libnm_systemd_shared,
-  ],
 )
 
 libnm_systemd_logging_stub = static_library(
   'nm-systemd-logging-stub',
-  sources: files(
+  sources: 'systemd/nm-logging-stub.c',
-    'systemd/nm-logging-stub.c',
+  dependencies: libnm_utils_base_dep,
-  ),
+  c_args: c_flags,
-  include_directories: include_directories(
-    'systemd/sd-adapt-shared',
-    'systemd/src/basic',
-  ),
-  dependencies: shared_nm_glib_aux_dep,
-  c_args: [
-    '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD_SHARED',
-    '-DG_LOG_DOMAIN="libnm"',
-  ],
-)
-
-libnm_systemd_shared_no_logging_dep = declare_dependency(
-  dependencies: [
-    libnm_systemd_shared_dep,
-  ],
-  link_with: [
-    libnm_systemd_logging_stub,
-  ],
 )
 
 if enable_tests

shared/nm-utils/tests/meson.build

@@ -7,11 +7,8 @@ exe = executable(
     '-DNETWORKMANAGER_COMPILATION_TEST',
     '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)',
   ],
-  dependencies: [
+  dependencies: libnm_utils_base_dep,
-    shared_nm_glib_aux_dep,
+  link_with: libnm_systemd_logging_stub,
-    libnm_systemd_shared_no_logging_dep,
-    shared_c_siphash_dep,
-  ],
 )
 
 test(

src/meson.build

@@ -52,7 +52,8 @@ deps = [
   libsystemd_dep,
   libudev_dep,
   libnm_core_dep,
-  shared_n_dhcp4_dep,
+  libn_dhcp4_dep,
+  libnm_udev_aux_dep,
 ]
 
 if enable_wext
@@ -155,7 +156,7 @@ nm_deps = [
   libndp_dep,
   libudev_dep,
   libnm_core_dep,
-  shared_n_acd_dep,
+  libn_acd_dep,
   logind_dep,
 ]