[gnome-control-center/gbsneto/build-system-improvements: 6/10] project: Move build files to build-aux
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/gbsneto/build-system-improvements: 6/10] project: Move build files to build-aux
- Date: Sat, 12 May 2018 03:54:26 +0000 (UTC)
commit 4aab0cd22235adff360c2942a3742bbf5a562f65
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Thu May 10 18:11:23 2018 -0300
project: Move build files to build-aux
An attempt to make the root folder slightly less
cluttered and more organized. No functional changes
whatsoever.
build-aux/meson.build | 5 +++++
meson_post_install.py => build-aux/meson/meson_post_install.py | 0
update-from-gsd.in => build-aux/meson/update-from-gsd.in | 0
update-from-gsd.sh => build-aux/meson/update-from-gsd.sh | 0
update-from-nma.in => build-aux/meson/update-from-nma.in | 0
meson.build | 10 +---------
6 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/build-aux/meson.build b/build-aux/meson.build
new file mode 100644
index 000000000..f3fdb40a8
--- /dev/null
+++ b/build-aux/meson.build
@@ -0,0 +1,5 @@
+update_from_gsd = find_program('meson/update-from-gsd.sh')
+update_from_gsd_in = files('meson/update-from-gsd.in')
+update_from_nma_in = files('meson/update-from-nma.in')
+
+meson.add_install_script('meson/meson_post_install.py', control_center_datadir)
diff --git a/meson_post_install.py b/build-aux/meson/meson_post_install.py
similarity index 100%
rename from meson_post_install.py
rename to build-aux/meson/meson_post_install.py
diff --git a/update-from-gsd.in b/build-aux/meson/update-from-gsd.in
similarity index 100%
rename from update-from-gsd.in
rename to build-aux/meson/update-from-gsd.in
diff --git a/update-from-gsd.sh b/build-aux/meson/update-from-gsd.sh
similarity index 100%
rename from update-from-gsd.sh
rename to build-aux/meson/update-from-gsd.sh
diff --git a/update-from-nma.in b/build-aux/meson/update-from-nma.in
similarity index 100%
rename from update-from-nma.in
rename to build-aux/meson/update-from-nma.in
diff --git a/meson.build b/meson.build
index 2e7a36d3c..340e2004e 100644
--- a/meson.build
+++ b/meson.build
@@ -249,10 +249,7 @@ install_subdir(
top_inc = include_directories('.')
shell_inc = include_directories('shell')
-update_from_gsd = find_program('update-from-gsd.sh')
-update_from_gsd_in = files('update-from-gsd.in')
-update_from_nma_in = files('update-from-nma.in')
-
+subdir('build-aux')
subdir('data/icons')
subdir('po')
subdir('panels')
@@ -269,11 +266,6 @@ configure_file(
configuration: config_h
)
-meson.add_install_script(
- 'meson_post_install.py',
- control_center_datadir
-)
-
output = ''
output += '\n ' + meson.project_name() + ' - ' + meson.project_version() + '\n'
output += ' ===================================\n'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]