[seahorse] Meson: fix build.
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse] Meson: fix build.
- Date: Sun, 12 Nov 2017 10:33:01 +0000 (UTC)
commit 1e08fd30725cb1b8c87330c5cc395259b44ec503
Author: Niels De Graef <nielsdegraef gmail com>
Date: Sun Nov 12 11:31:47 2017 +0100
Meson: fix build.
The meson files were from an older branch in which some things from
libseahorse weren't ported to Vala yet.
common/meson.build | 10 ++++++++++
libseahorse/meson.build | 9 ---------
ssh/meson.build | 2 +-
3 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/common/meson.build b/common/meson.build
index 1cc41cc..bf373d3 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -9,10 +9,15 @@ common_sources = [
'exporter.vala',
'icons.vala',
'lockable.vala',
+ 'object.vala',
+ 'passphrase-prompt.vala',
'place.vala',
+ 'predicate.vala',
'registry.vala',
+ 'servers.vala',
'types.vala',
'util.vala',
+ 'validity.vala',
'viewable.vala',
]
@@ -20,9 +25,14 @@ common_deps = [
glib_deps,
gtk,
gcr,
+ gcr_ui,
config,
]
+if with_keyservers
+ common_sources += 'keyserver-control.vala'
+endif
+
common_lib = static_library('common',
common_sources,
dependencies: common_deps,
diff --git a/libseahorse/meson.build b/libseahorse/meson.build
index 61f016f..a3450f6 100644
--- a/libseahorse/meson.build
+++ b/libseahorse/meson.build
@@ -16,28 +16,19 @@ libseahorse_sources = [
'seahorse-collection.c',
'seahorse-interaction.c',
'seahorse-key-manager-store.c',
- 'seahorse-object.c',
'seahorse-object-list.c',
'seahorse-object-model.c',
'seahorse-object-widget.c',
- 'seahorse-passphrase.c',
- 'seahorse-predicate.c',
'seahorse-prefs.c',
'seahorse-progress.c',
'seahorse-search-provider.c',
- 'seahorse-servers.c',
'seahorse-util.c',
- 'seahorse-validity.c',
'seahorse-widget.c',
marshaller,
resources_src,
search_provider_src,
]
-if with_keyservers
- libseahorse_sources += 'seahorse-keyserver-control.c'
-endif
-
libseahorse_deps = [
glib_deps,
gcr,
diff --git a/ssh/meson.build b/ssh/meson.build
index 005f0e2..3bf0876 100644
--- a/ssh/meson.build
+++ b/ssh/meson.build
@@ -32,13 +32,13 @@ ssh_lib = static_library('seahorse-ssh',
# ssh-askpass helper binary
ssh_askpass_sources = [
'seahorse-ssh-askpass.c',
- join_paths(meson.source_root(), 'libseahorse', 'seahorse-passphrase.c'),
]
ssh_askpass_dependencies = [
gcr,
gtk,
config,
+ common_dep,
]
ssh_askpass = executable('ssh-askpass',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]