diff --git a/src/devices/bluetooth/meson.build b/src/devices/bluetooth/meson.build index a504d1493..f4c890218 100644 --- a/src/devices/bluetooth/meson.build +++ b/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 diff --git a/src/devices/tests/meson.build b/src/devices/tests/meson.build index 5b4be66b5..1bc883706 100644 --- a/src/devices/tests/meson.build +++ b/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, ) diff --git a/src/devices/wifi/meson.build b/src/devices/wifi/meson.build index ac08219b7..1c9add333 100644 --- a/src/devices/wifi/meson.build +++ b/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, ) diff --git a/src/devices/wwan/meson.build b/src/devices/wwan/meson.build index debfe8d30..577dceadf 100644 --- a/src/devices/wwan/meson.build +++ b/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, ) diff --git a/src/dhcp/tests/meson.build b/src/dhcp/tests/meson.build index e4a09e0fc..e43c8cab3 100644 --- a/src/dhcp/tests/meson.build +++ b/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, ) diff --git a/src/dnsmasq/tests/meson.build b/src/dnsmasq/tests/meson.build index 390017699..565c18ad2 100644 --- a/src/dnsmasq/tests/meson.build +++ b/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, ) diff --git a/src/initrd/meson.build b/src/initrd/meson.build index 55c034d82..7629773a7 100644 --- a/src/initrd/meson.build +++ b/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, - name + '.c', + 'nm-initrd-generator', + '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, diff --git a/src/initrd/tests/meson.build b/src/initrd/tests/meson.build index 74955c134..51650d0f1 100644 --- a/src/initrd/tests/meson.build +++ b/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, ) diff --git a/src/meson.build b/src/meson.build index 8c0c141c2..dadfec195 100644 --- a/src/meson.build +++ b/src/meson.build @@ -23,139 +23,55 @@ core_plugins = [] daemon_c_flags = ['-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON'] -sources = files( - 'dhcp/nm-dhcp-client.c', - 'dhcp/nm-dhcp-manager.c', - 'dhcp/nm-dhcp-nettools.c', - 'dhcp/nm-dhcp-systemd.c', - 'dhcp/nm-dhcp-utils.c', - 'dhcp/nm-dhcp-options.c', - 'ndisc/nm-lndp-ndisc.c', - 'ndisc/nm-ndisc.c', - 'platform/wifi/nm-wifi-utils-nl80211.c', - 'platform/wifi/nm-wifi-utils.c', - 'platform/wpan/nm-wpan-utils.c', - 'platform/nm-linux-platform.c', - 'platform/nm-platform.c', - 'platform/nmp-object.c', - 'platform/nmp-rules-manager.c', - 'main-utils.c', - 'NetworkManagerUtils.c', - 'nm-core-utils.c', - 'nm-dbus-object.c', - 'nm-dbus-utils.c', - 'nm-netns.c', - 'nm-l3-config-data.c', - 'nm-l3-ipv4ll.c', - 'nm-l3cfg.c', - 'nm-ip-config.c', - 'nm-ip4-config.c', - 'nm-ip6-config.c', -) - -deps = [ - daemon_nm_default_dep, - libn_dhcp4_dep, - libnm_keyfile_dep, - libnm_core_dep, - libnm_systemd_shared_dep, - libnm_udev_aux_dep, - libsystemd_dep, - libudev_dep, -] - +platform_wifi_wext_source = files() if enable_wext - sources += files('platform/wifi/nm-wifi-utils-wext.c') + platform_wifi_wext_source += files('platform/wifi/nm-wifi-utils-wext.c') endif -libnetwork_manager_base = static_library( - nm_name + 'Base', - sources: sources, - dependencies: deps, +libNetworkManagerBase = static_library( + 'NetworkManagerBase', + sources: files( + 'dhcp/nm-dhcp-client.c', + 'dhcp/nm-dhcp-manager.c', + 'dhcp/nm-dhcp-nettools.c', + 'dhcp/nm-dhcp-systemd.c', + 'dhcp/nm-dhcp-utils.c', + 'dhcp/nm-dhcp-options.c', + 'ndisc/nm-lndp-ndisc.c', + 'ndisc/nm-ndisc.c', + 'platform/wifi/nm-wifi-utils-nl80211.c', + 'platform/wifi/nm-wifi-utils.c', + 'platform/wpan/nm-wpan-utils.c', + 'platform/nm-linux-platform.c', + 'platform/nm-platform.c', + 'platform/nmp-object.c', + 'platform/nmp-rules-manager.c', + 'main-utils.c', + 'NetworkManagerUtils.c', + 'nm-core-utils.c', + 'nm-dbus-object.c', + 'nm-dbus-utils.c', + 'nm-netns.c', + 'nm-l3-config-data.c', + 'nm-l3-ipv4ll.c', + 'nm-l3cfg.c', + 'nm-ip-config.c', + 'nm-ip4-config.c', + 'nm-ip6-config.c', + ) + platform_wifi_wext_source, + dependencies: [ + daemon_nm_default_dep, + libn_dhcp4_dep, + libnm_keyfile_dep, + libnm_core_dep, + libnm_systemd_shared_dep, + libnm_udev_aux_dep, + libsystemd_dep, + libudev_dep, + ], c_args: daemon_c_flags, ) -sources = files( - 'devices/nm-acd-manager.c', - 'devices/nm-device-6lowpan.c', - 'devices/nm-device-bond.c', - 'devices/nm-device-bridge.c', - 'devices/nm-device.c', - 'devices/nm-device-dummy.c', - 'devices/nm-device-ethernet.c', - 'devices/nm-device-ethernet-utils.c', - 'devices/nm-device-factory.c', - 'devices/nm-device-generic.c', - 'devices/nm-device-infiniband.c', - 'devices/nm-device-ip-tunnel.c', - 'devices/nm-device-macsec.c', - 'devices/nm-device-macvlan.c', - 'devices/nm-device-ppp.c', - 'devices/nm-device-tun.c', - 'devices/nm-device-veth.c', - 'devices/nm-device-vlan.c', - 'devices/nm-device-vrf.c', - 'devices/nm-device-vxlan.c', - 'devices/nm-device-wireguard.c', - 'devices/nm-device-wpan.c', - 'devices/nm-lldp-listener.c', - 'dhcp/nm-dhcp-dhclient.c', - 'dhcp/nm-dhcp-dhclient-utils.c', - 'dhcp/nm-dhcp-dhcpcanon.c', - 'dhcp/nm-dhcp-dhcpcd.c', - 'dhcp/nm-dhcp-listener.c', - 'dns/nm-dns-dnsmasq.c', - 'dns/nm-dns-manager.c', - 'dns/nm-dns-plugin.c', - 'dns/nm-dns-systemd-resolved.c', - 'dns/nm-dns-unbound.c', - 'dnsmasq/nm-dnsmasq-manager.c', - 'dnsmasq/nm-dnsmasq-utils.c', - 'ppp/nm-ppp-manager-call.c', - 'settings/plugins/keyfile/nms-keyfile-storage.c', - 'settings/plugins/keyfile/nms-keyfile-plugin.c', - 'settings/plugins/keyfile/nms-keyfile-reader.c', - 'settings/plugins/keyfile/nms-keyfile-utils.c', - 'settings/plugins/keyfile/nms-keyfile-writer.c', - 'settings/nm-agent-manager.c', - 'settings/nm-secret-agent.c', - 'settings/nm-settings.c', - 'settings/nm-settings-connection.c', - 'settings/nm-settings-plugin.c', - 'settings/nm-settings-storage.c', - 'settings/nm-settings-utils.c', - 'supplicant/nm-supplicant-config.c', - 'supplicant/nm-supplicant-interface.c', - 'supplicant/nm-supplicant-manager.c', - 'supplicant/nm-supplicant-settings-verify.c', - 'vpn/nm-vpn-connection.c', - 'vpn/nm-vpn-manager.c', - 'nm-active-connection.c', - 'nm-act-request.c', - 'nm-audit-manager.c', - 'nm-auth-manager.c', - 'nm-auth-utils.c', - 'nm-dbus-manager.c', - 'nm-checkpoint.c', - 'nm-checkpoint-manager.c', - 'nm-config.c', - 'nm-config-data.c', - 'nm-connectivity.c', - 'nm-dcb.c', - 'nm-dhcp-config.c', - 'nm-dispatcher.c', - 'nm-firewall-manager.c', - 'nm-hostname-manager.c', - 'nm-keep-alive.c', - 'nm-manager.c', - 'nm-pacrunner-manager.c', - 'nm-policy.c', - 'nm-proxy-config.c', - 'nm-rfkill-manager.c', - 'nm-session-monitor.c', - 'nm-sleep-monitor.c', -) - nm_deps = [ daemon_nm_default_dep, dl_dep, @@ -165,12 +81,6 @@ nm_deps = [ logind_dep, ] -nm_links = [ - libnetwork_manager_base, - libnm_systemd_core, - libnm_systemd_shared, -] - if enable_concheck nm_deps += libcurl_dep endif @@ -187,12 +97,95 @@ if enable_selinux nm_deps += selinux_dep endif -libnetwork_manager = static_library( - nm_name, - sources: sources, +libNetworkManager = static_library( + 'NetworkManager', + sources: files( + 'devices/nm-acd-manager.c', + 'devices/nm-device-6lowpan.c', + 'devices/nm-device-bond.c', + 'devices/nm-device-bridge.c', + 'devices/nm-device.c', + 'devices/nm-device-dummy.c', + 'devices/nm-device-ethernet.c', + 'devices/nm-device-ethernet-utils.c', + 'devices/nm-device-factory.c', + 'devices/nm-device-generic.c', + 'devices/nm-device-infiniband.c', + 'devices/nm-device-ip-tunnel.c', + 'devices/nm-device-macsec.c', + 'devices/nm-device-macvlan.c', + 'devices/nm-device-ppp.c', + 'devices/nm-device-tun.c', + 'devices/nm-device-veth.c', + 'devices/nm-device-vlan.c', + 'devices/nm-device-vrf.c', + 'devices/nm-device-vxlan.c', + 'devices/nm-device-wireguard.c', + 'devices/nm-device-wpan.c', + 'devices/nm-lldp-listener.c', + 'dhcp/nm-dhcp-dhclient.c', + 'dhcp/nm-dhcp-dhclient-utils.c', + 'dhcp/nm-dhcp-dhcpcanon.c', + 'dhcp/nm-dhcp-dhcpcd.c', + 'dhcp/nm-dhcp-listener.c', + 'dns/nm-dns-dnsmasq.c', + 'dns/nm-dns-manager.c', + 'dns/nm-dns-plugin.c', + 'dns/nm-dns-systemd-resolved.c', + 'dns/nm-dns-unbound.c', + 'dnsmasq/nm-dnsmasq-manager.c', + 'dnsmasq/nm-dnsmasq-utils.c', + 'ppp/nm-ppp-manager-call.c', + 'settings/plugins/keyfile/nms-keyfile-storage.c', + 'settings/plugins/keyfile/nms-keyfile-plugin.c', + 'settings/plugins/keyfile/nms-keyfile-reader.c', + 'settings/plugins/keyfile/nms-keyfile-utils.c', + 'settings/plugins/keyfile/nms-keyfile-writer.c', + 'settings/nm-agent-manager.c', + 'settings/nm-secret-agent.c', + 'settings/nm-settings.c', + 'settings/nm-settings-connection.c', + 'settings/nm-settings-plugin.c', + 'settings/nm-settings-storage.c', + 'settings/nm-settings-utils.c', + 'supplicant/nm-supplicant-config.c', + 'supplicant/nm-supplicant-interface.c', + 'supplicant/nm-supplicant-manager.c', + 'supplicant/nm-supplicant-settings-verify.c', + 'vpn/nm-vpn-connection.c', + 'vpn/nm-vpn-manager.c', + 'nm-active-connection.c', + 'nm-act-request.c', + 'nm-audit-manager.c', + 'nm-auth-manager.c', + 'nm-auth-utils.c', + 'nm-dbus-manager.c', + 'nm-checkpoint.c', + 'nm-checkpoint-manager.c', + 'nm-config.c', + 'nm-config-data.c', + 'nm-connectivity.c', + 'nm-dcb.c', + 'nm-dhcp-config.c', + 'nm-dispatcher.c', + 'nm-firewall-manager.c', + 'nm-hostname-manager.c', + 'nm-keep-alive.c', + 'nm-manager.c', + 'nm-pacrunner-manager.c', + 'nm-policy.c', + 'nm-proxy-config.c', + 'nm-rfkill-manager.c', + 'nm-session-monitor.c', + 'nm-sleep-monitor.c', + ), 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( - '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, + libNetworkManagerTest = static_library( + 'NetworkManagerTest', + sources: files( + 'ndisc/nm-fake-ndisc.c', + 'platform/tests/test-common.c', + 'platform/nm-fake-platform.c', + ), 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, - output: symbol_map_name, - depends: [network_manager_all_sym, core_plugins], - command: [create_exports_networkmanager, '--called-from-build', source_root], + 'NetworkManager.ver', + output: 'NetworkManager.ver', + depends: [ + NetworkManager_all_sym, + core_plugins, + ], + command: [ + join_paths(source_root, 'tools', 'create-exports-NetworkManager.sh'), + '--called-from-build', + source_root, + ], ) -ldflags = [ - '-rdynamic', - '-Wl,--version-script,@0@'.format(ver_script.full_path()), -] - -network_manager = executable( - nm_name, +NetworkManager = executable( + 'NetworkManager', 'main.c', dependencies: nm_deps, c_args: daemon_c_flags, - link_with: libnetwork_manager, - link_args: ldflags, + link_with: libNetworkManager, + 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], ) diff --git a/src/ndisc/tests/meson.build b/src/ndisc/tests/meson.build index d782f8a70..6a2e70f08 100644 --- a/src/ndisc/tests/meson.build +++ b/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, ) diff --git a/src/platform/tests/meson.build b/src/platform/tests/meson.build index fd2aca6a3..5d55707a0 100644 --- a/src/platform/tests/meson.build +++ b/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, ) diff --git a/src/settings/plugins/ifcfg-rh/tests/meson.build b/src/settings/plugins/ifcfg-rh/tests/meson.build index d630cdfd0..895645698 100644 --- a/src/settings/plugins/ifcfg-rh/tests/meson.build +++ b/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, ) diff --git a/src/settings/plugins/ifupdown/tests/meson.build b/src/settings/plugins/ifupdown/tests/meson.build index 53b13bd21..8f77f595f 100644 --- a/src/settings/plugins/ifupdown/tests/meson.build +++ b/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, ) diff --git a/src/settings/plugins/keyfile/tests/meson.build b/src/settings/plugins/keyfile/tests/meson.build index ee7acc204..cc2397df9 100644 --- a/src/settings/plugins/keyfile/tests/meson.build +++ b/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, ) diff --git a/src/supplicant/tests/meson.build b/src/supplicant/tests/meson.build index 5d5e9bbfb..88832a9b6 100644 --- a/src/supplicant/tests/meson.build +++ b/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, ) diff --git a/src/tests/config/meson.build b/src/tests/config/meson.build index bceeb1559..d0d8b1cf7 100644 --- a/src/tests/config/meson.build +++ b/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, ) diff --git a/src/tests/meson.build b/src/tests/meson.build index 1d3f59638..f4125396c 100644 --- a/src/tests/meson.build +++ b/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, )