diff options
Diffstat (limited to 'libnm/meson.build')
| -rw-r--r-- | libnm/meson.build | 79 |
1 files changed, 42 insertions, 37 deletions
diff --git a/libnm/meson.build b/libnm/meson.build index 62e37993..558a587b 100644 --- a/libnm/meson.build +++ b/libnm/meson.build @@ -1,17 +1,18 @@ libnm_inc = include_directories('.') -sources = files('nm-libnm-utils.c') - -deps = [ - libnmdbus_dep, - shared_dep -] - cflags = [ '-DG_LOG_DOMAIN="@0@"'.format(libnm_name), '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM', ] +libnm_utils_sources = files('nm-libnm-utils.c') + +deps = [ + libnmdbus_dep, + shared_nm_utils_base_dep, + nm_core_dep, +] + if have_fake_typelibs deps += gir_dep subdir('fake-typelib') @@ -19,10 +20,10 @@ endif libnm_utils = static_library( 'nm-utils', - sources: sources, + sources: libnm_utils_sources, include_directories: libnm_core_inc, dependencies: deps, - c_args: cflags + c_args: cflags, ) libnm_headers = files( @@ -40,25 +41,26 @@ libnm_headers = files( 'nm-device-dummy.h', 'nm-device-ethernet.h', 'nm-device-generic.h', - 'nm-device.h', 'nm-device-infiniband.h', 'nm-device-ip-tunnel.h', 'nm-device-macsec.h', 'nm-device-macvlan.h', 'nm-device-modem.h', 'nm-device-olpc-mesh.h', + 'nm-device-ovs-bridge.h', 'nm-device-ovs-interface.h', 'nm-device-ovs-port.h', - 'nm-device-ovs-bridge.h', 'nm-device-ppp.h', 'nm-device-team.h', 'nm-device-tun.h', 'nm-device-vlan.h', 'nm-device-vxlan.h', + 'nm-device-wifi-p2p.h', 'nm-device-wifi.h', 'nm-device-wimax.h', 'nm-device-wireguard.h', 'nm-device-wpan.h', + 'nm-device.h', 'nm-dhcp-config.h', 'nm-ip-config.h', 'nm-object.h', @@ -69,12 +71,13 @@ libnm_headers = files( 'nm-vpn-editor.h', 'nm-vpn-plugin-old.h', 'nm-vpn-service-plugin.h', - 'nm-wimax-nsp.h' + 'nm-wifi-p2p-peer.h', + 'nm-wimax-nsp.h', ) install_headers( libnm_core_headers + libnm_headers + [version_header], - subdir: libnm_name + subdir: libnm_name, ) enum_headers = libnm_headers + [version_header] @@ -87,7 +90,7 @@ libnm_enum = gnome.mkenums( c_template: enum_types + '.c.template', h_template: enum_types + '.h.template', install_header: true, - install_dir: libnm_pkgincludedir + install_dir: libnm_pkgincludedir, ) libnm_sources = files( @@ -101,7 +104,6 @@ libnm_sources = files( 'nm-device-bond.c', 'nm-device-bridge.c', 'nm-device-bt.c', - 'nm-device.c', 'nm-device-dummy.c', 'nm-device-ethernet.c', 'nm-device-generic.c', @@ -111,18 +113,20 @@ libnm_sources = files( 'nm-device-macvlan.c', 'nm-device-modem.c', 'nm-device-olpc-mesh.c', + 'nm-device-ovs-bridge.c', 'nm-device-ovs-interface.c', 'nm-device-ovs-port.c', - 'nm-device-ovs-bridge.c', 'nm-device-ppp.c', 'nm-device-team.c', 'nm-device-tun.c', 'nm-device-vlan.c', 'nm-device-vxlan.c', + 'nm-device-wifi-p2p.c', 'nm-device-wifi.c', 'nm-device-wimax.c', 'nm-device-wireguard.c', 'nm-device-wpan.c', + 'nm-device.c', 'nm-dhcp-config.c', 'nm-dhcp4-config.c', 'nm-dhcp6-config.c', @@ -136,19 +140,13 @@ libnm_sources = files( 'nm-remote-settings.c', 'nm-secret-agent-old.c', 'nm-vpn-connection.c', - 'nm-vpn-plugin-old.c', 'nm-vpn-editor.c', + 'nm-vpn-plugin-old.c', 'nm-vpn-service-plugin.c', - 'nm-wimax-nsp.c' + 'nm-wifi-p2p-peer.c', + 'nm-wimax-nsp.c', ) -deps = [ - dl_dep, - libudev_dep, - shared_dep, - uuid_dep -] - linker_script = join_paths(meson.current_source_dir(), 'libnm.ver') @@ -157,7 +155,14 @@ libnm = shared_library( sources: libnm_sources + libnm_enum, version: libnm_version, include_directories: libnm_core_inc, - dependencies: deps, + dependencies: [ + dl_dep, + libudev_dep, + shared_nm_utils_base_dep, + nm_core_dep, + uuid_dep, + libnm_systemd_shared_no_logging_dep, + ], c_args: cflags, link_with: libnm_utils, link_whole: libnm_core, @@ -165,13 +170,13 @@ libnm = shared_library( '-Wl,--version-script,@0@'.format(linker_script), ], link_depends: linker_script, - install: true + install: true, ) libnm_dep = declare_dependency( sources: libnm_enum[1], include_directories: libnm_inc, - link_with: libnm + link_with: libnm, ) pkg.generate( @@ -184,8 +189,8 @@ pkg.generate( requires: 'gio-2.0', variables: [ 'exec_prefix=${prefix}', - 'vpnservicedir=' + join_paths('${prefix}', 'lib', nm_name, 'VPN') - ] + 'vpnservicedir=' + join_paths('${prefix}', 'lib', nm_name, 'VPN'), + ], ) test( @@ -208,7 +213,7 @@ if enable_introspection includes: 'Gio-2.0', extra_args: cflags, header: 'NetworkManager.h', - install: true + install: true, ) generate_plugin_docs = join_paths(meson.current_source_dir(), 'generate-plugin-docs.pl') @@ -218,7 +223,7 @@ if enable_introspection name, input: libnm_core_settings_sources, output: name, - command: [perl, generate_plugin_docs, 'keyfile', '@OUTPUT@', '@INPUT@'] + command: [perl, generate_plugin_docs, 'keyfile', '@OUTPUT@', '@INPUT@'], ) name = 'nm-settings-docs-overrides.xml' @@ -226,7 +231,7 @@ if enable_introspection name, input: libnm_core_settings_sources, output: name, - command: [perl, generate_plugin_docs, 'dbus', '@OUTPUT@', '@INPUT@'] + command: [perl, generate_plugin_docs, 'dbus', '@OUTPUT@', '@INPUT@'], ) if enable_ifcfg_rh @@ -235,7 +240,7 @@ if enable_introspection name, input: libnm_core_settings_sources, output: name, - command: [perl, generate_plugin_docs, 'ifcfg-rh', '@OUTPUT@', '@INPUT@'] + command: [perl, generate_plugin_docs, 'ifcfg-rh', '@OUTPUT@', '@INPUT@'], ) endif @@ -256,7 +261,7 @@ if enable_introspection generate_setting_docs_env = [ 'env', '-i', 'GI_TYPELIB_PATH=' + gi_typelib_path, - 'LD_LIBRARY_PATH=' + ld_library_path + 'LD_LIBRARY_PATH=' + ld_library_path, ] name = 'nm-property-docs.xml' @@ -265,7 +270,7 @@ if enable_introspection input: libnm_gir[0], output: name, command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--output', '@OUTPUT@'], - depends: libnm_gir + depends: libnm_gir, ) name = 'nm-settings-docs.xml' @@ -274,7 +279,7 @@ if enable_introspection input: libnm_gir[0], output: name, command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'], - depends: libnm_gir + depends: libnm_gir, ) endif |