[gedit] build: generate_gir(): provide only public sources
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] build: generate_gir(): provide only public sources
- Date: Fri, 8 May 2020 19:15:39 +0000 (UTC)
commit 0c2aaa26ff2fb02669b9079313ccfb28e757c86d
Author: Sébastien Wilmet <swilmet gnome org>
Date: Fri May 8 21:02:21 2020 +0200
build: generate_gir(): provide only public sources
Plus other small refactorings.
gedit/meson.build | 41 ++++++++++++++++++++---------------------
1 file changed, 20 insertions(+), 21 deletions(-)
---
diff --git a/gedit/meson.build b/gedit/meson.build
index cba1bf4fc..8fe515311 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -178,38 +178,37 @@ libgedit_shared_lib = shared_library(
)
# GObject Introspection
-libgedit_public_headers += [
- libgedit_public_enum_types[1],
-]
-
-libgedit_gir_includes = [
- 'Gtk-3.0',
- 'GtkSource-4',
-]
-
-libgedit_sources = [
- libgedit_public_sources,
- libgedit_private_sources,
- libgedit_public_enum_types[0],
- libgedit_private_enum_types[0],
- libgedit_gresources[0],
-]
-
libgedit_gir = gnome.generate_gir(
libgedit_shared_lib,
- sources: libgedit_sources + libgedit_public_headers,
+ sources: [
+ libgedit_public_headers,
+ libgedit_public_sources,
+ libgedit_public_enum_types,
+ ],
nsversion: '3.0',
namespace: 'Gedit',
symbol_prefix: 'gedit',
identifier_prefix: 'Gedit',
export_packages: 'gedit-@0@'.format(api_version),
- includes: libgedit_gir_includes,
+ includes: ['Gtk-3.0', 'GtkSource-4'],
link_with: libgedit_shared_lib,
install: true,
- install_dir_gir: join_paths(pkgdatadir, 'gir-1.0'),
- install_dir_typelib: join_paths(pkglibdir, 'girepository-1.0'),
+ install_dir_gir: get_option('datadir') / 'gedit/gir-1.0',
+ install_dir_typelib: get_option('libdir') / 'gedit/girepository-1.0',
)
+libgedit_sources = [
+ libgedit_public_sources,
+ libgedit_private_sources,
+ libgedit_public_enum_types[0],
+ libgedit_private_enum_types[0],
+ libgedit_gresources[0],
+]
+
+libgedit_public_headers += [
+ libgedit_public_enum_types[1],
+]
+
python3.install_sources(
'Gedit.py',
subdir: join_paths(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]