[gnome-builder] build: Make libgd a shared library
- From: Patrick Griffis <pgriffis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: Make libgd a shared library
- Date: Mon, 5 Jun 2017 22:18:16 +0000 (UTC)
commit 880a275fb1a30a49c5c2d54a013815bb3ad8e3dd
Author: Patrick Griffis <tingping tingping se>
Date: Mon Jun 5 18:17:16 2017 -0400
build: Make libgd a shared library
meson.build | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/meson.build b/meson.build
index d391556..2b35058 100644
--- a/meson.build
+++ b/meson.build
@@ -14,6 +14,12 @@ MAJOR_VERSION = version_split[0]
MINOR_VERSION = version_split[1]
MICRO_VERSION = version_split[2]
+pkglibdir_abs = join_paths(get_option('prefix'), get_option('libdir'), 'gnome-builder')
+pkglibdir = join_paths(get_option('libdir'), 'gnome-builder')
+pkggirdir = join_paths(get_option('datadir'),'gnome-builder', 'gir-1.0')
+pkgtypelibdir = join_paths(get_option('libdir'), 'gnome-builder', 'girepository-1.0')
+pkgvapidir = join_paths(get_option('datadir'), 'gnome-builder/vapi')
+
conf = configuration_data()
conf.set_quoted('PACKAGE_NAME', 'gnome-builder')
conf.set_quoted('PACKAGE_VERSION', meson.project_version())
@@ -133,6 +139,8 @@ libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.25.2',
libgd = subproject('libgd',
default_options: [
+ 'static=false',
+ 'pkglibdir=' + pkglibdir,
'with-tagged-entry=true'
]
)
@@ -172,12 +180,6 @@ if get_option('with_flatpak') or get_option('with_git')
endif
endif
-
-pkglibdir_abs = join_paths(get_option('prefix'), get_option('libdir'), 'gnome-builder')
-pkglibdir = join_paths(get_option('libdir'), 'gnome-builder')
-pkggirdir = join_paths(get_option('datadir'),'gnome-builder', 'gir-1.0')
-pkgtypelibdir = join_paths(get_option('libdir'), 'gnome-builder', 'girepository-1.0')
-pkgvapidir = join_paths(get_option('datadir'), 'gnome-builder/vapi')
gnome = import('gnome')
subdir('data')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]