udev: move libudev, gudev to src/; move gudev/docs/, udev/docs/ to to docs/

45 files changed, 8 insertions, 619 deletions

diff --git a/src/udev/gudev/.gitignore b/src/gudev/.gitignore
index d20fa523e4..d20fa523e4 100644
--- a/src/udev/gudev/.gitignore
+++ b/src/gudev/.gitignore
diff --git a/src/udev/gudev/gjs-example.js b/src/gudev/gjs-example.js
index 5586fd6a61..5586fd6a61 100755
--- a/src/udev/gudev/gjs-example.js
+++ b/src/gudev/gjs-example.js
diff --git a/src/udev/gudev/gudev-1.0.pc.in b/src/gudev/gudev-1.0.pc.in
index 058262d767..058262d767 100644
--- a/src/udev/gudev/gudev-1.0.pc.in
+++ b/src/gudev/gudev-1.0.pc.in
diff --git a/src/udev/gudev/gudev.h b/src/gudev/gudev.h
index a313460817..a313460817 100644
--- a/src/udev/gudev/gudev.h
+++ b/src/gudev/gudev.h
diff --git a/src/udev/gudev/gudevclient.c b/src/gudev/gudevclient.c
index 2b94102ac5..2b94102ac5 100644
--- a/src/udev/gudev/gudevclient.c
+++ b/src/gudev/gudevclient.c
diff --git a/src/udev/gudev/gudevclient.h b/src/gudev/gudevclient.h
index b425d03d48..b425d03d48 100644
--- a/src/udev/gudev/gudevclient.h
+++ b/src/gudev/gudevclient.h
diff --git a/src/udev/gudev/gudevdevice.c b/src/gudev/gudevdevice.c
index 62a26f99b7..62a26f99b7 100644
--- a/src/udev/gudev/gudevdevice.c
+++ b/src/gudev/gudevdevice.c
diff --git a/src/udev/gudev/gudevdevice.h b/src/gudev/gudevdevice.h
index d4873bad0f..d4873bad0f 100644
--- a/src/udev/gudev/gudevdevice.h
+++ b/src/gudev/gudevdevice.h
diff --git a/src/udev/gudev/gudevenumerator.c b/src/gudev/gudevenumerator.c
index db09074625..db09074625 100644
--- a/src/udev/gudev/gudevenumerator.c
+++ b/src/gudev/gudevenumerator.c
diff --git a/src/udev/gudev/gudevenumerator.h b/src/gudev/gudevenumerator.h
index 3fddccf573..3fddccf573 100644
--- a/src/udev/gudev/gudevenumerator.h
+++ b/src/gudev/gudevenumerator.h
diff --git a/src/udev/gudev/gudevenums.h b/src/gudev/gudevenums.h
index c3a0aa8747..c3a0aa8747 100644
--- a/src/udev/gudev/gudevenums.h
+++ b/src/gudev/gudevenums.h
diff --git a/src/udev/gudev/gudevenumtypes.c.template b/src/gudev/gudevenumtypes.c.template
index fc30b39e2e..fc30b39e2e 100644
--- a/src/udev/gudev/gudevenumtypes.c.template
+++ b/src/gudev/gudevenumtypes.c.template
diff --git a/src/udev/gudev/gudevenumtypes.h.template b/src/gudev/gudevenumtypes.h.template
index d0ab3393e6..d0ab3393e6 100644
--- a/src/udev/gudev/gudevenumtypes.h.template
+++ b/src/gudev/gudevenumtypes.h.template
diff --git a/src/udev/gudev/gudevmarshal.list b/src/gudev/gudevmarshal.list
index 7e665999e8..7e665999e8 100644
--- a/src/udev/gudev/gudevmarshal.list
+++ b/src/gudev/gudevmarshal.list
diff --git a/src/udev/gudev/gudevprivate.h b/src/gudev/gudevprivate.h
index 8866f52b88..8866f52b88 100644
--- a/src/udev/gudev/gudevprivate.h
+++ b/src/gudev/gudevprivate.h
diff --git a/src/udev/gudev/gudevtypes.h b/src/gudev/gudevtypes.h
index 888482783d..888482783d 100644
--- a/src/udev/gudev/gudevtypes.h
+++ b/src/gudev/gudevtypes.h
diff --git a/src/udev/gudev/seed-example-enum.js b/src/gudev/seed-example-enum.js
index 66206ad806..66206ad806 100755
--- a/src/udev/gudev/seed-example-enum.js
+++ b/src/gudev/seed-example-enum.js
diff --git a/src/udev/gudev/seed-example.js b/src/gudev/seed-example.js
index e2ac324d23..e2ac324d23 100755
--- a/src/udev/gudev/seed-example.js
+++ b/src/gudev/seed-example.js
diff --git a/src/udev/libudev-device-private.c b/src/libudev/libudev-device-private.c
index 91fd06c025..91fd06c025 100644
--- a/src/udev/libudev-device-private.c
+++ b/src/libudev/libudev-device-private.c
diff --git a/src/udev/libudev-device.c b/src/libudev/libudev-device.c
index 40b00ac5d2..257d6355fe 100644
--- a/src/udev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -1136,7 +1136,7 @@ _public_ const char *udev_device_get_devnode(struct udev_device *udev_device)
  *
  * Retrieve the list of device links pointing to the device file of
  * the udev device. The next list entry can be retrieved with
