diff options
author | Iñigo Martínez <inigomartinez@gmail.com> | 2017-12-24 14:52:01 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2018-01-02 10:44:05 +0100 |
commit | 03ba0f1b3af902341ad1ea3b25adafc274109e31 (patch) | |
tree | 903de53ab20304df3d6fe7fd13ce56535a79b9cb | |
parent | e965b7679dc1069178efca0dddd93223ab13555c (diff) | |
download | NetworkManager-03ba0f1b3af902341ad1ea3b25adafc274109e31.tar.gz |
build: Remove default install directories
The install directories of those targets that match the default
install directories have been removed because they are redundant.
This also allows a simple meson build files and it is unnecessary
to create some paths.
https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00078.html
-rw-r--r-- | clients/cli/meson.build | 3 | ||||
-rw-r--r-- | clients/meson.build | 3 | ||||
-rw-r--r-- | clients/tui/meson.build | 3 | ||||
-rw-r--r-- | docs/api/meson.build | 5 | ||||
-rw-r--r-- | docs/libnm-glib/meson.build | 7 | ||||
-rw-r--r-- | docs/libnm-util/meson.build | 7 | ||||
-rw-r--r-- | docs/libnm/meson.build | 7 | ||||
-rw-r--r-- | libnm-glib/meson.build | 19 | ||||
-rw-r--r-- | libnm-util/meson.build | 13 | ||||
-rw-r--r-- | libnm/meson.build | 13 | ||||
-rw-r--r-- | meson.build | 3 |
11 files changed, 22 insertions, 61 deletions
diff --git a/clients/cli/meson.build b/clients/cli/meson.build index ddf7060fd1..bfe7de56c7 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -54,6 +54,5 @@ executable( c_args: cflags, link_args: ldflags, link_depends: linker_script_binary, - install: true, - install_dir: nm_bindir + install: true ) diff --git a/clients/meson.build b/clients/meson.build index 4efbaea5a3..1e197d3762 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -29,8 +29,7 @@ executable( c_args: cflags, link_args: ldflags, link_depends: linker_script_binary, - install: true, - install_dir: nm_bindir + install: true ) subdir('common') diff --git a/clients/tui/meson.build b/clients/tui/meson.build index 5a125d102b..2bff05359a 100644 --- a/clients/tui/meson.build +++ b/clients/tui/meson.build @@ -77,6 +77,5 @@ executable( c_args: cflags, link_args: ldflags, link_depends: linker_script_binary, - install: true, - install_dir: nm_bindir + install: true ) diff --git a/docs/api/meson.build b/docs/api/meson.build index 05c5f98a23..0560502d07 100644 --- a/docs/api/meson.build +++ b/docs/api/meson.build @@ -18,13 +18,10 @@ configure_file( content_files += join_paths(meson.source_root(), 'COPYING') -doc_path = join_paths(nm_datadir, 'gtk-doc', 'html', doc_module) - gnome.gtkdoc( doc_module, main_xml: 'network-manager-docs.xml', src_dir: meson.current_source_dir(), content_files: content_files, - install: true, - install_dir: doc_path + install: true ) diff --git a/docs/libnm-glib/meson.build b/docs/libnm-glib/meson.build index c2a21d8f15..1368a2d458 100644 --- a/docs/libnm-glib/meson.build +++ b/docs/libnm-glib/meson.build @@ -18,8 +18,6 @@ configure_file( configuration: version_conf ) -doc_path = join_paths(nm_datadir, 'gtk-doc', 'html', doc_module) - gnome.gtkdoc( doc_module, main_xml: doc_module + '-docs.xml', @@ -34,9 +32,8 @@ gnome.gtkdoc( '--ignore-headers=' + ' '.join(private_headers), ], scanobjs_args: '--type-init-func="g_type_init();"', - fixxref_args: '--html-dir=' + doc_path, + fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)), gobject_typesfile: doc_module + '.types', html_assets: doc_module + '.png', - install: true, - install_dir: doc_path + install: true ) diff --git a/docs/libnm-util/meson.build b/docs/libnm-util/meson.build index fb8042072a..53425d6d03 100644 --- a/docs/libnm-util/meson.build +++ b/docs/libnm-util/meson.build @@ -16,8 +16,6 @@ configure_file( configuration: version_conf ) -doc_path = join_paths(nm_datadir, 'gtk-doc', 'html', doc_module) - gnome.gtkdoc( doc_module, main_xml: doc_module + '-docs.sgml', @@ -29,8 +27,7 @@ gnome.gtkdoc( '--ignore-headers=' + ' '.join(private_headers) ], scanobjs_args: '--type-init-func="g_type_init();"', - fixxref_args: '--html-dir=' + doc_path, + fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)), gobject_typesfile: doc_module + '.types', - install: true, - install_dir: doc_path + install: true ) diff --git a/docs/libnm/meson.build b/docs/libnm/meson.build index c275455e40..bccd8e6884 100644 --- a/docs/libnm/meson.build +++ b/docs/libnm/meson.build @@ -31,8 +31,6 @@ configure_file( configuration: version_conf ) -doc_path = join_paths(nm_datadir, 'gtk-doc', 'html', doc_module) - gnome.gtkdoc( doc_module, main_xml: doc_module + '-docs.xml', @@ -47,9 +45,8 @@ gnome.gtkdoc( '--ignore-headers=' + ' '.join(private_headers) ], scanobjs_args: '--type-init-func="g_type_init();"', - fixxref_args: '--html-dir=' + doc_path, + fixxref_args: '--html-dir=' + join_paths(nm_prefix, gnome.gtkdoc_html_dir(doc_module)), gobject_typesfile: doc_module + '.types', html_assets: doc_module + '.png', - install: true, - install_dir: doc_path + install: true ) diff --git a/libnm-glib/meson.build b/libnm-glib/meson.build index c8b2d8451c..43497e60e4 100644 --- a/libnm-glib/meson.build +++ b/libnm-glib/meson.build @@ -122,8 +122,7 @@ libnm_glib_vpn = shared_library( c_args: common_cflags, link_args: ldflags, link_depends: symbol_map, - install: true, - install_dir: get_option('libdir') + install: true ) libnm_glib_vpn_dep = declare_dependency( @@ -139,8 +138,7 @@ pkg.generate( filebase: 'libnm-glib-vpn', subdirs: 'libnm-glib', requires: 'NetworkManager >= ' + nm_version + ' glib-2.0 dbus-glib-1', - variables: 'exec_prefix=${prefix}', - install_dir: join_paths(nm_libdir, 'pkgconfig') + variables: 'exec_prefix=${prefix}' ) sources = shared_udev_utils + files( @@ -221,8 +219,7 @@ libnm_glib = shared_library( link_with: libdeprecated_nm_glib, link_args: ldflags, link_depends: symbol_map, - install: true, - install_dir: get_option('libdir') + install: true ) libnm_glib_dep = declare_dependency( @@ -238,8 +235,7 @@ pkg.generate( filebase: 'libnm-glib', subdirs: 'libnm-glib', requires: 'libnm-util >= ' + nm_version + ' NetworkManager >= ' + nm_version + ' gobject-2.0 dbus-glib-1', - variables: 'exec_prefix=${prefix}', - install_dir: join_paths(nm_libdir, 'pkgconfig') + variables: 'exec_prefix=${prefix}' ) if enable_introspection @@ -256,9 +252,6 @@ if enable_introspection 'Gio-2.0' ] - gir_dir = join_paths(nm_datadir, 'gir-' + nm_gir_version) - typelib_dir = join_paths(nm_libdir, 'girepository-' + nm_gir_version) - libnm_glib_gir = gnome.generate_gir( libnm_glib, sources: gir_sources, @@ -270,9 +263,7 @@ if enable_introspection export_packages: ['libnm-glib', 'libnm-glib-vpn'], includes: gir_includes, extra_args: common_cflags + ['--include-uninstalled=' + libnm_util_gir[0].full_path()], - install: true, - install_dir_gir: gir_dir, - install_dir_typelib: typelib_dir + install: true ) endif diff --git a/libnm-util/meson.build b/libnm-util/meson.build index eea36367d9..2d49def2b5 100644 --- a/libnm-util/meson.build +++ b/libnm-util/meson.build @@ -126,8 +126,7 @@ libnm_util = shared_library( c_args: cflags, link_args: ldflags, link_depends: symbol_map, - install: true, - install_dir: get_option('libdir') + install: true ) libnm_util_dep = declare_dependency( @@ -143,8 +142,7 @@ pkg.generate( filebase: 'libnm-util', subdirs: nm_name, requires: 'NetworkManager >= ' + nm_version + ' glib-2.0 dbus-glib-1', - variables: 'exec_prefix=${prefix}', - install_dir: join_paths(nm_libdir, 'pkgconfig') + variables: 'exec_prefix=${prefix}' ) if enable_introspection @@ -155,9 +153,6 @@ if enable_introspection 'GObject-2.0' ] - gir_dir = join_paths(nm_datadir, 'gir-' + nm_gir_version) - typelib_dir = join_paths(nm_libdir, 'girepository-' + nm_gir_version) - libnm_util_gir = gnome.generate_gir( libnm_util, sources: gir_sources, @@ -167,9 +162,7 @@ if enable_introspection symbol_prefix: nm_id_prefix.to_lower(), export_packages: 'libnm-util', includes: gir_includes, - install: true, - install_dir_gir: gir_dir, - install_dir_typelib: typelib_dir + install: true ) libnm_util_gir_dep = declare_dependency( diff --git a/libnm/meson.build b/libnm/meson.build index 23971e8c76..80158c2fa2 100644 --- a/libnm/meson.build +++ b/libnm/meson.build @@ -168,8 +168,7 @@ libnm = shared_library( link_whole: libnm_core, link_args: ldflags, link_depends: symbol_map, - install: true, - install_dir: get_option('libdir') + install: true ) libnm_dep = declare_dependency( @@ -188,8 +187,7 @@ pkg.generate( variables: [ 'exec_prefix=${prefix}', 'vpnservicedir=' + join_paths(nm_pkglibdir, 'VPN') - ], - install_dir: join_paths(nm_libdir, 'pkgconfig') + ] ) run_target( @@ -201,9 +199,6 @@ run_target( if enable_introspection gir_sources = libnm_core_enum + libnm_core_headers + libnm_core_sources + libnm_enum + libnm_headers + libnm_sources + [version_header] - gir_dir = join_paths(nm_datadir, 'gir-' + nm_gir_version) - typelib_dir = join_paths(nm_libdir, 'girepository-' + nm_gir_version) - libnm_gir = gnome.generate_gir( libnm, sources: gir_sources, @@ -214,9 +209,7 @@ if enable_introspection export_packages: 'libnm', includes: 'Gio-2.0', extra_args: cflags, - install: true, - install_dir_gir: gir_dir, - install_dir_typelib: typelib_dir + install: true ) generate_plugin_docs = join_paths(meson.current_source_dir(), 'generate-plugin-docs.pl') diff --git a/meson.build b/meson.build index f76ea718dd..cc704a47a9 100644 --- a/meson.build +++ b/meson.build @@ -899,8 +899,7 @@ pkg.generate( 'libgnome_serverdir=' + nm_libexecdir, 'plugindir=' + nm_pkglibdir, 'configdir=' + nm_pkgconfdir - ], - install_dir: join_paths(nm_libdir, 'pkgconfig') + ] ) config = 'config.h' |