[gnome-bluetooth: 2/14] build: Remove unnecessary directory variables
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-bluetooth: 2/14] build: Remove unnecessary directory variables
- Date: Fri, 11 Jan 2019 11:22:59 +0000 (UTC)
commit 364f4a0dc5f4b8b0a6c068ca8f9ecf0b8507ef27
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Thu Dec 20 13:11:51 2018 +0100
build: Remove unnecessary directory variables
Some variables in meson build files are used to set installation
directories or used as references to set directory related
information. However, many of these directories are unnecessary
because they have the same information as the default directory
values.
docs/reference/libgnome-bluetooth/meson.build | 3 ---
lib/meson.build | 7 -------
meson.build | 7 -------
sendto/meson.build | 6 +-----
4 files changed, 1 insertion(+), 22 deletions(-)
---
diff --git a/docs/reference/libgnome-bluetooth/meson.build b/docs/reference/libgnome-bluetooth/meson.build
index dd06de74..4881142c 100644
--- a/docs/reference/libgnome-bluetooth/meson.build
+++ b/docs/reference/libgnome-bluetooth/meson.build
@@ -20,8 +20,6 @@ configure_file(
configuration: version_conf,
)
-doc_path = join_paths(gnomebt_datadir, 'gtk-doc', 'html', meson.project_name())
-
gnome.gtkdoc(
meson.project_name(),
main_sgml: meson.project_name() + '-docs.sgml',
@@ -40,5 +38,4 @@ gnome.gtkdoc(
],
gobject_typesfile: meson.project_name() + '.types',
install: true,
- install_dir: doc_path
)
diff --git a/lib/meson.build b/lib/meson.build
index 685adeab..f83c1159 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -97,7 +97,6 @@ libgnome_bluetooth = shared_library(
link_args: ldflags,
link_depends: symbol_map,
install: true,
- install_dir: gnomebt_libdir,
)
libgnome_bluetooth_dep = declare_dependency(
@@ -119,7 +118,6 @@ pkg.generate(
],
requires_private: 'libudev',
variables: 'exec_prefix=' + gnomebt_libexecdir,
- install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
)
if enable_gir
@@ -133,9 +131,6 @@ if enable_gir
gir_extra_args = '--warn-all'
- gir_dir = join_paths(gnomebt_datadir, 'gir-' + gnomebt_gir_version)
- typelib_dir = join_paths(gnomebt_libdir, 'girepository-' + gnomebt_gir_version)
-
gnome.generate_gir(
libgnome_bluetooth,
sources: gir_sources,
@@ -147,8 +142,6 @@ if enable_gir
includes: gir_incs,
extra_args: gir_extra_args,
install: true,
- install_dir_gir: gir_dir,
- install_dir_typelib: typelib_dir,
)
endif
diff --git a/meson.build b/meson.build
index d22eb2ba..1c3b19d2 100644
--- a/meson.build
+++ b/meson.build
@@ -16,21 +16,14 @@ gnomebt_api_version = '1.0'
gnomebt_api_name = '@0@-@1@'.format(meson.project_name(), gnomebt_api_version)
gnomebt_gir_ns = 'GnomeBluetooth'
-gnomebt_gir_version = '1.0'
gnomebt_gettext_package = meson.project_name() + '2'
gnomebt_prefix = get_option('prefix')
-gnomebt_bindir = join_paths(gnomebt_prefix, get_option('bindir'))
gnomebt_datadir = join_paths(gnomebt_prefix, get_option('datadir'))
-gnomebt_includedir = join_paths(gnomebt_prefix, get_option('includedir'))
-gnomebt_libdir = join_paths(gnomebt_prefix, get_option('libdir'))
-gnomebt_libexecdir = join_paths(gnomebt_prefix, get_option('libexecdir'))
gnomebt_localedir = join_paths(gnomebt_prefix, get_option('localedir'))
-gnomebt_mandir = join_paths(gnomebt_prefix, get_option('mandir'))
gnomebt_pkgdatadir = join_paths(gnomebt_datadir, meson.project_name())
-gnomebt_pkglibdir = join_paths(gnomebt_libdir, meson.project_name())
# options
enable_gtk_doc = get_option('gtk_doc')
diff --git a/sendto/meson.build b/sendto/meson.build
index 354ec7d5..0754fd0d 100644
--- a/sendto/meson.build
+++ b/sendto/meson.build
@@ -10,13 +10,9 @@ executable(
dependencies: gtk_dep,
link_with: libgnome_bluetooth,
install: true,
- install_dir: gnomebt_bindir,
)
-install_man(
- name + '.1',
- install_dir: join_paths(gnomebt_mandir, 'man1'),
-)
+install_man(name + '.1')
desktop_conf = configuration_data()
desktop_conf.set('VERSION', gnomebt_version)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]