[libdazzle] Point link_depends to the appropriate file
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libdazzle] Point link_depends to the appropriate file
- Date: Sun, 9 Jul 2017 23:34:27 +0000 (UTC)
commit a35df7d9e2b4251bb4469a01d43f3b7c32f00e57
Author: Emmanuele Bassi <ebassi gnome org>
Date: Tue May 30 11:56:31 2017 +0100
Point link_depends to the appropriate file
This should really be a files() directive, but that requires Meson from
master.
src/meson.build | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index 8f103a1..8d691b3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -393,13 +393,15 @@ if get_option('enable_rdtscp')
libdazzle_args += '-DDZL_HAVE_RDTSCP'
endif
-libdazzle = library(
- 'dazzle-' + apiversion,
+libdazzle_map = join_paths(meson.current_source_dir(), 'dazzle.map')
+
+libdazzle = shared_library(
+ 'dazzle-' + libdazzle_api_version,
libdazzle_sources,
- link_depends: 'dazzle.map',
+ link_depends: libdazzle_map,
c_args: libdazzle_args,
- link_args: [ '-Wl,--version-script,' + join_paths(meson.current_source_dir(), 'dazzle.map') ],
+ link_args: [ '-Wl,--version-script,' + libdazzle_map ],
dependencies: libdazzle_deps,
include_directories: [ root_inc, src_inc ],
install: true,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]