Commit 03ba0f1b authored by Inigo Martínez's avatar Inigo Martínez Committed by Thomas Haller

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
parent e965b767
......@@ -54,6 +54,5 @@ executable(
c_args: cflags,
link_args: ldflags,
link_depends: linker_script_binary,
install: true,
install_dir: nm_bindir
install: true
)
......@@ -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')
......
......@@ -77,6 +77,5 @@ executable(
c_args: cflags,
link_args: ldflags,
link_depends: linker_script_binary,
install: true,
install_dir: nm_bindir
install: true
)
......@@ -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
)
......@@ -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
)
......@@ -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
)
......@@ -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
)
......@@ -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
......
......@@ -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(
......
......@@ -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')
......
......@@ -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'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment