[glib/meson-bump: 1/2] build: Remove unnecessary `install` directives
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/meson-bump: 1/2] build: Remove unnecessary `install` directives
- Date: Mon, 17 Jun 2019 16:00:44 +0000 (UTC)
commit c8fff44e5a04e67b11d8d7c500c418f5e6c91930
Author: Emmanuele Bassi <ebassi gnome org>
Date: Mon Jun 17 16:52:36 2019 +0100
build: Remove unnecessary `install` directives
The configure_file() object defaults to `install: false`, unless an
install directory is used.
gio/gdbus-2.0/codegen/meson.build | 3 ---
gio/tests/meson.build | 2 +-
glib/meson.build | 5 ++---
gobject/meson.build | 3 +--
meson.build | 1 -
5 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
index 24d2527bc..121e9e6bb 100644
--- a/gio/gdbus-2.0/codegen/meson.build
+++ b/gio/gdbus-2.0/codegen/meson.build
@@ -16,7 +16,6 @@ gdbus_codegen_conf.set('DATADIR', glib_datadir)
# Install gdbus-codegen executable
gdbus_codegen = configure_file(input : 'gdbus-codegen.in',
output : 'gdbus-codegen',
- install : true,
install_dir : get_option('bindir'),
configuration : gdbus_codegen_conf
)
@@ -28,7 +27,6 @@ codegen_dir = join_paths(get_option('datadir'), 'glib-2.0/codegen')
gdbus_codegen_built_files = []
gdbus_codegen_built_files += configure_file(input : 'config.py.in',
output : 'config.py',
- install : true,
install_dir : codegen_dir,
configuration : gdbus_codegen_conf)
@@ -36,7 +34,6 @@ foreach f : gdbus_codegen_files
# Copy these into the builddir so that gdbus-codegen can be used uninstalled
# and then install it too so that it can be used after installation
gdbus_codegen_built_files += configure_file(input : f, output : f,
- install : true,
install_dir : codegen_dir,
copy : true)
endforeach
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index a0c09444b..d275b2302 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -558,7 +558,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
test_generated_txt = configure_file(input : 'test1.txt',
output : 'test-generated.txt',
copy : true,
- install : false)
+ )
resources_extra_sources = [
test_gresource,
diff --git a/glib/meson.build b/glib/meson.build
index 40b58047d..2bd3d8226 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -1,5 +1,4 @@
configure_file(input : 'glibconfig.h.in', output : 'glibconfig.h',
- install : true,
install_dir : join_paths(get_option('libdir'), 'glib-2.0/include'),
configuration : glibconfig_conf)
@@ -456,11 +455,11 @@ if enable_systemtap
output : '@0@.stp'.format(libglib.full_path().split('/').get(-1)),
configuration : stp_cdata,
install_dir : tapset_install_dir,
- install : true)
+ )
endif
# Don’t build the tests unless we can run them (either natively or in an exe wrapper)
build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
if build_tests
subdir('tests')
-endif
\ No newline at end of file
+endif
diff --git a/gobject/meson.build b/gobject/meson.build
index 81dcffda5..ba664c26e 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -75,7 +75,6 @@ foreach tool: python_tools
input : tool + '.in',
output : tool,
configuration : python_tools_conf,
- install : true,
install_dir : glib_bindir,
)
@@ -170,4 +169,4 @@ endif
build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper())
if build_tests
subdir('tests')
-endif
\ No newline at end of file
+endif
diff --git a/meson.build b/meson.build
index b85ff7661..2b8b890cf 100644
--- a/meson.build
+++ b/meson.build
@@ -2068,7 +2068,6 @@ if have_sh
gettextize_conf.set('datarootdir', glib_datadir)
gettextize_conf.set('datadir', glib_datadir)
configure_file(input : 'glib-gettextize.in',
- install : true,
install_dir : glib_bindir,
output : 'glib-gettextize',
configuration : gettextize_conf)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]