[gvfs] build: Link libgvfscommon to libmetadata
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs] build: Link libgvfscommon to libmetadata
- Date: Wed, 12 Aug 2020 14:23:52 +0000 (UTC)
commit eee4bb846038e4440ffc8a591869974639c72bb0
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Tue Aug 4 11:38:02 2020 +0200
build: Link libgvfscommon to libmetadata
`gvfsd-metadata` uses the `gvfs_randomize_string` function by
including `gvfsutils.h` header file from `libgvfscommon`. However,
the library is not linked, only the directory is included.
This has been fixed by linking `libgvfscommon` to `libmetadata`.
client/meson.build | 1 -
metadata/meson.build | 13 ++++---------
2 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/client/meson.build b/client/meson.build
index 8f57d0d39..bfb8278d5 100644
--- a/client/meson.build
+++ b/client/meson.build
@@ -33,7 +33,6 @@ sources = uri_parser_sources + uri_utils + files(
deps = [
gio_unix_dep,
- libgvfscommon_dep,
libmetadata_dep,
]
diff --git a/metadata/meson.build b/metadata/meson.build
index 4e120d18a..056979c87 100644
--- a/metadata/meson.build
+++ b/metadata/meson.build
@@ -47,6 +47,7 @@ sources = files(
deps = [
gio_dep,
glib_dep,
+ libgvfscommon_dep,
]
cflags = [
@@ -58,7 +59,7 @@ cflags = [
libmetadata = static_library(
'metadata',
sources: sources + [dbus_sources],
- include_directories: [top_inc, common_inc],
+ include_directories: top_inc,
dependencies: deps + [gio_unix_dep],
c_args: cflags,
pic: true,
@@ -71,10 +72,7 @@ libmetadata_dep = declare_dependency(
link_with: libmetadata,
)
-deps = [
- libgvfscommon_dep,
- libmetadata_dep,
-]
+deps = [libmetadata_dep]
if enable_gudev
deps += gudev_dep
@@ -104,10 +102,7 @@ if enable_devel_utils
app,
app + '.c',
include_directories: top_inc,
- dependencies: [
- libgvfscommon_dep,
- libmetadata_dep,
- ],
+ dependencies: libmetadata_dep,
c_args: cflags,
)
endforeach
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]