Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Next] Fix docs meson option #662

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions help/reference/libdocument/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,16 @@ version_xml = configure_file(
configuration: version_conf,
)

libdoc_doc_deps = declare_dependency(
include_directories: [libdoc_include, include_directories('.')],
link_with: libdocument,
dependencies: libdocument_deps,
)

gnome.gtkdoc(
'libxreaderdocument',
mode: 'xml',
main_xml: 'libxreaderdocument-docs.xml',
gobject_typesfile: files('libxreaderdocument.types'),
src_dir: [
join_paths(meson.source_root(), 'libdocument'),
join_paths(meson.build_root(), 'libdocument'),
],
ignore_headers: [libdocument_private_headers],
dependencies: libdoc_doc_deps,
dependencies: libdocument_dep,
mkdb_args: ['--xml-mode', '--output-format=xml', '--name-space=ev'],
fixxref_args: fixref_args,
install: true,
Expand Down
12 changes: 3 additions & 9 deletions help/reference/libview/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,18 @@ version_xml = configure_file(
configuration: version_conf,
)

libview_doc_deps = declare_dependency(
include_directories: [include_root, libdoc_include, libview_include, include_directories('.')],
link_with: libview,
dependencies: libdoc_deps,
)

gnome.gtkdoc(
'libxreaderview',
mode: 'xml',
main_xml: 'libxreaderview-docs.xml',
gobject_typesfile: files('libxreaderview.types'),
src_dir: [
join_paths(meson.source_root(), 'libview'),
join_paths(meson.build_root(), 'libview'),
],
ignore_headers: [libview_private_headers],
dependencies: libview_doc_deps,
dependencies: libview_dep,
mkdb_args: ['--xml-mode', '--output-format=xml', '--name-space=ev'],
cflags: '-DXREADER_COMPILATION',
c_args: '-DXREADER_COMPILATION',
fixxref_args: fixref_args,
install: true,
install_dir: 'libxreaderview-' + api_version,
Expand Down
10 changes: 4 additions & 6 deletions help/reference/shell/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ version_xml = configure_file(
)

xreader_doc_deps = declare_dependency(
include_directories: [include_root, libdoc_include, libview_include, include_directories('.')],
link_with: [libdocument, libview],
dependencies: xreader_deps,
link_with: libshell.get_shared_lib(),
)

gnome.gtkdoc(
Expand All @@ -19,12 +17,12 @@ gnome.gtkdoc(
main_xml: 'xreader-docs.xml',
gobject_typesfile: files('xreader.types'),
src_dir: [
join_paths(meson.source_root(), 'libview'),
join_paths(meson.source_root(), 'shell'),
join_paths(meson.source_root(), 'libmisc'),
],
ignore_headers: [libview_private_headers],
dependencies: xreader_doc_deps,
mkdb_args: ['--xml-mode', '--output-format=xml', '--name-space=ev'],
cflags: '-DXREADER_COMPILATION',
c_args: '-DXREADER_COMPILATION',
fixxref_args: fixref_args,
install: true,
install_dir: meson.project_name(),
Expand Down
10 changes: 5 additions & 5 deletions libview/meson.build
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
libview_private_headers = [
'ev-annotation-window.h',
'ev-link-accessible.h',
'ev-loading-window.h',
'ev-page-cache.h',
'ev-pixbuf-cache.h',
'ev-timeline.h',
'ev-transition-animation.h',
'ev-view-accessible.h',
'ev-view-cursor.h',
'ev-view-private.h',
]

libview_headers = [
'ev-annotation-window.h',
'ev-document-model.h',
'ev-jobs.h',
'ev-job-scheduler.h',
'ev-loading-window.h',
'ev-page-cache.h',
'ev-pixbuf-cache.h',
'ev-print-operation.h',
'ev-stock-icons.h',
'ev-view.h',
'ev-view-cursor.h',
'ev-web-view.h',
'ev-view-presentation.h',
]
Expand Down
4 changes: 2 additions & 2 deletions shell/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@ libshell_deps = [
libephyzoom_dep,
]

libshell = static_library(
libshell = both_libraries(
'shell',
shell_sources,
dependencies: libshell_deps,
include_directories: include_dirs,
)

libshell_dep = declare_dependency(
link_whole: libshell, # Need the whole lib for gresource lookup
link_whole: libshell.get_static_lib(), # Need the whole lib for gresource lookup
dependencies: libshell_deps,
include_directories: include_dirs,
)
Expand Down