diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | autogen.sh | 9 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | docs/.gitignore | 8 | ||||
| -rw-r--r-- | docs/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/README | 8 | ||||
| -rw-r--r-- | docs/libempathy-gtk/.gitignore | 6 | ||||
| -rw-r--r-- | docs/libempathy-gtk/Makefile.am | 60 | ||||
| -rw-r--r-- | docs/libempathy-gtk/libempathy-gtk-docs.sgml | 76 | ||||
| -rw-r--r-- | docs/libempathy-gtk/libempathy-gtk.types | 37 | ||||
| -rw-r--r-- | docs/libempathy-gtk/version.xml.in | 1 | ||||
| -rw-r--r-- | docs/libempathy/.gitignore | 6 | ||||
| -rw-r--r-- | docs/libempathy/Makefile.am | 59 | ||||
| -rw-r--r-- | docs/libempathy/libempathy-docs.sgml | 72 | ||||
| -rw-r--r-- | docs/libempathy/libempathy.types | 41 | ||||
| -rw-r--r-- | docs/libempathy/version.xml.in | 1 |
16 files changed, 1 insertions, 394 deletions
diff --git a/Makefile.am b/Makefile.am index 3ce04575..3f0d4b87 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = tools extensions po data libempathy libempathy-gtk src docs help +SUBDIRS = tools extensions po data libempathy libempathy-gtk src help if HAVE_NST SUBDIRS += nautilus-sendto-plugin @@ -13,15 +13,6 @@ REQUIRED_AUTOMAKE_VERSION=1.9 exit 1 } -# Fix to make shave + libtool 1.x + gtk-doc work. -# See http://git.lespiau.name/cgit/shave/tree/README#n83 -sed -e 's#) --mode=compile#) --tag=CC --mode=compile#' gtk-doc.make \ - > gtk-doc.temp \ - && mv gtk-doc.temp gtk-doc.make -sed -e 's#) --mode=link#) --tag=CC --mode=link#' gtk-doc.make \ - > gtk-doc.temp \ - && mv gtk-doc.temp gtk-doc.make - which gnome-autogen.sh || { echo "You need to install gnome-common from the GNOME CVS" exit 1 diff --git a/configure.ac b/configure.ac index fbe89844..18536b1c 100644 --- a/configure.ac +++ b/configure.ac @@ -67,7 +67,6 @@ AM_PROG_MKDIR_P AM_PATH_GLIB_2_0 AC_PATH_XTRA IT_PROG_INTLTOOL([0.35.0]) -GTK_DOC_CHECK([1.3]) GNOME_DOC_INIT([0.17.3]) IDT_COMPILE_WARNINGS AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool) @@ -427,11 +426,6 @@ AC_OUTPUT([ libempathy-gtk/libempathy-gtk.pc src/Makefile nautilus-sendto-plugin/Makefile - docs/Makefile - docs/libempathy/Makefile - docs/libempathy/version.xml - docs/libempathy-gtk/Makefile - docs/libempathy-gtk/version.xml help/Makefile tests/Makefile tests/xml/Makefile @@ -462,6 +456,5 @@ Configure summary: ConnMan integration.........: ${have_connman} Extras: - Documentation...............: ${enable_gtk_doc} Nautilus-sendto plugin......: ${have_nst} " diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index a7316fb1..00000000 --- a/docs/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -html -xml -tmpl -*.txt -*.stamp - -version.xml - diff --git a/docs/Makefile.am b/docs/Makefile.am deleted file mode 100644 index 2053a456..00000000 --- a/docs/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = libempathy libempathy-gtk - diff --git a/docs/README b/docs/README deleted file mode 100644 index 609b8146..00000000 --- a/docs/README +++ /dev/null @@ -1,8 +0,0 @@ -To be sure the doc is up to date: - -1) Update libempathy.types -empathy/libempathy$ grep _get_type *.h | grep GType | awk '{ print $2 }' - -2) Update libempathy-docs.sgml -empathy$ make -empathy/doc/libempathy$ for f in `ls -l xml/*.xml | awk '{ print $8 }'`; do echo " <xi:include href=\"$f\"/>"; done diff --git a/docs/libempathy-gtk/.gitignore b/docs/libempathy-gtk/.gitignore deleted file mode 100644 index 51f58163..00000000 --- a/docs/libempathy-gtk/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -libempathy-gtk.args -libempathy-gtk.hierarchy -libempathy-gtk.interfaces -libempathy-gtk.prerequisites -libempathy-gtk.signals - diff --git a/docs/libempathy-gtk/Makefile.am b/docs/libempathy-gtk/Makefile.am deleted file mode 100644 index 14e7396f..00000000 --- a/docs/libempathy-gtk/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -NULL = - -AUTOMAKE_OPTIONS = 1.6 - -# The name of the module. -DOC_MODULE=libempathy-gtk - -# The top-level SGML file. -DOC_MAIN_SGML_FILE=libempathy-gtk-docs.sgml - -# Extra options to supply to gtkdoc-scan -SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" -SCANGOBJ_OPTIONS=--type-init-func="g_type_init();g_thread_init(NULL);" - -# The directory containing the source code. Relative to $(srcdir) -DOC_SOURCE_DIR=$(top_srcdir)/libempathy-gtk - -HFILE_GLOB=$(top_srcdir)/libempathy-gtk/*.h -CFILE_GLOB=$(top_srcdir)/libempathy-gtk/*.c - -# Headers to ignore -IGNORE_HFILES= \ - empathy-gtk-enum-types.h \ - stamp-empathy-gtk-enum-types.h \ - ephy-spinner.h \ - totem-subtitle-encoding.h \ - $(NULL) - -# CFLAGS and LDFLAGS for compiling scan program. Only needed -# if $(DOC_MODULE).types is non-empty. -GTKDOC_CFLAGS = \ - -I$(srcdir) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/libempathy-gtk \ - -I$(top_builddir) \ - -I$(top_builddir)/libempathy-gtk \ - $(EMPATHY_CFLAGS) \ - $(NULL) - -GTKDOC_LIBS = \ - $(top_builddir)/libempathy-gtk/libempathy-gtk.la \ - $(top_builddir)/libempathy/libempathy.la \ - $(EMPATHY_LIBS) \ - $(NULL) - -# Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS = --output-format=xml --sgml-mode - -# Images to copy into HTML directory -HTML_IMAGES = - -content_files = \ - version.xml - -extra_files = version.xml.in - -include $(top_srcdir)/gtk-doc.make - -EXTRA_DIST += \ - version.xml.in diff --git a/docs/libempathy-gtk/libempathy-gtk-docs.sgml b/docs/libempathy-gtk/libempathy-gtk-docs.sgml deleted file mode 100644 index cf44dde2..00000000 --- a/docs/libempathy-gtk/libempathy-gtk-docs.sgml +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ -<!ENTITY version SYSTEM "version.xml"> -]> -<book lang="en" id="libempathy-gtk" xmlns:xi="http://www.w3.org/2003/XInclude"> - <title>libempathy-gtk Reference Manual</title> - <bookinfo> - <title>libempathy-gtk Reference Manual</title> - <releaseinfo>for libempathy-gtk &version;</releaseinfo> - </bookinfo> - <part> - <title>libempathy-gtk Overview</title> - </part> - <part> - <title>API Reference</title> - <chapter id="libempathy_api"> - <title>libempathy-gtk API reference</title> - <xi:include href="xml/api-index-deprecated.xml"/> - <xi:include href="xml/api-index-full.xml"/> - <xi:include href="xml/empathy-account-chooser.xml"/> - <xi:include href="xml/empathy-account-widget-irc.xml"/> - <xi:include href="xml/empathy-account-widget-private.xml"/> - <xi:include href="xml/empathy-account-widget-sip.xml"/> - <xi:include href="xml/empathy-account-widget.xml"/> - <xi:include href="xml/empathy-audio-sink.xml"/> - <xi:include href="xml/empathy-audio-src.xml"/> - <xi:include href="xml/empathy-avatar-chooser.xml"/> - <xi:include href="xml/empathy-avatar-image.xml"/> - <xi:include href="xml/empathy-cell-renderer-activatable.xml"/> - <xi:include href="xml/empathy-cell-renderer-expander.xml"/> - <xi:include href="xml/empathy-cell-renderer-text.xml"/> - <xi:include href="xml/empathy-chat-text-view.xml"/> - <xi:include href="xml/empathy-chat-view.xml"/> - <xi:include href="xml/empathy-chat.xml"/> - <xi:include href="xml/empathy-conf.xml"/> - <xi:include href="xml/empathy-contact-dialogs.xml"/> - <xi:include href="xml/empathy-contact-list-store.xml"/> - <xi:include href="xml/empathy-contact-list-view.xml"/> - <xi:include href="xml/empathy-contact-menu.xml"/> - <xi:include href="xml/empathy-contact-selector.xml"/> - <xi:include href="xml/empathy-contact-widget.xml"/> - <xi:include href="xml/empathy-geometry.xml"/> - <xi:include href="xml/empathy-images.xml"/> - <xi:include href="xml/empathy-irc-network-dialog.xml"/> - <xi:include href="xml/empathy-kludge-label.xml"/> - <xi:include href="xml/empathy-location-manager.xml"/> - <xi:include href="xml/empathy-log-window.xml"/> - <xi:include href="xml/empathy-new-message-dialog.xml"/> - <xi:include href="xml/empathy-plist.xml"/> - <xi:include href="xml/empathy-presence-chooser.xml"/> - <xi:include href="xml/empathy-protocol-chooser.xml"/> - <xi:include href="xml/empathy-share-my-desktop.xml"/> - <xi:include href="xml/empathy-smiley-manager.xml"/> - <xi:include href="xml/empathy-sound.xml"/> - <xi:include href="xml/empathy-spell.xml"/> - <xi:include href="xml/empathy-status-preset-dialog.xml"/> - <xi:include href="xml/empathy-theme-adium.xml"/> - <xi:include href="xml/empathy-theme-boxes.xml"/> - <xi:include href="xml/empathy-theme-irc.xml"/> - <xi:include href="xml/empathy-theme-manager.xml"/> - <xi:include href="xml/empathy-ui-utils.xml"/> - <xi:include href="xml/empathy-video-src.xml"/> - <xi:include href="xml/empathy-video-widget.xml"/> - </chapter> - </part> - - <chapter id="libempathy-gtk-hierarchy"> - <title>Object Hierarchy</title> - <xi:include href="xml/tree_index.sgml"/> - </chapter> - - <index> - <title id="index-all">Index</title> - </index> -</book> diff --git a/docs/libempathy-gtk/libempathy-gtk.types b/docs/libempathy-gtk/libempathy-gtk.types deleted file mode 100644 index 65842bc8..00000000 --- a/docs/libempathy-gtk/libempathy-gtk.types +++ /dev/null @@ -1,37 +0,0 @@ -empathy_account_chooser_get_type -empathy_account_widget_get_type -empathy_audio_sink_get_type -empathy_audio_src_get_type -empathy_avatar_chooser_get_type -empathy_avatar_image_get_type -empathy_cell_renderer_activatable_get_type -empathy_cell_renderer_expander_get_type -empathy_cell_renderer_text_get_type -empathy_chat_get_type -empathy_chat_text_view_get_type -empathy_chat_view_get_type -empathy_conf_get_type -empathy_contact_list_store_get_type -empathy_contact_list_view_get_type -empathy_contact_selector_get_type -empathy_contact_list_store_sort_get_type -empathy_contact_list_store_col_get_type -empathy_contact_list_feature_flags_get_type -empathy_contact_feature_flags_get_type -empathy_contact_widget_flags_get_type -empathy_gst_video_src_channel_get_type -empathy_sound_get_type -empathy_kludge_label_get_type -empathy_location_manager_get_type -empathy_presence_chooser_get_type -empathy_protocol_chooser_get_type -empathy_smiley_manager_get_type -empathy_status_preset_dialog_get_type -empathy_theme_adium_get_type -empathy_adium_data_get_type -empathy_theme_boxes_get_type -empathy_theme_irc_get_type -empathy_theme_manager_get_type -empathy_video_src_get_type -empathy_video_widget_get_type - diff --git a/docs/libempathy-gtk/version.xml.in b/docs/libempathy-gtk/version.xml.in deleted file mode 100644 index d78bda93..00000000 --- a/docs/libempathy-gtk/version.xml.in +++ /dev/null @@ -1 +0,0 @@ -@VERSION@ diff --git a/docs/libempathy/.gitignore b/docs/libempathy/.gitignore deleted file mode 100644 index 0a5b4cab..00000000 --- a/docs/libempathy/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -libempathy.args -libempathy.hierarchy -libempathy.interfaces -libempathy.prerequisites -libempathy.signals - diff --git a/docs/libempathy/Makefile.am b/docs/libempathy/Makefile.am deleted file mode 100644 index 3c7b99ee..00000000 --- a/docs/libempathy/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -NULL = - -AUTOMAKE_OPTIONS = 1.6 - -# The name of the module. -DOC_MODULE=libempathy - -# The top-level SGML file. -DOC_MAIN_SGML_FILE=libempathy-docs.sgml - -# Extra options to supply to gtkdoc-scan -SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" - -# The directory containing the source code. Relative to $(srcdir) -DOC_SOURCE_DIR=$(top_srcdir)/libempathy - -HFILE_GLOB=$(top_srcdir)/libempathy/*.h -CFILE_GLOB=$(top_srcdir)/libempathy/*.c - -# Headers to ignore -IGNORE_HFILES= \ - empathy-filter-glue.h \ - empathy-debug.h \ - empathy-marshal.h \ - stamp-empathy-enum-types.h \ - empathy-chandler-glue.h \ - $(NULL) - -# CFLAGS and LDFLAGS for compiling scan program. Only needed -# if $(DOC_MODULE).types is non-empty. -GTKDOC_CFLAGS = \ - -I$(srcdir) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/libempathy \ - -I$(top_builddir) \ - -I$(top_builddir)/libempathy \ - $(LIBEMPATHY_CFLAGS) \ - $(NULL) - -GTKDOC_LIBS = \ - $(top_builddir)/libempathy/libempathy.la \ - $(LIBEMPATHY_LIBS) \ - $(NULL) - -# Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS = --output-format=xml --sgml-mode - -# Images to copy into HTML directory -HTML_IMAGES = - -content_files = \ - version.xml - -extra_files = version.xml.in - -include $(top_srcdir)/gtk-doc.make - -EXTRA_DIST += \ - version.xml.in diff --git a/docs/libempathy/libempathy-docs.sgml b/docs/libempathy/libempathy-docs.sgml deleted file mode 100644 index 6465e23c..00000000 --- a/docs/libempathy/libempathy-docs.sgml +++ /dev/null @@ -1,72 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" - "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ -<!ENTITY version SYSTEM "version.xml"> -]> -<book lang="en" id="libempathy" xmlns:xi="http://www.w3.org/2003/XInclude"> - <title>libempathy Reference Manual</title> - <bookinfo> - <title>libempathy Reference Manual</title> - <releaseinfo>for libempathy &version;</releaseinfo> - </bookinfo> - <part> - <title>libempathy Overview</title> - </part> - <part> - <title>API Reference</title> - <chapter id="libempathy_api"> - <title>libempathy API reference</title> - <xi:include href="xml/api-index-deprecated.xml"/> - <xi:include href="xml/api-index-full.xml"/> - <xi:include href="xml/empathy-account-manager.xml"/> - <xi:include href="xml/empathy-account-settings.xml"/> - <xi:include href="xml/empathy-account.xml"/> - <xi:include href="xml/empathy-call-factory.xml"/> - <xi:include href="xml/empathy-call-handler.xml"/> - <xi:include href="xml/empathy-chatroom-manager.xml"/> - <xi:include href="xml/empathy-chatroom.xml"/> - <xi:include href="xml/empathy-connection-managers.xml"/> - <xi:include href="xml/empathy-connectivity.xml"/> - <xi:include href="xml/empathy-contact-groups.xml"/> - <xi:include href="xml/empathy-contact-list.xml"/> - <xi:include href="xml/empathy-contact-manager.xml"/> - <xi:include href="xml/empathy-contact-monitor.xml"/> - <xi:include href="xml/empathy-contact.xml"/> - <xi:include href="xml/empathy-debugger.xml"/> - <xi:include href="xml/empathy-dispatcher.xml"/> - <xi:include href="xml/empathy-dispatch-operation.xml"/> - <xi:include href="xml/empathy-enum-types.xml"/> - <xi:include href="xml/empathy-ft-factory.xml"/> - <xi:include href="xml/empathy-ft-handler.xml"/> - <xi:include href="xml/empathy-idle.xml"/> - <xi:include href="xml/empathy-irc-network-manager.xml"/> - <xi:include href="xml/empathy-irc-network.xml"/> - <xi:include href="xml/empathy-irc-server.xml"/> - <xi:include href="xml/empathy-location.xml"/> - <xi:include href="xml/empathy-log-manager.xml"/> - <xi:include href="xml/empathy-log-store-empathy.xml"/> - <xi:include href="xml/empathy-log-store.xml"/> - <xi:include href="xml/empathy-message.xml"/> - <xi:include href="xml/empathy-status-presets.xml"/> - <xi:include href="xml/empathy-time.xml"/> - <xi:include href="xml/empathy-tp-call.xml"/> - <xi:include href="xml/empathy-tp-chat.xml"/> - <xi:include href="xml/empathy-tp-contact-factory.xml"/> - <xi:include href="xml/empathy-tp-contact-list.xml"/> - <xi:include href="xml/empathy-tp-file.xml"/> - <xi:include href="xml/empathy-tp-roomlist.xml"/> - <xi:include href="xml/empathy-tube-handler.xml"/> - <xi:include href="xml/empathy-types.xml"/> - <xi:include href="xml/empathy-utils.xml"/> - </chapter> - </part> - - <chapter id="libempathy-hierarchy"> - <title>Object Hierarchy</title> - <xi:include href="xml/tree_index.sgml"/> - </chapter> - - <index> - <title id="index-all">Index</title> - </index> -</book> diff --git a/docs/libempathy/libempathy.types b/docs/libempathy/libempathy.types deleted file mode 100644 index 0ddb7f5b..00000000 --- a/docs/libempathy/libempathy.types +++ /dev/null @@ -1,41 +0,0 @@ -empathy_account_get_type -empathy_account_manager_get_type -empathy_account_settings_get_type -empathy_call_factory_get_type -empathy_call_handler_get_type -empathy_chatroom_get_type -empathy_chatroom_manager_get_type -empathy_connection_managers_get_type -empathy_connectivity_get_type -empathy_contact_get_type -empathy_avatar_get_type -empathy_contact_list_get_type -empathy_contact_manager_get_type -empathy_contact_monitor_get_type -empathy_debugger_get_type -empathy_dispatcher_get_type -empathy_dispatch_operation_get_type -empathy_capabilities_get_type -empathy_contact_list_flags_get_type -empathy_debug_flags_get_type -empathy_dispatch_operation_state_get_type -empathy_tp_call_status_get_type -empathy_ft_error_enum_get_type -empathy_ft_factory_get_type -empathy_ft_handler_get_type -empathy_idle_get_type -empathy_irc_network_get_type -empathy_irc_network_manager_get_type -empathy_irc_server_get_type -empathy_log_manager_get_type -empathy_log_store_empathy_get_type -empathy_log_store_get_type -empathy_message_get_type -empathy_tp_call_get_type -empathy_tp_chat_get_type -empathy_tp_contact_factory_get_type -empathy_tp_contact_list_get_type -empathy_tp_file_get_type -empathy_tp_roomlist_get_type -empathy_tube_handler_get_type - diff --git a/docs/libempathy/version.xml.in b/docs/libempathy/version.xml.in deleted file mode 100644 index d78bda93..00000000 --- a/docs/libempathy/version.xml.in +++ /dev/null @@ -1 +0,0 @@ -@VERSION@ |