[gtk/ebassi/for-master] build: Install the API references
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/ebassi/for-master] build: Install the API references
- Date: Fri, 12 Mar 2021 11:32:16 +0000 (UTC)
commit 7c29847fbf0922c4615615ca821410590ab5abe6
Author: Emmanuele Bassi <ebassi gnome org>
Date: Fri Mar 12 11:13:54 2021 +0000
build: Install the API references
We are building them, but not installing them.
docs/reference/gdk/meson.build | 6 ++++++
docs/reference/gsk/meson.build | 2 ++
docs/reference/gtk/meson.build | 2 ++
docs/reference/meson.build | 21 ++-------------------
4 files changed, 12 insertions(+), 19 deletions(-)
---
diff --git a/docs/reference/gdk/meson.build b/docs/reference/gdk/meson.build
index 66b0d150fc..3dc7a0ff92 100644
--- a/docs/reference/gdk/meson.build
+++ b/docs/reference/gdk/meson.build
@@ -22,6 +22,8 @@ if get_option('gtk_doc')
],
depend_files: [ expand_content_md_files ],
build_by_default: true,
+ install: true,
+ install_dir: docs_dir,
)
if x11_enabled
@@ -42,6 +44,8 @@ if get_option('gtk_doc')
depends: [ gdk_gir[0] ],
depend_files: [ ],
build_by_default: true,
+ install: true,
+ install_dir: docs_dir,
)
endif
@@ -63,6 +67,8 @@ if get_option('gtk_doc')
depends: [ gdk_gir[0] ],
depend_files: [ ],
build_by_default: true,
+ install: true,
+ install_dir: docs_dir,
)
endif
endif
diff --git a/docs/reference/gsk/meson.build b/docs/reference/gsk/meson.build
index 1e34799280..f482f9fd6f 100644
--- a/docs/reference/gsk/meson.build
+++ b/docs/reference/gsk/meson.build
@@ -18,5 +18,7 @@ if get_option('gtk_doc')
depends: [ gdk_gir[0] ],
depend_files: [ expand_content_md_files ],
build_by_default: true,
+ install: true,
+ install_dir: docs_dir,
)
endif
diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index 38db6dd353..c1791edd53 100644
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -47,6 +47,8 @@ if get_option('gtk_doc')
depends: [ gdk_gir[0], gsk_gir[0] ],
depend_files: [ expand_content_md_files ],
build_by_default: true,
+ install: true,
+ install_dir: docs_dir,
)
endif
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index 24d0daadb1..66598f249a 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -1,27 +1,10 @@
-if get_option('gtk_doc')
- glib_prefix = dependency('glib-2.0').get_variable(pkgconfig: 'prefix', default_value: '/usr')
- glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
-
- cairo_prefix = dependency('cairo-gobject').get_variable(pkgconfig: 'prefix', default_value: '/usr')
- cairo_docpath = join_paths(cairo_prefix, 'share', 'gtk-doc', 'html', 'cairo')
-
- gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_variable(pkgconfig: 'prefix', default_value: '/usr')
- gdkpixbuf_docpath = join_paths(gdkpixbuf_prefix, 'share', 'gtk-doc', 'html', 'gdk-pixbuf')
-
- docpath = join_paths(gtk_datadir, 'gtk-doc', 'html')
-
- version_conf = configuration_data()
- version_conf.set('GTK_VERSION', meson.project_version())
-
- src_dir_conf = configuration_data()
- src_dir_conf.set('SRC_DIR', meson.source_root())
-endif
-
toml_conf = configuration_data()
toml_conf.set('version', meson.project_version())
gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))
+docs_dir = gtk_datadir / 'doc/gtk4/reference'
+
subdir('gdk')
subdir('gsk')
subdir('gtk')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]