build/meson: cleanup "src/meson.build"

src/devices/bluetooth/meson.build

@@ -54,7 +54,7 @@ if enable_tests
   executable(
     test_unit,
     'tests/' + test_unit + '.c',
-    dependencies: [ libnetwork_manager_test_dep, deps ],
+    dependencies: [ libNetworkManagerTest_dep, deps ],
     c_args: test_c_flags,
   )
 endif

src/devices/tests/meson.build

@@ -9,7 +9,7 @@ foreach test_unit: test_units
   exe = executable(
     test_unit,
     test_unit + '.c',
-    dependencies: libnetwork_manager_test_dep,
+    dependencies: libNetworkManagerTest_dep,
     c_args: test_c_flags,
   )
 

src/devices/wifi/meson.build

@@ -54,7 +54,7 @@ if enable_tests
   exe = executable(
     test_unit,
     'tests/' + test_unit + '.c',
-    dependencies: [ libnetwork_manager_test_dep, libnm_wifi_base_dep ],
+    dependencies: [ libNetworkManagerTest_dep, libnm_wifi_base_dep ],
     c_args: test_c_flags,
   )
 

src/devices/wwan/meson.build

@@ -79,7 +79,7 @@ if enable_tests
     test_unit,
     ['tests/' + test_unit + '.c'] + nm_service_providers_source,
     include_directories: wwan_inc,
-    dependencies: libnetwork_manager_test_dep,
+    dependencies: libNetworkManagerTest_dep,
     c_args: test_c_flags,
   )
 

src/dhcp/tests/meson.build

@@ -9,7 +9,7 @@ foreach test_unit: test_units
   exe = executable(
     test_unit,
     test_unit + '.c',
-    dependencies: libnetwork_manager_test_dep,
+    dependencies: libNetworkManagerTest_dep,
     c_args: test_c_flags,
   )
 

src/dnsmasq/tests/meson.build

@@ -5,7 +5,7 @@ test_unit = 'test-dnsmasq-utils'
 exe = executable(
   test_unit,
   test_unit + '.c',
-  dependencies: libnetwork_manager_test_dep,
+  dependencies: libNetworkManagerTest_dep,
   c_args: test_c_flags,
 )
 

src/initrd/meson.build

@@ -1,31 +1,25 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-sources = files(
-  'nmi-cmdline-reader.c',
-  'nmi-dt-reader.c',
-  'nmi-ibft-reader.c',
-)
-
 libnmi_core = static_library(
   'nmi-core',
-  sources: sources,
+  sources: files(
+    'nmi-cmdline-reader.c',
+    'nmi-dt-reader.c',
+    'nmi-ibft-reader.c',
+  ),
   dependencies: daemon_nm_default_dep,
   c_args: daemon_c_flags,
 )
 
