[gedit] build: minor code change
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] build: minor code change
- Date: Fri, 8 May 2020 17:52:18 +0000 (UTC)
commit c2ee2e6a60f87d187872e8812ec1619edd5cafa0
Author: Sébastien Wilmet <swilmet gnome org>
Date: Fri May 8 19:48:13 2020 +0200
build: minor code change
When reading:
'gedit-@0@'.format(api_version)
it's clearer IMHO.
gedit/meson.build | 6 +++---
meson.build | 2 --
2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/gedit/meson.build b/gedit/meson.build
index af786f0b3..6e1bb99f3 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -171,7 +171,7 @@ libgedit_sources = [
]
libgedit_shared_lib = shared_library(
- package_string,
+ 'gedit-@0@'.format(api_version),
libgedit_sources + [libgedit_public_enum_types[1], libgedit_private_enum_types[1], libgedit_gresources[1]],
include_directories: root_include_dir,
dependencies: libgedit_deps,
@@ -198,7 +198,7 @@ libgedit_gir = gnome.generate_gir(
namespace: 'Gedit',
symbol_prefix: 'gedit',
identifier_prefix: 'Gedit',
- export_packages: [package_string],
+ export_packages: 'gedit-@0@'.format(api_version),
includes: libgedit_gir_includes,
link_with: libgedit_shared_lib,
install: true,
@@ -243,7 +243,7 @@ libgedit_pc = pkg.generate(
description: 'GNOME text editor',
requires: ['gtksourceview-4', 'tepl-5', 'libpeas-1.0', 'libpeas-gtk-1.0'],
version: meson.project_version(),
- subdirs: package_string,
+ subdirs: 'gedit-@0@'.format(api_version),
libraries: libgedit_shared_lib,
install_dir: pkgconfigdir,
)
diff --git a/meson.build b/meson.build
index e54f13fb4..cdf928363 100644
--- a/meson.build
+++ b/meson.build
@@ -15,8 +15,6 @@ python = import('python')
api_version = '3.38'
-package_string = '@0@-@1@'.format(meson.project_name(), api_version)
-
# Paths
root_include_dir = include_directories('.')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]