Revert "Fhotdoc"

This reverts commit 220618ecc7c061a2146e00e0063123b8dbaeb734.

This was not meant to be pushed.

diff --git a/docs/hotdoc/index.md b/docs/hotdoc/index.md
index 9464d2d..cbfb174 100644 (file)
--- a/docs/hotdoc/index.md
+++ b/docs/hotdoc/index.md
@@ -36,7 +36,7 @@ editing-related applications.
 ### Timeline and TimelinePipeline
 
 The most top-level object encapsulating every other object is the
-[GESTimeline](GESTimeline). It is the central object for any editing project.
+#GESTimeline. It is the central object for any editing project.
 
 The `GESTimeline` is a `GstElement`. It can therefore be used in any
 GStreamer pipeline like any other object.
@@ -61,4 +61,4 @@ The GESTimeline can contain two types of objects (seen in
 
 In order to reduce even more the amount of GStreamer interaction the
 application developer has to deal with, a convenience GstPipeline has
-been made available specifically for Timelines : [GESPipeline](GESPipeline).
+been made available specifically for Timelines : #GESPipeline.

diff --git a/docs/hotdoc/meson.build b/docs/hotdoc/meson.build
index e0a4403..2022769 100644 (file)
--- a/docs/hotdoc/meson.build
+++ b/docs/hotdoc/meson.build
@@ -1,17 +1,13 @@
 ges_excludes = []
-foreach f: ['gesmarshal.*',
-            'ges-internal.*',
-            'ges-auto-transition.*',
-            'ges-structured-interface.*',
-            'ges-structure-parser.*',
-            'ges-smart-*.',
-            'gstframepositioner.*',
-            'lex.priv_ges_parse_yy.c']
+foreach f: ['gesmarshal.h', 'ges-internal.h', 'ges-auto-transition.[ch]',
+            'ges-structured-interface.[ch]', 'ges-structure-parser.[ch]',
+            'ges-smart-video-mixer.[ch]', 'gstframepositioner.[ch]',
+            'ges/lex.priv_ges_parse_yy.c']
     ges_excludes += [join_paths(meson.current_source_dir(), '..', '..', 'ges', f)]
 endforeach
 
 hotdoc = import('hotdoc')
-gst_editing_services_doc = hotdoc.generate_doc('gst-editing-services',
+gst_editin_services_doc = hotdoc.generate_doc('gst-editing-services',
     project_version: apiversion,
     extra_assets: [join_paths(meson.current_source_dir(), 'images')],
     c_sources: ['../../ges/ges.h', '../../ges/*.[hc]'],

diff --git a/ges/meson.build b/ges/meson.build
index a6971dd..37a19c5 100644 (file)
--- a/ges/meson.build
+++ b/ges/meson.build
@@ -175,7 +175,7 @@ if build_gir
       '-I' + meson.current_build_dir() + '/..',
       '--cflags-end']
     endif
-    ges_gir = gnome.generate_gir(libges,
+    ges_gen_sources += [gnome.generate_gir(libges,
         sources : ges_sources + ges_headers,
         namespace : 'GES',
         nsversion : apiversion,
@@ -186,9 +186,7 @@ if build_gir
         install : true,
         dependencies : libges_deps,
         extra_args : ges_gir_extra_args
-    )
-
-    ges_gen_sources += [ges_gir]
+    )]
 endif
 
 ges_dep = declare_dependency(link_with : libges,

diff --git a/meson.build b/meson.build
index d80c693..9e35fac 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -138,17 +138,15 @@ subdir('pkgconfig')
 subdir('tests')
 subdir('examples')
 
-build_hotdoc = false
 if build_machine.system() == 'windows'
   message('Disabling gtk-doc while building on Windows')
 elif get_option('disable_gtkdoc')
   message('gtk-doc is disabled via options')
 else
-  hotdoc_p = find_program('hotdoc', required : false)
-  if hotdoc_p.found()
+  if find_program('gtkdoc-scan', required : false).found()
     subdir('docs')
   else
-    message('Not building documentation as hotdoc was not found')
+    message('Not building documentation as gtk-doc was not found')
   endif
 endif