-name = 'nm-initrd-generator'
-
-links = [
-  libnetwork_manager_base,
-  libnmi_core,
-]
-
 executable(
-  name,
+  'nm-initrd-generator',
-  name + '.c',
+  'nm-initrd-generator.c',
   dependencies: daemon_nm_default_dep,
   c_args: daemon_c_flags,
-  link_with: links,
+  link_with: [
+    libNetworkManagerBase,
+    libnmi_core,
+  ],
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
   install: true,

src/initrd/tests/meson.build

@@ -12,7 +12,7 @@ foreach test_unit : test_units
   exe = executable(
     test_unit,
     test_unit + '.c',
-    dependencies: libnetwork_manager_test_dep,
+    dependencies: libNetworkManagerTest_dep,
     c_args: c_flags,
     link_with: libnmi_core,
   )

src/meson.build

@@ -23,7 +23,14 @@ core_plugins = []
 
 daemon_c_flags = ['-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON']
 
-sources = files(
+platform_wifi_wext_source = files()
+if enable_wext
+  platform_wifi_wext_source += files('platform/wifi/nm-wifi-utils-wext.c')
+endif
+
+libNetworkManagerBase = static_library(
+  'NetworkManagerBase',
+  sources: files(
     'dhcp/nm-dhcp-client.c',
     'dhcp/nm-dhcp-manager.c',
     'dhcp/nm-dhcp-nettools.c',
@@ -51,9 +58,8 @@ sources = files(
     'nm-ip-config.c',
     'nm-ip4-config.c',
     'nm-ip6-config.c',
-)
+  ) + platform_wifi_wext_source,
-
+  dependencies: [
-deps = [
     daemon_nm_default_dep,
     libn_dhcp4_dep,
     libnm_keyfile_dep,
@@ -62,20 +68,38 @@ deps = [
     libnm_udev_aux_dep,
     libsystemd_dep,
     libudev_dep,
-]
+  ],
-
-if enable_wext
-  sources += files('platform/wifi/nm-wifi-utils-wext.c')
-endif
-
-libnetwork_manager_base = static_library(
-  nm_name + 'Base',
-  sources: sources,
-  dependencies: deps,
   c_args: daemon_c_flags,
 )
 
-sources = files(
+nm_deps = [
+  daemon_nm_default_dep,
+  dl_dep,
+  libn_acd_dep,
+  libndp_dep,
+  libudev_dep,
+  logind_dep,
+]
+
+if enable_concheck
+  nm_deps += libcurl_dep
+endif
+
+if enable_libaudit
+  nm_deps += libaudit_dep
+endif
+
+if enable_libpsl
+  nm_deps += libpsl_dep
+endif
+
+if enable_selinux
+  nm_deps += selinux_dep
+endif
+
+libNetworkManager = static_library(
+  'NetworkManager',
+  sources: files(
     'devices/nm-acd-manager.c',
     'devices/nm-device-6lowpan.c',
     'devices/nm-device-bond.c',
@@ -154,45 +178,14 @@ sources = files(
     'nm-rfkill-manager.c',
     'nm-session-monitor.c',
     'nm-sleep-monitor.c',
-)
+  ),
-
-nm_deps = [
-  daemon_nm_default_dep,
-  dl_dep,
-  libn_acd_dep,
-  libndp_dep,
-  libudev_dep,
-  logind_dep,
-]
-
-nm_links = [
-  libnetwork_manager_base,
-  libnm_systemd_core,
-  libnm_systemd_shared,
-]
-
-if enable_concheck
-  nm_deps += libcurl_dep
-endif
-
-if enable_libaudit
-  nm_deps += libaudit_dep
-endif
-
-if enable_libpsl
-  nm_deps += libpsl_dep
-endif
-
-if enable_selinux
-  nm_deps += selinux_dep
-endif
-
-libnetwork_manager = static_library(
-  nm_name,
-  sources: sources,
   dependencies: nm_deps,
   c_args: daemon_c_flags,
-  link_with: nm_links,
+  link_with: [
+    libNetworkManagerBase,
+    libnm_systemd_core,
+    libnm_systemd_shared,
+  ],
 )
 
 executable(
@@ -206,7 +199,11 @@ executable(
     libn_acd_dep,
   ],
   c_args: daemon_c_flags,
-  link_with: nm_links,
+  link_with: [
+    libNetworkManagerBase,
+    libnm_systemd_core,
+    libnm_systemd_shared,
+  ],
   link_args: ldflags_linker_script_binary,
   link_depends: linker_script_binary,
   install: true,
@@ -219,23 +216,21 @@ if enable_tests
     test_c_flags += ['-DREQUIRE_ROOT_TESTS=1']
   endif
 
-  sources = files(
+  libNetworkManagerTest = static_library(
+    'NetworkManagerTest',
+    sources: files(
       'ndisc/nm-fake-ndisc.c',
       'platform/tests/test-common.c',
       'platform/nm-fake-platform.c',
-  )
+    ),
-
-  libnetwork_manager_test = static_library(
-    nm_name + 'Test',
-    sources: sources,
     dependencies: daemon_nm_default_dep,
     c_args: test_c_flags,
-    link_with: libnetwork_manager,
+    link_with: libNetworkManager,
   )
 
-  libnetwork_manager_test_dep = declare_dependency(
+  libNetworkManagerTest_dep = declare_dependency(
     dependencies: daemon_nm_default_dep,
-    link_with: libnetwork_manager_test,
+    link_with: libNetworkManagerTest,
   )
 
   subdir('dnsmasq/tests')
@@ -257,43 +252,48 @@ subdir('settings/plugins')
 
 # NetworkManager binary
 
-create_exports_networkmanager = join_paths(source_root, 'tools', 'create-exports-NetworkManager.sh')
-symbol_map_name = 'NetworkManager.ver'
-
 # libNetworkManager.a, as built by meson doesn't contain all symbols
 # from libNetworkManagerBase.a and other static libraries, unless we
 # add dependencies with link_whole, only supported in meson >= 0.46.
 # Create an executable with full symbols that we use in place of the
 # library to enumerate the symbols.
-network_manager_all_sym = executable(
+NetworkManager_all_sym = executable(
   'NetworkManager-all-sym',
   'main.c',
   dependencies: nm_deps,
   c_args: daemon_c_flags,
   link_args: '-Wl,--no-gc-sections',
-  link_whole: [libnetwork_manager, libnetwork_manager_base, libnm_core],
+  link_whole: [
+    libNetworkManager,
+    libNetworkManagerBase,
+    libnm_core,
+  ],
 )
 
-# this uses symbols from nm-full-symbols instead of libNetworkManager.a
 ver_script = custom_target(
-  symbol_map_name,
+  'NetworkManager.ver',
-  output: symbol_map_name,
+  output: 'NetworkManager.ver',
-  depends: [network_manager_all_sym, core_plugins],
+  depends: [
-  command: [create_exports_networkmanager, '--called-from-build', source_root],
+    NetworkManager_all_sym,
+    core_plugins,
+  ],
+  command: [
+    join_paths(source_root, 'tools', 'create-exports-NetworkManager.sh'),
+    '--called-from-build',
+    source_root,
+  ],
 )
 
-ldflags = [
+NetworkManager = executable(
-  '-rdynamic',
+  'NetworkManager',
-  '-Wl,--version-script,@0@'.format(ver_script.full_path()),
-]
-
-network_manager = executable(
-  nm_name,
   'main.c',
   dependencies: nm_deps,
   c_args: daemon_c_flags,
-  link_with: libnetwork_manager,
+  link_with: libNetworkManager,
-  link_args: ldflags,
+  link_args: [
+    '-rdynamic',
+    '-Wl,--version-script,@0@'.format(ver_script.full_path()),
+  ],
   link_depends: ver_script,
   install: true,
   install_dir: nm_sbindir,
@@ -305,7 +305,7 @@ if enable_tests
 
     test(
       'sym/' + plugin_path.split('/')[-1],
-      network_manager,
+      NetworkManager,
       args: '--version',
       env: ['LD_BIND_NOW=1', 'LD_PRELOAD=' + plugin_path],
     )

src/ndisc/tests/meson.build

@@ -5,7 +5,7 @@ test_unit = 'test-ndisc-fake'
 exe = executable(
   test_unit,
   test_unit + '.c',
-  dependencies: libnetwork_manager_test_dep,
+  dependencies: libNetworkManagerTest_dep,
   c_args: test_c_flags,
 )
 
@@ -21,6 +21,6 @@ test = 'test-ndisc-linux'
 exe = executable(
   test,
   test + '.c',
-  dependencies: libnetwork_manager_test_dep,
+  dependencies: libNetworkManagerTest_dep,
   c_args: test_c_flags,
 )

src/platform/tests/meson.build

@@ -22,7 +22,7 @@ foreach test_unit: test_units
   exe = executable(
     test_unit[0],
     test_unit[1],
-    dependencies: libnetwork_manager_test_dep,
+    dependencies: libNetworkManagerTest_dep,
     c_args: test_unit[2],
   )
   test(
@@ -38,6 +38,6 @@ name = 'monitor'
 executable(
   name,
   name + '.c',
-  dependencies: libnetwork_manager_test_dep,
+  dependencies: libNetworkManagerTest_dep,
   c_args: test_c_flags,
 )

src/settings/plugins/ifcfg-rh/tests/meson.build

@@ -5,7 +5,7 @@ test_unit = 'test-ifcfg-rh'
 exe = executable(
   test_unit,
   test_unit + '.c',
-  dependencies: libnetwork_manager_test_dep,
+  dependencies: libNetworkManagerTest_dep,
   c_args: test_c_flags,
   link_with: libnms_ifcfg_rh_core,
 )

src/settings/plugins/ifupdown/tests/meson.build

@@ -5,7 +5,7 @@ test_unit = 'test-ifupdown'
 exe = executable(
   test_unit,
   test_unit + '.c',
-  dependencies: libnetwork_manager_test_dep,
+  dependencies: libNetworkManagerTest_dep,
   c_args: test_c_flags,
   link_with: libnms_ifupdown_core,
 )

src/settings/plugins/keyfile/tests/meson.build

@@ -5,7 +5,7 @@ test_unit = 'test-keyfile-settings'
 exe = executable(
   test_unit,
   test_unit + '.c',
-  dependencies: libnetwork_manager_test_dep,
+  dependencies: libNetworkManagerTest_dep,
   c_args: test_c_flags,
 )
 

src/supplicant/tests/meson.build

@@ -5,7 +5,7 @@ test_unit = 'test-supplicant-config'
 exe = executable(
   test_unit,
   test_unit + '.c',
-  dependencies: libnetwork_manager_test_dep,
+  dependencies: libNetworkManagerTest_dep,
   c_args: test_c_flags,
 )
 

src/tests/config/meson.build

@@ -12,7 +12,7 @@ sources = files(
 exe = executable(
   test_unit,
   sources,
-  dependencies: libnetwork_manager_test_dep,
+  dependencies: libNetworkManagerTest_dep,
   c_args: test_c_flags,
 )
 

src/tests/meson.build

@@ -17,7 +17,7 @@ foreach test_unit: test_units
   exe = executable(
     test_unit,
     test_unit + '.c',
-    dependencies: libnetwork_manager_test_dep,
+    dependencies: libNetworkManagerTest_dep,
     c_args: test_c_flags,
   )