diff options
| author | Gary Kramlich <grim@reaperworld.com> | 2021-01-02 18:52:11 -0600 |
|---|---|---|
| committer | Gary Kramlich <grim@reaperworld.com> | 2021-01-02 18:52:11 -0600 |
| commit | 6fe05d5ee39ba841231ba1bbcc0d6be457b33c23 (patch) | |
| tree | 9f7159e74f02283fff0d33b2bb47d784aaeaa4f2 /doc | |
| parent | 58fee9d94309547dc9d10ac80e9471bfa5c37a5e (diff) | |
| download | pidgin-6fe05d5ee39ba841231ba1bbcc0d6be457b33c23.tar.gz | |
Add extra-dir options for gtkdoc-fixxref to correctly link to other gtkdoc books
Testing Done:
Verified that the "Missing Link" warnings are no longer present when dependencies are already installed on the system as well as when they are built as subprojects.
Reviewed at https://reviews.imfreedom.org/r/319/
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/finch/meson.build | 7 | ||||
| -rw-r--r-- | doc/reference/libpurple/meson.build | 6 | ||||
| -rw-r--r-- | doc/reference/pidgin/meson.build | 8 | ||||
| -rw-r--r-- | doc/reference/protocols/facebook/meson.build | 6 |
4 files changed, 27 insertions, 0 deletions
diff --git a/doc/reference/finch/meson.build b/doc/reference/finch/meson.build index f5cb759cc3..4a371fd5ec 100644 --- a/doc/reference/finch/meson.build +++ b/doc/reference/finch/meson.build @@ -18,6 +18,12 @@ mkdb_args = [ '--ignore-files=' + ' '.join(ignore_hfiles), ] +# Extra options to supply to fixxrefs +fixxref_args = [ + '--extra-dir=@0@'.format(libgnt_docpath), + '--extra-dir=../libpurple', +] + configure_file( input : 'version.xml.in', output : 'version.xml', @@ -30,4 +36,5 @@ finch_doc = gnome.gtkdoc(DOC_MODULE, install : true, scan_args : scan_args, mkdb_args : mkdb_args, + fixxref_args : fixxref_args, gobject_typesfile : DOC_MODULE + '.types') diff --git a/doc/reference/libpurple/meson.build b/doc/reference/libpurple/meson.build index f8561827ad..9b816394d4 100644 --- a/doc/reference/libpurple/meson.build +++ b/doc/reference/libpurple/meson.build @@ -28,6 +28,11 @@ mkdb_args = [ '--ignore-files=' + ' '.join(ignore_hfiles), ] +# Extra options to supply to gtkdoc-fixxref +fixxref_args = [ + '--extra-dir=@0@'.format(gplugin_docpath), +] + libpurple_version_xml = configure_file( input : 'version.xml.in', output : 'version.xml', @@ -62,5 +67,6 @@ libpurple_doc = gnome.gtkdoc(DOC_MODULE, install : true, scan_args : scan_args, mkdb_args : mkdb_args, + fixxref_args: fixxref_args, gobject_typesfile : DOC_MODULE + '.types', content_files : content_files) diff --git a/doc/reference/pidgin/meson.build b/doc/reference/pidgin/meson.build index c756509d91..58fac6df21 100644 --- a/doc/reference/pidgin/meson.build +++ b/doc/reference/pidgin/meson.build @@ -23,6 +23,13 @@ mkdb_args = [ '--ignore-files=' + ' '.join(ignore_hfiles), ] +# Extra options to supply to fixxref +fixxref_args = [ + '--extra-dir=@0@'.format(gplugin_gtk_docpath), + '--extra-dir=@0@'.format(talkatu_docpath), + '--extra-dir=../libpurple', +] + configure_file( input : 'version.xml.in', output : 'version.xml', @@ -43,5 +50,6 @@ pidgin_doc = gnome.gtkdoc(DOC_MODULE, install : true, scan_args : scan_args, mkdb_args : mkdb_args, + fixxref_args : fixxref_args, gobject_typesfile : DOC_MODULE + '.types', content_files : content_files) diff --git a/doc/reference/protocols/facebook/meson.build b/doc/reference/protocols/facebook/meson.build index 95382c7116..6cb31d382a 100644 --- a/doc/reference/protocols/facebook/meson.build +++ b/doc/reference/protocols/facebook/meson.build @@ -12,6 +12,11 @@ scan_args = [ '--ignore-headers=' + ' '.join(ignore_hfiles), ] +# Extra options to supply to fixxref +fixxref_args = [ + '--extra-dir=../../libpurple', +] + # Extra SGML files that are included by $(DOC_MAIN_XML_FILE). content_files = [ libpurple_version_xml, @@ -23,5 +28,6 @@ facebook_doc = gnome.gtkdoc(DOC_MODULE, dependencies : facebook_dep, install : true, scan_args : scan_args, + fixxref_args : fixxref_args, gobject_typesfile : DOC_MODULE + '.types', content_files : content_files) |