From 124779be88a3b5be9d0815b0f5604401735879ce Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 27 Jun 2018 11:12:01 -0400 Subject: [PATCH] doc: Remove gobject.types since gtkdoc-scan rebuild it anyway I'm not sure why gobject.cI was needed but that looks like hack around old gtkdoc bug. Works fine without it. --- docs/reference/gobject/Makefile.am | 2 +- docs/reference/gobject/gobject.cI | 11 ----------- docs/reference/gobject/gobject.types | 7 ------- docs/reference/gobject/meson.build | 2 +- 4 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 docs/reference/gobject/gobject.cI delete mode 100644 docs/reference/gobject/gobject.types diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am index 430ab6d5f..560d2e81b 100644 --- a/docs/reference/gobject/Makefile.am +++ b/docs/reference/gobject/Makefile.am @@ -13,6 +13,7 @@ DOC_SOURCE_DIR =$(top_srcdir)/gobject $(top_builddir)/gobject # Extra options to supply to gtkdoc-scan SCAN_OPTIONS = \ + --rebuild-types \ --deprecated-guards="G_DISABLE_DEPRECATED" \ --ignore-decorators="GLIB_VAR|G_GNUC_INTERNAL|G_GNUC_WARN_UNUSED_RESULT|GLIB_AVAILABLE_IN_ALL|GLIB_AVAILABLE_IN_2_26|GLIB_AVAILABLE_IN_2_28|GLIB_AVAILABLE_IN_2_30|GLIB_AVAILABLE_IN_2_32|GLIB_AVAILABLE_IN_2_34|GLIB_AVAILABLE_IN_2_36|GLIB_AVAILABLE_IN_2_38|GLIB_AVAILABLE_IN_2_40|GLIB_AVAILABLE_IN_2_42|GLIB_AVAILABLE_IN_2_44|GLIB_AVAILABLE_IN_2_46|GLIB_AVAILABLE_IN_2_48|GLIB_AVAILABLE_IN_2_50|GLIB_AVAILABLE_IN_2_52|GLIB_AVAILABLE_IN_2_54|GLIB_AVAILABLE_IN_2_56|GLIB_DEPRECATED_IN_2_26|GLIB_DEPRECATED_IN_2_26_FOR|GLIB_DEPRECATED_IN_2_28|GLIB_DEPRECATED_IN_2_28_FOR|GLIB_DEPRECATED_IN_2_30|GLIB_DEPRECATED_IN_2_30_FOR|GLIB_DEPRECATED_IN_2_32|GLIB_DEPRECATED_IN_2_32_FOR|GLIB_DEPRECATED_IN_2_34|GLIB_DEPRECATED_IN_2_34_FOR|GLIB_DEPRECATED_IN_2_36|GLIB_DEPRECATED_IN_2_36_FOR|GLIB_DEPRECATED_IN_2_38|GLIB_DEPRECATED_IN_2_38_FOR|GLIB_DEPRECATED_IN_2_40|GLIB_DEPRECATED_IN_2_40_FOR|GLIB_DEPRECATED_IN_2_42|GLIB_DEPRECATED_IN_2_42_FOR|GLIB_DEPRECATED_IN_2_44|GLIB_DEPRECATED_IN_2_44_FOR|GLIB_DEPRECATED_IN_2_46|GLIB_DEPRECATED_IN_2_46_FOR|GLIB_DEPRECATED_IN_2_48|GLIB_DEPRECATED_IN_2_48_FOR|GLIB_DEPRECATED_IN_2_50|GLIB_DEPRECATED_IN_2_50_FOR|GLIB_DEPRECATED_IN_2_52|GLIB_DEPRECATED_IN_2_52_FOR|GLIB_DEPRECATED_IN_2_54|GLIB_DEPRECATED_IN_2_54_FOR|GLIB_DEPRECATED_IN_2_56|GLIB_DEPRECATED_IN_2_56_FOR" @@ -64,7 +65,6 @@ include $(top_srcdir)/gtk-doc.make # Other files to distribute EXTRA_DIST += \ - gobject.cI \ version.xml.in ######################################################################## diff --git a/docs/reference/gobject/gobject.cI b/docs/reference/gobject/gobject.cI deleted file mode 100644 index 2976940e3..000000000 --- a/docs/reference/gobject/gobject.cI +++ /dev/null @@ -1,11 +0,0 @@ -/* - * This is a hack to work around a limitation of gtkdoc-scan: it insists - * on putting () behind every symbol listed in gobject.types. Thus we - * can't put G_TYPE_OBJECT there, but have to sneak a g_object_get_type() - * function in the generated source via an #include. - */ -GType -g_object_get_type (void) -{ - return G_TYPE_OBJECT; -} diff --git a/docs/reference/gobject/gobject.types b/docs/reference/gobject/gobject.types deleted file mode 100644 index bb4e7b875..000000000 --- a/docs/reference/gobject/gobject.types +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include "gobject.cI" - -g_binding_get_type -g_object_get_type -g_type_module_get_type -g_type_plugin_get_type diff --git a/docs/reference/gobject/meson.build b/docs/reference/gobject/meson.build index de46cf96d..ac2da57d9 100644 --- a/docs/reference/gobject/meson.build +++ b/docs/reference/gobject/meson.build @@ -77,12 +77,12 @@ if get_option('gtk_doc') gnome.gtkdoc('gobject', main_xml : 'gobject-docs.xml', namespace : 'g', - gobject_typesfile : join_paths(meson.current_source_dir(), 'gobject.types'), mode : 'none', dependencies : [libgobject_dep, libglib_dep], include_directories : [gtkdocincl], src_dir : 'gobject', scan_args : [ + '--rebuild-types', '--deprecated-guards=G_DISABLE_DEPRECATED', '--ignore-decorators=' + '|'.join(ignore_decorators), '--ignore-headers=' + ' '.join(ignore_headers),