[nautilus/extensions-build-dep] Ensure that extensions depends on generated headers
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/extensions-build-dep] Ensure that extensions depends on generated headers
- Date: Fri, 9 Feb 2018 13:34:33 +0000 (UTC)
commit 900d2be31ccfc649623e1d8fab31c92a31371f38
Author: Emmanuele Bassi <ebassi gnome org>
Date: Fri Feb 9 13:32:19 2018 +0000
Ensure that extensions depends on generated headers
The libnautilus-extensions internal dependency must include the
generated enumeration header file, otherwise we may end up building
targets that depend on the library prior to have the header properly
generated.
libnautilus-extension/meson.build | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/libnautilus-extension/meson.build b/libnautilus-extension/meson.build
index e7c5717cf..113c779ad 100644
--- a/libnautilus-extension/meson.build
+++ b/libnautilus-extension/meson.build
@@ -27,15 +27,17 @@ install_headers(
subdir: join_paths('nautilus', 'libnautilus-extension')
)
+libnautilus_extension_enums = gnome.mkenums_simple(
+ 'nautilus-extension-enum-types',
+ install_header: true,
+ install_dir: join_paths(includedir, 'nautilus', 'libnautilus-extension'),
+ sources: [
+ 'nautilus-info-provider.h'
+ ]
+)
+
libnautilus_extension_sources = [
- gnome.mkenums_simple(
- 'nautilus-extension-enum-types',
- install_header: true,
- install_dir: join_paths(includedir, 'nautilus', 'libnautilus-extension'),
- sources: [
- 'nautilus-info-provider.h'
- ]
- ),
+ libnautilus_extension_enums,
libnautilus_extension_headers,
'nautilus-column-provider.c',
'nautilus-column.c',
@@ -88,6 +90,7 @@ gnome.generate_gir(
)
nautilus_extension = declare_dependency(
+ sources: libnautilus_extension_enums[1],
link_with: libnautilus_extension,
dependencies: libnautilus_extension_deps,
include_directories: nautilus_include_dirs
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]