- * udev_list_entry_next(), which returns #NULL if no more entries exist.
+ * udev_list_entry_get_next(), which returns #NULL if no more entries exist.
  * The devlink path can be retrieved from the list entry by
  * udev_list_entry_get_name(). The path is an absolute path, and starts with
  * the device directory.
@@ -1163,10 +1163,10 @@ void udev_device_cleanup_devlinks_list(struct udev_device *udev_device)
  * @udev_device: udev device
  *
  * Retrieve the list of key/value device properties of the udev
- * device. The next list entry can be retrieved with udev_list_entry_next(),
+ * device. The next list entry can be retrieved with udev_list_entry_get_next(),
  * which returns #NULL if no more entries exist. The property name
- * can be retrieved from the list entry by udev_list_get_name(),
- * the property value by udev_list_get_value().
+ * can be retrieved from the list entry by udev_list_entry_get_name(),
+ * the property value by udev_list_entry_get_value().
  *
  * Returns: the first entry of the property list
  **/
@@ -1575,9 +1575,9 @@ void udev_device_cleanup_tags_list(struct udev_device *udev_device)
  * @udev_device: udev device
  *
  * Retrieve the list of tags attached to the udev device. The next
- * list entry can be retrieved with udev_list_entry_next(),
+ * list entry can be retrieved with udev_list_entry_get_next(),
  * which returns #NULL if no more entries exist. The tag string
- * can be retrieved from the list entry by udev_list_get_name().
+ * can be retrieved from the list entry by udev_list_entry_get_name().
  *
  * Returns: the first entry of the tag list
  **/
