meson: Fix gtkdoc using new meson features

diff --git a/docs/gst/meson.build b/docs/gst/meson.build
index 605f6e1..026cd5e 100644 (file)
--- a/docs/gst/meson.build
+++ b/docs/gst/meson.build
@@ -1,4 +1,4 @@
-configure_file(input : 'gstreamer.types.in',
+types = configure_file(input : 'gstreamer.types.in',
   output : 'gstreamer.types',
   configuration : configuration_data())
 
@@ -9,4 +9,8 @@ gnome.gtkdoc('gstreamer',
             '--ignore-decorators=GST_EXPORT',
             '--ignore-headers=gettext.h glib-compat-private.h glib-compat.h gst-i18n-app.h gst-i18n-lib.h gst_private.h gstelementdetails.h gstmacros.h grammar.tab.h grammar.tab.pre.h math-compat.h types.h'
             ],
+  scanobj_args : ['--type-init-func="gst_init(NULL,NULL)'],
+  gobject_typesfile : types,
+  dependencies : [gst_dep],
+  content_files: ['building.xml', 'running.xml', version_entities],
   install : true)

diff --git a/docs/libs/meson.build b/docs/libs/meson.build
index e127854..35c33ad 100644 (file)
--- a/docs/libs/meson.build
+++ b/docs/libs/meson.build
@@ -1,4 +1,4 @@
-configure_file(input : 'gstreamer-libs.types',
+types = configure_file(input : 'gstreamer-libs.types',
   output : 'gstreamer-libs.types',
   configuration : configuration_data())
 
@@ -9,4 +9,8 @@ gnome.gtkdoc('gstreamer-libs',
             '--ignore-decorators=GST_EXPORT',
             '--ignore-headers=gettext.h glib-compat-private.h glib-compat.h gst-i18n-app.h gst-i18n-lib.h gst_private.h gstelementdetails.h gstmacros.h grammar.tab.h grammar.tab.pre.h math-compat.h types.h'
             ],
+  scanobj_args : ['--type-init-func="gst_init(NULL,NULL)'],
+  gobject_typesfile : types,
+  content_files : [version_entities],
+  dependencies : [gst_base_dep, gst_check_dep,  gst_controller_dep, gst_net_dep],
   install : true)

diff --git a/docs/meson.build b/docs/meson.build
index d9ba333..6b6a479 100644 (file)
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -4,7 +4,7 @@ docconf.set('GST_API_VERSION', apiversion)
 docconf.set('PACKAGE_VERSION', gst_version)
 docconf.set('PLUGINDIR', '@0@/lib/gstreamer-1.0'.format(get_option('prefix')))
 
-configure_file(input : 'version.entities.in',
+version_entities = configure_file(input : 'version.entities.in',
   output : 'version.entities',
   configuration : docconf)