[seahorse] meson: Use files() to list source files
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse] meson: Use files() to list source files
- Date: Fri, 14 Feb 2020 17:33:44 +0000 (UTC)
commit 80b2ad7bbed2b447b59cb16abb8bc2f4eb67cb37
Author: Niels De Graef <nielsdegraef gmail com>
Date: Fri Feb 14 18:31:39 2020 +0100
meson: Use files() to list source files
This makes meson fail much quicker if a source file is missing (rather
than having to wait until almost everything is compiled).
common/meson.build | 4 ++--
gkr/meson.build | 4 ++--
libegg/meson.build | 4 ++--
libseahorse/meson.build | 9 ++++-----
pgp/meson.build | 11 ++++++-----
pkcs11/meson.build | 4 ++--
ssh/meson.build | 8 ++++----
7 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/common/meson.build b/common/meson.build
index 9a2b622c..91a9ed6d 100644
--- a/common/meson.build
+++ b/common/meson.build
@@ -1,4 +1,4 @@
-common_sources = [
+common_sources = files(
'actions.vala',
'add-keyserver-dialog.vala',
'app-settings.vala',
@@ -25,7 +25,7 @@ common_sources = [
'util.vala',
'validity.vala',
'viewable.vala',
-]
+)
common_deps = [
glib_deps,
diff --git a/gkr/meson.build b/gkr/meson.build
index 74561884..b530fb8d 100644
--- a/gkr/meson.build
+++ b/gkr/meson.build
@@ -1,4 +1,4 @@
-gkr_sources = [
+gkr_sources = files(
'gkr-backend.vala',
'gkr-dialogs.vala',
'gkr-item-add.vala',
@@ -11,7 +11,7 @@ gkr_sources = [
'gkr-keyring.vala',
'gkr-module.vala',
'gkr-password-entry.vala',
-]
+)
gkr_dependencies = [
glib_deps,
diff --git a/libegg/meson.build b/libegg/meson.build
index b9f3d2d9..7e8f6e01 100644
--- a/libegg/meson.build
+++ b/libegg/meson.build
@@ -11,7 +11,7 @@ libeggdatetime_cflags = [
]
libeggdatetime_lib = static_library('libeggdatetime',
- 'egg-datetime.c',
+ files('egg-datetime.c'),
c_args: libeggdatetime_cflags,
dependencies: libeggdatetime_dependencies,
)
@@ -30,7 +30,7 @@ libtreemultidnd_cflags = [
]
libtreemultidnd_lib = static_library('libtreemultidnd',
- 'eggtreemultidnd.c',
+ files('eggtreemultidnd.c'),
c_args: libtreemultidnd_cflags,
dependencies: libtreemultidnd_dependencies,
)
diff --git a/libseahorse/meson.build b/libseahorse/meson.build
index 1d59e20b..b37777bd 100644
--- a/libseahorse/meson.build
+++ b/libseahorse/meson.build
@@ -1,18 +1,17 @@
-marshaller = gnome.genmarshal('seahorse-marshal',
+libseahorse_marshaller = gnome.genmarshal('seahorse-marshal',
sources: 'seahorse-marshal.list',
prefix: 'seahorse_marshal',
)
-libseahorse_sources = [
+libseahorse_sources = files(
'seahorse-bind.c',
'seahorse-object-list.c',
'seahorse-object-model.c',
'seahorse-progress.c',
'seahorse-util.c',
'seahorse-widget.c',
- marshaller,
-]
+)
libseahorse_deps = [
glib_deps,
@@ -23,7 +22,7 @@ libseahorse_deps = [
]
libseahorse_lib = static_library('libseahorse',
- libseahorse_sources,
+ [ libseahorse_sources, libseahorse_marshaller ],
dependencies: libseahorse_deps,
include_directories: include_directories('..'),
)
diff --git a/pgp/meson.build b/pgp/meson.build
index 0311dcab..d5515860 100644
--- a/pgp/meson.build
+++ b/pgp/meson.build
@@ -1,4 +1,4 @@
-pgp_sources = [
+pgp_sources = files(
'seahorse-combo-keys.c',
'seahorse-discovery.c',
'seahorse-gpgme.c',
@@ -34,7 +34,7 @@ pgp_sources = [
'seahorse-transfer.c',
'seahorse-unknown.c',
'seahorse-unknown-source.c',
-]
+)
pgp_dependencies = [
glib_deps,
@@ -47,7 +47,7 @@ pgp_c_flags = [
]
if with_ldap
- pgp_sources += 'seahorse-ldap-source.c'
+ pgp_sources = [ pgp_sources, 'seahorse-ldap-source.c' ]
pgp_dependencies += [
libldap,
liblber,
@@ -56,12 +56,13 @@ if with_ldap
endif
if with_hkp
- pgp_sources += 'seahorse-hkp-source.c'
+ pgp_sources += [ pgp_sources, 'seahorse-hkp-source.c' ]
pgp_dependencies += libsoup
endif
if with_keyservers
- pgp_sources += [
+ pgp_sources = [
+ pgp_sources,
'seahorse-server-source.c',
'seahorse-keyserver-search.c',
'seahorse-keyserver-sync.c',
diff --git a/pkcs11/meson.build b/pkcs11/meson.build
index 4234bab8..342bc1c9 100644
--- a/pkcs11/meson.build
+++ b/pkcs11/meson.build
@@ -1,4 +1,4 @@
-pkcs11_sources = [
+pkcs11_sources = files(
'certificate-der-exporter.vala',
'pkcs11-certificate.vala',
'pkcs11-deleter.vala',
@@ -12,7 +12,7 @@ pkcs11_sources = [
'cryptoki.vapi',
'seahorse-pkcs11-backend.c',
-]
+)
pkcs11_deps = [
glib_deps,
diff --git a/ssh/meson.build b/ssh/meson.build
index 18bfbe5d..15418772 100644
--- a/ssh/meson.build
+++ b/ssh/meson.build
@@ -1,4 +1,4 @@
-ssh_sources = [
+ssh_sources = files(
'actions.vala',
'algorithm.vala',
'backend.vala',
@@ -14,7 +14,7 @@ ssh_sources = [
'source.vala',
'ssh.vala',
'upload.vala',
-]
+)
ssh_dependencies = [
glib_deps,
@@ -41,9 +41,9 @@ ssh_dep = declare_dependency(
)
# ssh-askpass helper binary
-ssh_askpass_sources = [
+ssh_askpass_sources = files(
'seahorse-ssh-askpass.c',
-]
+)
ssh_askpass_dependencies = [
gcr,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]