Skip to content

Commit 051cc02

Browse files
committed
Fix #549 build doc error
Static libs are ignored for gtkdoc. The trick here is to build both static and dynamic, use static in the same place as before and use dynamic for doc. Also remove uneeded parts of declare_dependency in help/reference/shell/meson.build and add proper src_dir later.
1 parent 0ac9931 commit 051cc02

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

help/reference/shell/meson.build

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ version_xml = configure_file(
88
)
99

1010
xreader_doc_deps = declare_dependency(
11-
include_directories: [include_root, libdoc_include, libview_include, include_directories('.')],
12-
link_with: [libdocument, libview],
13-
dependencies: xreader_deps,
11+
link_with: libshell.get_shared_lib(),
1412
)
1513

1614
gnome.gtkdoc(
@@ -19,7 +17,8 @@ gnome.gtkdoc(
1917
main_xml: 'xreader-docs.xml',
2018
gobject_typesfile: files('xreader.types'),
2119
src_dir: [
22-
join_paths(meson.source_root(), 'libview'),
20+
join_paths(meson.source_root(), 'shell'),
21+
join_paths(meson.source_root(), 'libmisc'),
2322
],
2423
ignore_headers: [libview_private_headers],
2524
dependencies: xreader_doc_deps,

shell/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,15 @@ libshell_deps = [
141141
libephyzoom_dep,
142142
]
143143

144-
libshell = static_library(
144+
libshell = both_libraries(
145145
'shell',
146146
shell_sources,
147147
dependencies: libshell_deps,
148148
include_directories: include_dirs,
149149
)
150150

151151
libshell_dep = declare_dependency(
152-
link_whole: libshell, # Need the whole lib for gresource lookup
152+
link_whole: libshell.get_static_lib(), # Need the whole lib for gresource lookup
153153
dependencies: libshell_deps,
154154
include_directories: include_dirs,
155155
)

0 commit comments

Comments
 (0)