[gtk/gtk-3-24] meson: Preserve compatibility with Autotools build
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/gtk-3-24] meson: Preserve compatibility with Autotools build
- Date: Thu, 11 Apr 2019 18:34:50 +0000 (UTC)
commit a04fef4b9e0d565c81f56f6e0192c2f22cec98c3
Author: Emmanuele Bassi <ebassi gnome org>
Date: Thu Apr 11 19:33:25 2019 +0100
meson: Preserve compatibility with Autotools build
The Meson build is missing the libtool versioning of the shared
libraries.
gdk/meson.build | 1 +
gtk/meson.build | 1 +
meson.build | 4 ++++
3 files changed, 6 insertions(+)
---
diff --git a/gdk/meson.build b/gdk/meson.build
index 9d7ded377a..40725b25a6 100644
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -280,6 +280,7 @@ endif
libgdk = shared_library('gdk-3',
soversion: gtk_soversion,
+ version: gtk_library_version,
sources: [gdk_sources, gdk_backends_gen_headers, gdkconfig],
dependencies: gdk_deps,
include_directories: [confinc, gdkx11_inc, wlinc],
diff --git a/gtk/meson.build b/gtk/meson.build
index 01c999ebfb..93e029f42c 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -966,6 +966,7 @@ endforeach
# Library
libgtk = shared_library('gtk-3',
soversion: gtk_soversion,
+ version: gtk_library_version,
sources: [typefuncs, gtk_sources, gtkmarshal_h, gtkprivatetypebuiltins_h],
c_args: gtk_cargs + common_cflags,
include_directories: [confinc, gdkinc, gtkinc],
diff --git a/meson.build b/meson.build
index 538abb378c..769b21dedf 100644
--- a/meson.build
+++ b/meson.build
@@ -108,6 +108,10 @@ else
gtk_soversion = '0'
endif
+# Maintain compatibility with the Autotools build
+current = gtk_binary_age - gtk_interface_age
+gtk_library_version = '@0@.@1@.@2@'.format(gtk_soversion, current, gtk_interface_age)
+
gtk_osxversions = [(100 * gtk_minor_version) + 1, '@0@.@1@.0'.format((100 * gtk_minor_version) + 1,
gtk_micro_version)]
gtk_api_version = '@0@.0'.format(gtk_major_version)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]