7 files changed, 98 insertions, 2 deletions
diff --git a/help/reference/libdocument/Makefile.am b/help/reference/libdocument/Makefile.am
index dec03e8e..f7285b87 100644
--- a/help/reference/libdocument/Makefile.am
+++ b/help/reference/libdocument/Makefile.am
@@ -123,6 +123,8 @@ EXTRA_DIST += \
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
 #DISTCLEANFILES +=
 
+DISTCLEANFILES = $(DOC_MODULE).actions
+
 # Comment this out if you want your docs-status tested during 'make check'
 if ENABLE_GTK_DOC
 #TESTS_ENVIRONMENT = cd $(srcsrc) &&
diff --git a/help/reference/libdocument/meson.build b/help/reference/libdocument/meson.build
new file mode 100644
index 00000000..2d44a400
--- /dev/null
+++ b/help/reference/libdocument/meson.build
@@ -0,0 +1,30 @@
+version_conf = configuration_data()
+version_conf.set('VERSION', version)
+
+version_xml = configure_file(
+  input: 'version.xml.in',
+  output: 'version.xml',
+  configuration: version_conf,
+)
+
+libdoc_doc_deps = declare_dependency(
+    include_directories: [libdoc_include, include_directories('.')],
+    link_with: libdocument,
+    dependencies: libdocument_deps,
+)
+
+gnome.gtkdoc(
+    'libdocument',
+    mode: 'xml',
+    main_xml: 'libdocument-docs.xml',
+    gobject_typesfile: files('libdocument.types'),
+    src_dir: [
+        join_paths(meson.source_root(), 'libdocument'),
+    ],
+    ignore_headers: [libdocument_private_headers],
+    dependencies: libdoc_doc_deps,
+    mkdb_args: ['--xml-mode', '--output-format=xml', '--name-space=ev'],
+    fixxref_args: fixref_args,
+    install: true,
+    install_dir: 'libocument-' + api_version,
+)
diff --git a/help/reference/libview/Makefile.am b/help/reference/libview/Makefile.am
index 08164f10..a3e0cf3e 100644
--- a/help/reference/libview/Makefile.am
+++ b/help/reference/libview/Makefile.am
@@ -133,6 +133,8 @@ EXTRA_DIST += \
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
 #DISTCLEANFILES +=
 
+DISTCLEANFILES = $(DOC_MODULE).actions
+
 # Comment this out if you want your docs-status tested during 'make check'
 if ENABLE_GTK_DOC
 #TESTS_ENVIRONMENT = cd $(srcsrc) &&
diff --git a/help/reference/libview/libatrilview-sections.txt b/help/reference/libview/libatrilview-sections.txt
index b888273f..394ec3be 100644
--- a/help/reference/libview/libatrilview-sections.txt
+++ b/help/reference/libview/libatrilview-sections.txt
@@ -314,7 +314,6 @@ EV_STOCK_RESIZE_SW
 EV_STOCK_CLOSE
 EV_STOCK_INVERTED_COLORS
 ev_stock_icons_init
-ev_stock_icons_shutdown
 ev_stock_icons_set_screen
 </SECTION>
 
diff --git a/help/reference/libview/meson.build b/help/reference/libview/meson.build
new file mode 100644
index 00000000..776c13f4
--- /dev/null
+++ b/help/reference/libview/meson.build
@@ -0,0 +1,31 @@
+version_conf = configuration_data()
+version_conf.set('VERSION', version)
+
+version_xml = configure_file(
+  input: 'version.xml.in',
+  output: 'version.xml',
+  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(
+    'libview',
+    mode: 'xml',
+    main_xml: 'libview-docs.xml',
+    gobject_typesfile: files('libview.types'),
+    src_dir: [
+        join_paths(meson.source_root(), 'libview'),
+    ],
+    ignore_headers: [libview_private_headers],
+    dependencies: libview_doc_deps,
+    mkdb_args: ['--xml-mode', '--output-format=xml', '--name-space=ev'],
+    cflags: '-DATRIL_COMPILATION',
+    fixxref_args: fixref_args,
+    install: true,
+    install_dir: 'libview-' + api_version,
+)
diff --git a/help/reference/shell/Makefile.am b/help/reference/shell/Makefile.am
index d8d5ae36..990aa195 100644
--- a/help/reference/shell/Makefile.am
+++ b/help/reference/shell/Makefile.am
@@ -101,7 +101,6 @@ GTKDOC_CFLAGS = \
 	-DATRILDATADIR=\"$(pkgdatadir)\"		\
 	-DMATEDATADIR=\"$(datadir)\"			\
 	-DMATELOCALEDIR=\"$(datadir)/locale\"		\
-	-DMATEICONDIR=\""$(datadir)/pixmaps"\" 	\
 	-DATRIL_COMPILATION				\
 	$(SHELL_CFLAGS)					\
 	$(WARN_CFLAGS)					\
@@ -138,6 +137,8 @@ EXTRA_DIST += \
 # for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
 #DISTCLEANFILES +=
 
+DISTCLEANFILES = $(DOC_MODULE).actions
+
 # Comment this out if you want your docs-status tested during 'make check'
 if ENABLE_GTK_DOC
 #TESTS_ENVIRONMENT = cd $(srcsrc) &&
diff --git a/help/reference/shell/meson.build b/help/reference/shell/meson.build
new file mode 100644
index 00000000..9b2f6c43
--- /dev/null
+++ b/help/reference/shell/meson.build
@@ -0,0 +1,31 @@
+version_conf = configuration_data()
+version_conf.set('VERSION', version)
+
+version_xml = configure_file(
+  input: 'version.xml.in',
+  output: 'version.xml',
+  configuration: version_conf,
+)
+
+atril_doc_deps = declare_dependency(
+    include_directories: [include_root, libdoc_include, libview_include, include_directories('.')],
+    link_with: [libdocument, libview],
+    dependencies: atril_deps,
+)
+
+gnome.gtkdoc(
+    meson.project_name(),
+    mode: 'xml',
+    main_xml: 'atril-docs.xml',
+    gobject_typesfile: files('atril.types'),
+    src_dir: [
+        join_paths(meson.project_source_root(), 'libview'),
+    ],
+    ignore_headers: [libview_private_headers],
+    dependencies: atril_doc_deps,
+    mkdb_args: ['--xml-mode', '--output-format=xml', '--name-space=ev'],
+    cflags: '-DATRIL_COMPILATION',
+    fixxref_args: fixref_args,
+    install: true,
+    install_dir: meson.project_name(),
+)