diff --git a/src/udev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c
index 7b9a732ce6..7b9a732ce6 100644
--- a/src/udev/libudev-enumerate.c
+++ b/src/libudev/libudev-enumerate.c
diff --git a/src/udev/libudev-list.c b/src/libudev/libudev-list.c
index 054c0a931c..054c0a931c 100644
--- a/src/udev/libudev-list.c
+++ b/src/libudev/libudev-list.c
diff --git a/src/udev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index 4406b55f97..4406b55f97 100644
--- a/src/udev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
diff --git a/src/udev/libudev-private.h b/src/libudev/libudev-private.h
index d914aa4599..d914aa4599 100644
--- a/src/udev/libudev-private.h
+++ b/src/libudev/libudev-private.h
diff --git a/src/udev/libudev-queue-private.c b/src/libudev/libudev-queue-private.c
index ca6d229a2c..ca6d229a2c 100644
--- a/src/udev/libudev-queue-private.c
+++ b/src/libudev/libudev-queue-private.c
diff --git a/src/udev/libudev-queue.c b/src/libudev/libudev-queue.c
index 72408d0166..72408d0166 100644
--- a/src/udev/libudev-queue.c
+++ b/src/libudev/libudev-queue.c
diff --git a/src/udev/libudev-selinux-private.c b/src/libudev/libudev-selinux-private.c
index d68097f991..d68097f991 100644
--- a/src/udev/libudev-selinux-private.c
+++ b/src/libudev/libudev-selinux-private.c
diff --git a/src/udev/libudev-util-private.c b/src/libudev/libudev-util-private.c
index 44ff02cc33..44ff02cc33 100644
--- a/src/udev/libudev-util-private.c
+++ b/src/libudev/libudev-util-private.c
diff --git a/src/udev/libudev-util.c b/src/libudev/libudev-util.c
index cb17c3f48c..cb17c3f48c 100644
--- a/src/udev/libudev-util.c
+++ b/src/libudev/libudev-util.c
diff --git a/src/udev/libudev.c b/src/libudev/libudev.c
index 74b53cbf1b..74b53cbf1b 100644
--- a/src/udev/libudev.c
+++ b/src/libudev/libudev.c
diff --git a/src/udev/libudev.h b/src/libudev/libudev.h
index 3bcddb2eb3..3bcddb2eb3 100644
--- a/src/udev/libudev.h
+++ b/src/libudev/libudev.h
diff --git a/src/udev/libudev.pc.in b/src/libudev/libudev.pc.in
index c9a47fc9b8..c9a47fc9b8 100644
--- a/src/udev/libudev.pc.in
+++ b/src/libudev/libudev.pc.in
diff --git a/src/udev/docs/.gitignore b/src/udev/docs/.gitignore
deleted file mode 100644
index 1fb9c51424..0000000000
--- a/src/udev/docs/.gitignore
+++ /dev/null
@@ -1,18 +0,0 @@
-Makefile
-libudev-overrides.txt
-html/
-tmpl/
-xml/
-*.stamp
-*.bak
-version.xml
-libudev-decl-list.txt
-libudev-decl.txt
-libudev-undeclared.txt
-libudev-undocumented.txt
-libudev-unused.txt
-libudev.args
-libudev.hierarchy
-libudev.interfaces
-libudev.prerequisites
-libudev.signals
diff --git a/src/udev/docs/Makefile.am b/src/udev/docs/Makefile.am
deleted file mode 100644
index 7cd4f9742c..0000000000
--- a/src/udev/docs/Makefile.am
+++ /dev/null
@@ -1,99 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# We require automake 1.10 at least.
-AUTOMAKE_OPTIONS = 1.10
-
-# This is a blank Makefile.am for using gtk-doc.
-# Copy this to your project's API docs directory and modify the variables to
-# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
-# of using the various options.
-
-# The name of the module, e.g. 'glib'.
-DOC_MODULE=libudev
-
-# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
-#DOC_MODULE_VERSION=2
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
-
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=$(top_srcdir)/src/udev
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space udev
-
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkhtml
-MKHTML_OPTIONS=--path=$(abs_srcdir) --path=$(abs_builddir)
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
-# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/src/udev/libudev*.h
-CFILE_GLOB=$(top_srcdir)/src/udev/libudev*.c
-
-# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
-# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
-EXTRA_HFILES=
-
-# Header files to ignore when scanning. Use base file name, no paths
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES= libudev-private.h
-
-# Images to copy into HTML directory.
-# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES=
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files = version.xml
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-expand_content_files=
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS=
-GTKDOC_LIBS=
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in
-
-# Files not to distribute
-# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
-# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-#DISTCLEANFILES +=
-
-# Comment this out if you want your docs-status tested during 'make check'
-if ENABLE_GTK_DOC
-#TESTS_ENVIRONMENT = cd $(srcsrc)
-#TESTS = $(GTKDOC_CHECK)
-endif
diff --git a/src/udev/docs/libudev-docs.xml b/src/udev/docs/libudev-docs.xml
deleted file mode 100644
index b7feb45529..0000000000
--- a/src/udev/docs/libudev-docs.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY version SYSTEM "version.xml">
-]>
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
-  <bookinfo>
-    <title>libudev Reference Manual</title>
-    <releaseinfo>for libudev version &version;</releaseinfo>
-    <copyright>
-      <year>2009-2011</year>
-      <holder>Kay Sievers &lt;kay.sievers@vrfy.org&gt;</holder>
-    </copyright>
-  </bookinfo>
-
-  <chapter>
-    <title>libudev</title>
-    <xi:include href="xml/libudev.xml"/>
-    <xi:include href="xml/libudev-list.xml"/>
-    <xi:include href="xml/libudev-device.xml"/>
-    <xi:include href="xml/libudev-monitor.xml"/>
-    <xi:include href="xml/libudev-enumerate.xml"/>
-    <xi:include href="xml/libudev-queue.xml"/>
-    <xi:include href="xml/libudev-util.xml"/>
-  </chapter>
-
-  <index id="api-index-full">
-    <title>API Index</title>
-    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
-  </index>
-</book>
diff --git a/src/udev/docs/libudev-sections.txt b/src/udev/docs/libudev-sections.txt
deleted file mode 100644
index 15c3e934b5..0000000000
--- a/src/udev/docs/libudev-sections.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-<SECTION>
-<FILE>libudev</FILE>
-<TITLE>udev</TITLE>
-udev
-udev_ref
-udev_unref
-udev_new
-udev_set_log_fn
-udev_get_log_priority
-udev_set_log_priority
-udev_get_sys_path
-udev_get_dev_path
-udev_get_run_path
-udev_get_userdata
-udev_set_userdata
-</SECTION>
-
-<SECTION>
-<FILE>libudev-list</FILE>
-<TITLE>udev_list</TITLE>
-udev_list_entry
-udev_list_entry_get_next
-udev_list_entry_get_by_name
-udev_list_entry_get_name
-udev_list_entry_get_value
-udev_list_entry_foreach
-</SECTION>
-
-<SECTION>
-<FILE>libudev-device</FILE>
-<TITLE>udev_device</TITLE>
-udev_device
-udev_device_ref
-udev_device_unref
-udev_device_get_udev
-udev_device_new_from_syspath
-udev_device_new_from_devnum
-udev_device_new_from_subsystem_sysname
-udev_device_new_from_environment
-udev_device_get_parent
-udev_device_get_parent_with_subsystem_devtype
-udev_device_get_devpath
-udev_device_get_subsystem
-udev_device_get_devtype
-udev_device_get_syspath
-udev_device_get_sysname
-udev_device_get_sysnum
-udev_device_get_devnode
-udev_device_get_is_initialized
-udev_device_get_devlinks_list_entry
-udev_device_get_properties_list_entry
-udev_device_get_tags_list_entry
-udev_device_get_property_value
-udev_device_get_driver
-udev_device_get_devnum
-udev_device_get_action
-udev_device_get_sysattr_value
-udev_device_get_sysattr_list_entry
-udev_device_get_seqnum
-udev_device_get_usec_since_initialized
-udev_device_has_tag
-</SECTION>
-
-<SECTION>
-<FILE>libudev-monitor</FILE>
-<TITLE>udev_monitor</TITLE>
-udev_monitor
-udev_monitor_ref
-udev_monitor_unref
-udev_monitor_get_udev
-udev_monitor_new_from_netlink
-udev_monitor_new_from_socket
-udev_monitor_enable_receiving
-udev_monitor_set_receive_buffer_size
-udev_monitor_get_fd
-udev_monitor_receive_device
-udev_monitor_filter_add_match_subsystem_devtype
-udev_monitor_filter_add_match_tag
-udev_monitor_filter_update
-udev_monitor_filter_remove
-</SECTION>
-
-<SECTION>
-<FILE>libudev-enumerate</FILE>
-<TITLE>udev_enumerate</TITLE>
-udev_enumerate
-udev_enumerate_ref
-udev_enumerate_unref
-udev_enumerate_get_udev
-udev_enumerate_new
-udev_enumerate_add_match_subsystem
-udev_enumerate_add_nomatch_subsystem
-udev_enumerate_add_match_sysattr
-udev_enumerate_add_nomatch_sysattr
-udev_enumerate_add_match_property
-udev_enumerate_add_match_tag
-udev_enumerate_add_match_parent
-udev_enumerate_add_match_is_initialized
-udev_enumerate_add_match_sysname
-udev_enumerate_add_syspath
-udev_enumerate_scan_devices
-udev_enumerate_scan_subsystems
-udev_enumerate_get_list_entry
-</SECTION>
-
-<SECTION>
-<FILE>libudev-queue</FILE>
-<TITLE>udev_queue</TITLE>
-udev_queue
-udev_queue_ref
-udev_queue_unref
-udev_queue_get_udev
-udev_queue_new
-udev_queue_get_udev_is_active
-udev_queue_get_queue_is_empty
-udev_queue_get_seqnum_is_finished
-udev_queue_get_seqnum_sequence_is_finished
-udev_queue_get_queued_list_entry
-udev_queue_get_kernel_seqnum
-udev_queue_get_udev_seqnum
-</SECTION>
-
-<SECTION>
-<FILE>libudev-util</FILE>
-<TITLE>udev_util</TITLE>
-udev_util_encode_string
-</SECTION>
diff --git a/src/udev/docs/libudev.types b/src/udev/docs/libudev.types
deleted file mode 100644
index e69de29bb2..0000000000
--- a/src/udev/docs/libudev.types
+++ /dev/null
diff --git a/src/udev/docs/version.xml.in b/src/udev/docs/version.xml.in
deleted file mode 100644
index d78bda9342..0000000000
--- a/src/udev/docs/version.xml.in
+++ /dev/null
@@ -1 +0,0 @@
-@VERSION@
diff --git a/src/udev/gudev/docs/.gitignore b/src/udev/gudev/docs/.gitignore
deleted file mode 100644
index 5d7d73d9a6..0000000000
--- a/src/udev/gudev/docs/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-Makefile
-gudev-overrides.txt
-gudev-decl-list.txt
-gudev-decl.txt
-gudev-undeclared.txt
-gudev-undocumented.txt
-gudev-unused.txt
-gudev.args
-gudev.hierarchy
-gudev.interfaces
-gudev.prerequisites
-gudev.signals
-html.stamp
-html/*
-xml/*
-tmpl/*
-*.stamp
diff --git a/src/udev/gudev/docs/Makefile.am b/src/udev/gudev/docs/Makefile.am
deleted file mode 100644
index 036ef43026..0000000000
--- a/src/udev/gudev/docs/Makefile.am
+++ /dev/null
@@ -1,106 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# We require automake 1.10 at least.
-AUTOMAKE_OPTIONS = 1.10
-
-# This is a blank Makefile.am for using gtk-doc.
-# Copy this to your project's API docs directory and modify the variables to
-# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
-# of using the various options.
-
-# The name of the module, e.g. 'glib'.
-DOC_MODULE=gudev
-
-# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
-#DOC_MODULE_VERSION=2
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
-
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=$(top_srcdir)/src/udev/gudev
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=g_udev
-
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkhtml
-MKHTML_OPTIONS=--path=$(abs_srcdir) --path=$(abs_builddir)
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
-# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/src/udev/gudev/*.h
-CFILE_GLOB=$(top_srcdir)/src/udev/gudev/*.c
-
-# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
-# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
-EXTRA_HFILES=
-
-# Header files to ignore when scanning. Use base file name, no paths
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=
-
-# Images to copy into HTML directory.
-# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES=
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files = version.xml
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-expand_content_files=
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS = \
-        $(DBUS_GLIB_CFLAGS) \
-        $(GLIB_CFLAGS) \
-        -I$(top_srcdir)/src/udev/gudev \
-        -I$(top_builddir)/src/udev/gudev
-
-GTKDOC_LIBS = \
-        $(GLIB_LIBS) \
-        $(top_builddir)/libgudev-1.0.la
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in
-
-# Files not to distribute
-# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
-# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-#DISTCLEANFILES +=
-
-# Comment this out if you want your docs-status tested during 'make check'
-if ENABLE_GTK_DOC
-#TESTS_ENVIRONMENT = cd $(srcsrc)
-#TESTS = $(GTKDOC_CHECK)
-endif
diff --git a/src/udev/gudev/docs/gudev-docs.xml b/src/udev/gudev/docs/gudev-docs.xml
deleted file mode 100644
index f876c3bc05..0000000000
--- a/src/udev/gudev/docs/gudev-docs.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-<!ENTITY version SYSTEM "version.xml">
-]>
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
-  <bookinfo>
-    <title>GUDev Reference Manual</title>
-    <releaseinfo>For GUdev version &version;</releaseinfo>
-    <authorgroup>
-      <author>
-        <firstname>David</firstname>
-        <surname>Zeuthen</surname>
-        <affiliation>
-          <address>
-            <email>davidz@redhat.com</email>
-          </address>
-        </affiliation>
-      </author>
-      <author>
-        <firstname>Bastien</firstname>
-        <surname>Nocera</surname>
-        <affiliation>
-          <address>
-            <email>hadess@hadess.net</email>
-          </address>
-        </affiliation>
-      </author>
-    </authorgroup>
-
-    <copyright>
-      <year>2011</year>
-      <holder>The GUDev Authors</holder>
-    </copyright>
-
-    <legalnotice>
-      <para>
-        Permission is granted to copy, distribute and/or modify this
-        document under the terms of the <citetitle>GNU Free
-        Documentation License</citetitle>, Version 1.1 or any later
-        version published by the Free Software Foundation with no
-        Invariant Sections, no Front-Cover Texts, and no Back-Cover
-        Texts. You may obtain a copy of the <citetitle>GNU Free
-        Documentation License</citetitle> from the Free Software
-        Foundation by visiting <ulink type="http"
-        url="http://www.fsf.org">their Web site</ulink> or by writing
-        to:
-
-        <address>
-          The Free Software Foundation, Inc.,
-          <street>59 Temple Place</street> - Suite 330,
-          <city>Boston</city>, <state>MA</state> <postcode>02111-1307</postcode>,
-          <country>USA</country>
-        </address>
-      </para>
-
-      <para>
-        Many of the names used by companies to distinguish their
-        products and services are claimed as trademarks. Where those
-        names appear in any freedesktop.org documentation, and those
-        trademarks are made aware to the members of the
-        freedesktop.org Project, the names have been printed in caps
-        or initial caps.
-      </para>
-    </legalnotice>
-  </bookinfo>
-
-  <reference id="ref-API">
-    <title>API Reference</title>
-    <partintro>
-      <para>
-        This part presents the class and function reference for the
-        <literal>libgudev</literal> library.
-      </para>
-    </partintro>
-    <xi:include href="xml/gudevclient.xml"/>
-    <xi:include href="xml/gudevdevice.xml"/>
-    <xi:include href="xml/gudevenumerator.xml"/>
-  </reference>
-
-  <chapter id="gudev-hierarchy">
-    <title>Object Hierarchy</title>
-      <xi:include href="xml/tree_index.sgml"/>
-  </chapter>
-  <index>
-    <title>Index</title>
-  </index>
-  <index role="165">
-    <title>Index of new symbols in 165</title>
-    <xi:include href="xml/api-index-165.xml"><xi:fallback /></xi:include>
-  </index>
-
-</book>
diff --git a/src/udev/gudev/docs/gudev-sections.txt b/src/udev/gudev/docs/gudev-sections.txt
deleted file mode 100644
index 213e1a7465..0000000000
--- a/src/udev/gudev/docs/gudev-sections.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-<SECTION>
-<FILE>gudevclient</FILE>
-<TITLE>GUdevClient</TITLE>
-GUdevClient
-GUdevClientClass
-GUdevDeviceType
-GUdevDeviceNumber
-g_udev_client_new
-g_udev_client_query_by_subsystem
-g_udev_client_query_by_device_number
-g_udev_client_query_by_device_file
-g_udev_client_query_by_sysfs_path
-g_udev_client_query_by_subsystem_and_name
-<SUBSECTION Standard>
-G_UDEV_CLIENT
-G_UDEV_IS_CLIENT
-G_UDEV_TYPE_CLIENT
-g_udev_client_get_type
-G_UDEV_CLIENT_CLASS
-G_UDEV_IS_CLIENT_CLASS
-G_UDEV_CLIENT_GET_CLASS
-<SUBSECTION Private>
-GUdevClientPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gudevdevice</FILE>
-<TITLE>GUdevDevice</TITLE>
-GUdevDevice
-GUdevDeviceClass
-g_udev_device_get_subsystem
-g_udev_device_get_devtype
-g_udev_device_get_name
-g_udev_device_get_number
-g_udev_device_get_sysfs_path
-g_udev_device_get_driver
-g_udev_device_get_action
-g_udev_device_get_seqnum
-g_udev_device_get_device_type
-g_udev_device_get_device_number
-g_udev_device_get_device_file
-g_udev_device_get_device_file_symlinks
-g_udev_device_get_parent
-g_udev_device_get_parent_with_subsystem
-g_udev_device_get_tags
-g_udev_device_get_is_initialized
-g_udev_device_get_usec_since_initialized
-g_udev_device_get_property_keys
-g_udev_device_has_property
-g_udev_device_get_property
-g_udev_device_get_property_as_int
-g_udev_device_get_property_as_uint64
-g_udev_device_get_property_as_double
-g_udev_device_get_property_as_boolean
-g_udev_device_get_property_as_strv
-g_udev_device_get_sysfs_attr
-g_udev_device_get_sysfs_attr_as_int
-g_udev_device_get_sysfs_attr_as_uint64
-g_udev_device_get_sysfs_attr_as_double
-g_udev_device_get_sysfs_attr_as_boolean
-g_udev_device_get_sysfs_attr_as_strv
-<SUBSECTION Standard>
-G_UDEV_DEVICE
-G_UDEV_IS_DEVICE
-G_UDEV_TYPE_DEVICE
-g_udev_device_get_type
-G_UDEV_DEVICE_CLASS
-G_UDEV_IS_DEVICE_CLASS
-G_UDEV_DEVICE_GET_CLASS
-<SUBSECTION Private>
-GUdevDevicePrivate
-</SECTION>
-
-<SECTION>
-<FILE>gudevenumerator</FILE>
-<TITLE>GUdevEnumerator</TITLE>
-GUdevEnumerator
-GUdevEnumeratorClass
-g_udev_enumerator_new
-g_udev_enumerator_add_match_subsystem
-g_udev_enumerator_add_nomatch_subsystem
-g_udev_enumerator_add_match_sysfs_attr
-g_udev_enumerator_add_nomatch_sysfs_attr
-g_udev_enumerator_add_match_property
-g_udev_enumerator_add_match_name
-g_udev_enumerator_add_match_tag
-g_udev_enumerator_add_match_is_initialized
-g_udev_enumerator_add_sysfs_path
-g_udev_enumerator_execute
-<SUBSECTION Standard>
-G_UDEV_ENUMERATOR
-G_UDEV_IS_ENUMERATOR
-G_UDEV_TYPE_ENUMERATOR
-g_udev_enumerator_get_type
-G_UDEV_ENUMERATOR_CLASS
-G_UDEV_IS_ENUMERATOR_CLASS
-G_UDEV_ENUMERATOR_GET_CLASS
-<SUBSECTION Private>
-GUdevEnumeratorPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gudevmarshal</FILE>
-<SUBSECTION Private>
-g_udev_marshal_VOID__STRING_OBJECT
-</SECTION>
-
-<SECTION>
-<FILE>gudevenumtypes</FILE>
-<SUBSECTION Private>
-G_TYPE_UDEV_DEVICE_TYPE
-g_udev_device_type_get_type
-</SECTION>
diff --git a/src/udev/gudev/docs/gudev.types b/src/udev/gudev/docs/gudev.types
deleted file mode 100644
index a89857a04d..0000000000
--- a/src/udev/gudev/docs/gudev.types
+++ /dev/null
@@ -1,4 +0,0 @@
-g_udev_device_type_get_type
-g_udev_device_get_type
-g_udev_client_get_type
-g_udev_enumerator_get_type
diff --git a/src/udev/gudev/docs/version.xml.in b/src/udev/gudev/docs/version.xml.in
deleted file mode 100644
index d78bda9342..0000000000
--- a/src/udev/gudev/docs/version.xml.in
+++ /dev/null
@@ -1 +0,0 @@
-@VERSION@
diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c
index 6bfb7f780c..8440b4cb4c 100644
--- a/src/udev/scsi_id/scsi_serial.c
+++ b/src/udev/scsi_id/scsi_serial.c
@@ -469,10 +469,10 @@ static int prepend_vendor_model(struct udev *udev,
         return ind;
 }
 
-/**
+/*
  * check_fill_0x83_id - check the page 0x83 id, if OK allocate and fill
  * serial number.
- **/
+ */
 static int check_fill_0x83_id(struct udev *udev,
                               struct scsi_id_device *dev_scsi,
                               unsigned char *page_83,