[spice-gtk,2/2] meson: use gtk-doc --rebuild-types

Submitted by Frediano Ziglio on July 8, 2019, noon

Details

Message ID 20190708120016.27270-3-fziglio@redhat.com
State Accepted
Headers show
Series "Drop autotools" ( rev: 2 1 ) in Spice

Not browsing as part of any series.

Commit Message

Frediano Ziglio July 8, 2019, noon
From: Marc-André Lureau <marcandre.lureau@redhat.com>

Since gtk-doc 1.8, no need to maintain a types file!

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 doc/reference/meson.build     |  2 +-
 doc/reference/spice-gtk.types | 49 -----------------------------------
 2 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 doc/reference/spice-gtk.types

Patch hide | download patch | download mbox

diff --git a/doc/reference/meson.build b/doc/reference/meson.build
index c1abeb98..e0005f06 100644
--- a/doc/reference/meson.build
+++ b/doc/reference/meson.build
@@ -47,7 +47,6 @@  docpath = join_paths(spice_gtk_datadir, 'gtk-doc', 'html')
 gnome.gtkdoc(meson.project_name(),
              dependencies : spice_gtk_doc_dep,
              main_xml : meson.project_name() + '-docs.xml',
-             gobject_typesfile : meson.project_name() + '.types',
              ignore_headers : ignore_headers,
              include_directories: spice_gtk_include,
              c_args : '-DSPICE_COMPILATION',
@@ -55,6 +54,7 @@  gnome.gtkdoc(meson.project_name(),
              scan_args : [
                '--deprecated-guards="SPICE_DISABLE_DEPRECATED"',
                '--ignore-decorators="G_GNUC_INTERNAL"',
+               '--rebuild-types',
                join_paths(meson.build_root(), 'src', 'spice-version.h')
              ],
              src_dir : join_paths(meson.source_root(), 'src'),
diff --git a/doc/reference/spice-gtk.types b/doc/reference/spice-gtk.types
deleted file mode 100644
index e14ae1b5..00000000
--- a/doc/reference/spice-gtk.types
+++ /dev/null
@@ -1,49 +0,0 @@ 
-#include "spice-audio.h"
-#include "spice-client.h"
-#include "spice-types.h"
-#include "spice-session.h"
-#include "spice-channel.h"
-#include "spice-glib-enums.h"
-#include "spice-util.h"
-#include "channel-main.h"
-#include "channel-display.h"
-#include "channel-cursor.h"
-#include "channel-inputs.h"
-#include "channel-playback.h"
-#include "channel-record.h"
-#include "channel-smartcard.h"
-#include "channel-usbredir.h"
-#include "channel-webdav.h"
-#include "spice-gtk-session.h"
-#include "spice-widget.h"
-#include "spice-grabsequence.h"
-#include "smartcard-manager.h"
-#include "usb-device-manager.h"
-#include "usb-device-widget.h"
-#include "spice-file-transfer-task.h"
-
-spice_audio_get_type
-spice_channel_event_get_type
-spice_channel_get_type
-spice_cursor_channel_get_type
-spice_display_channel_get_type
-spice_display_get_type
-spice_grab_sequence_get_type
-spice_gtk_session_get_type
-spice_inputs_channel_get_type
-spice_inputs_lock_get_type
-spice_main_channel_get_type
-spice_playback_channel_get_type
-spice_record_channel_get_type
-spice_session_get_type
-spice_session_verify_get_type
-spice_smartcard_channel_get_type
-spice_smartcard_manager_get_type
-spice_session_verify_get_type
-spice_usbredir_channel_get_type
-spice_usb_device_get_type
-spice_usb_device_manager_get_type
-spice_usb_device_widget_get_type
-spice_port_channel_get_type
-spice_webdav_channel_get_type
-spice_file_transfer_task_get_type