diff options
author | Emmanuele Bassi <ebassi@gnome.org> | 2021-03-12 11:13:54 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gnome.org> | 2021-03-12 11:32:09 +0000 |
commit | 7c29847fbf0922c4615615ca821410590ab5abe6 (patch) | |
tree | 6b81e341764efaa1336ab9f862783e64d29b89ef | |
parent | 66f0547ebfbc253a045ca10800bea6dae7e71297 (diff) | |
download | gtk+-7c29847fbf0922c4615615ca821410590ab5abe6.tar.gz |
build: Install the API references
We are building them, but not installing them.
-rw-r--r-- | docs/reference/gdk/meson.build | 6 | ||||
-rw-r--r-- | docs/reference/gsk/meson.build | 2 | ||||
-rw-r--r-- | docs/reference/gtk/meson.build | 2 | ||||
-rw-r--r-- | 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') |