From bb061708d5aa83579f213bdfb67253f7027217c3 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 13 Apr 2012 18:24:39 +0200 Subject: [PATCH] udev: move libudev, gudev to src/; move gudev/docs/, udev/docs/ to to docs/ --- Makefile.am | 160 +++++++++--------- configure.ac | 8 +- .../udev/gudev/docs => docs/gudev}/.gitignore | 0 .../gudev/docs => docs/gudev}/Makefile.am | 13 +- .../gudev/docs => docs/gudev}/gudev-docs.xml | 2 + .../docs => docs/gudev}/gudev-sections.txt | 0 .../gudev/docs => docs/gudev}/gudev.types | 0 {src/udev/docs => docs/gudev}/version.xml.in | 0 {src/udev/docs => docs/libudev}/.gitignore | 0 {src/udev/docs => docs/libudev}/Makefile.am | 10 +- .../docs => docs/libudev}/libudev-docs.xml | 0 .../libudev}/libudev-sections.txt | 1 - {src/udev/docs => docs/libudev}/libudev.types | 0 .../docs => docs/libudev}/version.xml.in | 0 src/{udev => }/gudev/.gitignore | 0 src/{udev => }/gudev/gjs-example.js | 0 src/{udev => }/gudev/gudev-1.0.pc.in | 0 src/{udev => }/gudev/gudev.h | 0 src/{udev => }/gudev/gudevclient.c | 0 src/{udev => }/gudev/gudevclient.h | 0 src/{udev => }/gudev/gudevdevice.c | 0 src/{udev => }/gudev/gudevdevice.h | 0 src/{udev => }/gudev/gudevenumerator.c | 0 src/{udev => }/gudev/gudevenumerator.h | 0 src/{udev => }/gudev/gudevenums.h | 0 .../gudev/gudevenumtypes.c.template | 0 .../gudev/gudevenumtypes.h.template | 0 src/{udev => }/gudev/gudevmarshal.list | 0 src/{udev => }/gudev/gudevprivate.h | 0 src/{udev => }/gudev/gudevtypes.h | 0 src/{udev => }/gudev/seed-example-enum.js | 0 src/{udev => }/gudev/seed-example.js | 0 .../libudev-device-private.c | 0 src/{udev => libudev}/libudev-device.c | 12 +- src/{udev => libudev}/libudev-enumerate.c | 0 src/{udev => libudev}/libudev-list.c | 0 src/{udev => libudev}/libudev-monitor.c | 0 src/{udev => libudev}/libudev-private.h | 0 src/{udev => libudev}/libudev-queue-private.c | 0 src/{udev => libudev}/libudev-queue.c | 0 .../libudev-selinux-private.c | 0 src/{udev => libudev}/libudev-util-private.c | 0 src/{udev => libudev}/libudev-util.c | 0 src/{udev => libudev}/libudev.c | 0 src/{udev => libudev}/libudev.h | 0 src/{udev => libudev}/libudev.pc.in | 0 src/udev/scsi_id/scsi_serial.c | 4 +- 47 files changed, 105 insertions(+), 105 deletions(-) rename {src/udev/gudev/docs => docs/gudev}/.gitignore (100%) rename {src/udev/gudev/docs => docs/gudev}/Makefile.am (92%) rename {src/udev/gudev/docs => docs/gudev}/gudev-docs.xml (97%) rename {src/udev/gudev/docs => docs/gudev}/gudev-sections.txt (100%) rename {src/udev/gudev/docs => docs/gudev}/gudev.types (100%) rename {src/udev/docs => docs/gudev}/version.xml.in (100%) rename {src/udev/docs => docs/libudev}/.gitignore (100%) rename {src/udev/docs => docs/libudev}/Makefile.am (93%) rename {src/udev/docs => docs/libudev}/libudev-docs.xml (100%) rename {src/udev/docs => docs/libudev}/libudev-sections.txt (98%) rename {src/udev/docs => docs/libudev}/libudev.types (100%) rename {src/udev/gudev/docs => docs/libudev}/version.xml.in (100%) rename src/{udev => }/gudev/.gitignore (100%) rename src/{udev => }/gudev/gjs-example.js (100%) rename src/{udev => }/gudev/gudev-1.0.pc.in (100%) rename src/{udev => }/gudev/gudev.h (100%) rename src/{udev => }/gudev/gudevclient.c (100%) rename src/{udev => }/gudev/gudevclient.h (100%) rename src/{udev => }/gudev/gudevdevice.c (100%) rename src/{udev => }/gudev/gudevdevice.h (100%) rename src/{udev => }/gudev/gudevenumerator.c (100%) rename src/{udev => }/gudev/gudevenumerator.h (100%) rename src/{udev => }/gudev/gudevenums.h (100%) rename src/{udev => }/gudev/gudevenumtypes.c.template (100%) rename src/{udev => }/gudev/gudevenumtypes.h.template (100%) rename src/{udev => }/gudev/gudevmarshal.list (100%) rename src/{udev => }/gudev/gudevprivate.h (100%) rename src/{udev => }/gudev/gudevtypes.h (100%) rename src/{udev => }/gudev/seed-example-enum.js (100%) rename src/{udev => }/gudev/seed-example.js (100%) rename src/{udev => libudev}/libudev-device-private.c (100%) rename src/{udev => libudev}/libudev-device.c (99%) rename src/{udev => libudev}/libudev-enumerate.c (100%) rename src/{udev => libudev}/libudev-list.c (100%) rename src/{udev => libudev}/libudev-monitor.c (100%) rename src/{udev => libudev}/libudev-private.h (100%) rename src/{udev => libudev}/libudev-queue-private.c (100%) rename src/{udev => libudev}/libudev-queue.c (100%) rename src/{udev => libudev}/libudev-selinux-private.c (100%) rename src/{udev => libudev}/libudev-util-private.c (100%) rename src/{udev => libudev}/libudev-util.c (100%) rename src/{udev => libudev}/libudev.c (100%) rename src/{udev => libudev}/libudev.h (100%) rename src/{udev => libudev}/libudev.pc.in (100%) diff --git a/Makefile.am b/Makefile.am index d0c82812..dec81063 100644 --- a/Makefile.am +++ b/Makefile.am @@ -136,7 +136,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/journal \ -I $(top_srcdir)/src/systemd \ -I $(top_srcdir)/src/core \ - -I $(top_srcdir)/src/udev + -I $(top_srcdir)/src/libudev AM_CFLAGS = $(WARNINGFLAGS) AM_LDFLAGS = $(GCLDFLAGS) @@ -1275,23 +1275,23 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ SUBDIRS += \ - src/udev/docs + docs/libudev include_HEADERS += \ - src/udev/libudev.h + src/libudev/libudev.h lib_LTLIBRARIES += \ libudev.la libudev_la_SOURCES =\ - src/udev/libudev-private.h \ - src/udev/libudev.c \ - src/udev/libudev-list.c \ - src/udev/libudev-util.c \ - src/udev/libudev-device.c \ - src/udev/libudev-enumerate.c \ - src/udev/libudev-monitor.c \ - src/udev/libudev-queue.c + src/libudev/libudev-private.h \ + src/libudev/libudev.c \ + src/libudev/libudev-list.c \ + src/libudev/libudev-util.c \ + src/libudev/libudev-device.c \ + src/libudev/libudev-enumerate.c \ + src/libudev/libudev-monitor.c \ + src/libudev/libudev-queue.c libudev_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1302,13 +1302,13 @@ libudev_la_LDFLAGS = \ -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) pkgconfiglib_DATA += \ - src/udev/libudev.pc + src/libudev/libudev.pc EXTRA_DIST += \ - src/udev/libudev.pc.in + src/libudev/libudev.pc.in CLEANFILES += \ - src/udev/libudev.pc + src/libudev/libudev.pc # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libudev-install-move-hook: @@ -1332,13 +1332,13 @@ noinst_LTLIBRARIES += \ libudev_private_la_SOURCES =\ $(libudev_la_SOURCES) \ - src/udev/libudev-util-private.c \ - src/udev/libudev-device-private.c \ - src/udev/libudev-queue-private.c + src/libudev/libudev-util-private.c \ + src/libudev/libudev-device-private.c \ + src/libudev/libudev-queue-private.c if HAVE_SELINUX libudev_private_la_SOURCES +=\ - src/udev/libudev-selinux-private.c + src/libudev/libudev-selinux-private.c endif libudev_private_la_CFLAGS = \ @@ -1606,49 +1606,49 @@ dist_udevrules_DATA += \ # ------------------------------------------------------------------------------ if ENABLE_GUDEV SUBDIRS += \ - src/udev/gudev/docs + docs/gudev libgudev_includedir = \ $(includedir)/gudev-1.0/gudev libgudev_include_HEADERS = \ - src/udev/gudev/gudev.h \ - src/udev/gudev/gudevenums.h \ - src/udev/gudev/gudevenumtypes.h \ - src/udev/gudev/gudevtypes.h \ - src/udev/gudev/gudevclient.h \ - src/udev/gudev/gudevdevice.h \ - src/udev/gudev/gudevenumerator.h + src/gudev/gudev.h \ + src/gudev/gudevenums.h \ + src/gudev/gudevenumtypes.h \ + src/gudev/gudevtypes.h \ + src/gudev/gudevclient.h \ + src/gudev/gudevdevice.h \ + src/gudev/gudevenumerator.h lib_LTLIBRARIES += libgudev-1.0.la pkgconfiglib_DATA += \ - src/udev/gudev/gudev-1.0.pc + src/gudev/gudev-1.0.pc EXTRA_DIST += \ - src/udev/gudev/gudev-1.0.pc.in + src/gudev/gudev-1.0.pc.in CLEANFILES += \ - src/udev/gudev/gudev-1.0.pc + src/gudev/gudev-1.0.pc libgudev_1_0_la_SOURCES = \ - src/udev/gudev/gudevenums.h \ - src/udev/gudev/gudevenumtypes.h \ - src/udev/gudev/gudevenumtypes.h\ - src/udev/gudev/gudevtypes.h \ - src/udev/gudev/gudevclient.h \ - src/udev/gudev/gudevclient.c \ - src/udev/gudev/gudevdevice.h \ - src/udev/gudev/gudevdevice.c \ - src/udev/gudev/gudevenumerator.h \ - src/udev/gudev/gudevenumerator.c \ - src/udev/gudev/gudevprivate.h + src/gudev/gudevenums.h \ + src/gudev/gudevenumtypes.h \ + src/gudev/gudevenumtypes.h\ + src/gudev/gudevtypes.h \ + src/gudev/gudevclient.h \ + src/gudev/gudevclient.c \ + src/gudev/gudevdevice.h \ + src/gudev/gudevdevice.c \ + src/gudev/gudevenumerator.h \ + src/gudev/gudevenumerator.c \ + src/gudev/gudevprivate.h nodist_libgudev_1_0_la_SOURCES = \ - src/udev/gudev/gudevmarshal.h \ - src/udev/gudev/gudevmarshal.c \ - src/udev/gudev/gudevenumtypes.h \ - src/udev/gudev/gudevenumtypes.c + src/gudev/gudevmarshal.h \ + src/gudev/gudevmarshal.c \ + src/gudev/gudevenumtypes.h \ + src/gudev/gudevenumtypes.c BUILT_SOURCES += \ $(nodist_libgudev_1_0_la_SOURCES) @@ -1657,10 +1657,8 @@ libgudev_1_0_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_builddir)/src\ -I$(top_srcdir)/src\ - -I$(top_builddir)/src/udev \ - -I$(top_srcdir)/src/udev \ - -I$(top_builddir)/src/udev/gudev \ - -I$(top_srcdir)/src/udev/gudev \ + -I$(top_builddir)/src/gudev \ + -I$(top_srcdir)/src/gudev \ -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ -D_GUDEV_COMPILATION \ -DG_LOG_DOMAIN=\"GUdev\" @@ -1681,73 +1679,75 @@ libgudev_1_0_la_LDFLAGS = \ -export-symbols-regex '^g_udev_.*' EXTRA_DIST += \ - src/udev/gudev/gudevmarshal.list \ - src/udev/gudev/gudevenumtypes.h.template \ - src/udev/gudev/gudevenumtypes.c.template \ - src/udev/gudev/gjs-example.js \ - src/udev/gudev/seed-example-enum.js \ - src/udev/gudev/seed-example.js + src/gudev/gudevmarshal.list \ + src/gudev/gudevenumtypes.h.template \ + src/gudev/gudevenumtypes.c.template \ + src/gudev/gjs-example.js \ + src/gudev/seed-example-enum.js \ + src/gudev/seed-example.js CLEANFILES += \ $(nodist_libgudev_1_0_la_SOURCES) -src/udev/gudev/gudevmarshal.h: src/udev/gudev/gudevmarshal.list +src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@ -src/udev/gudev/gudevmarshal.c: src/udev/gudev/gudevmarshal.list +src/gudev/gudevmarshal.c: src/gudev/gudevmarshal.list $(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \ glib-genmarshal $< --prefix=g_udev_marshal --body >> $@ -src/udev/gudev/gudevenumtypes.h: src/udev/gudev/gudevenumtypes.h.template src/udev/gudev/gudevenums.h +src/gudev/gudevenumtypes.h: src/gudev/gudevenumtypes.h.template src/gudev/gudevenums.h $(AM_V_GEN)glib-mkenums --template $^ > \ $@.tmp && mv $@.tmp $@ -src/udev/gudev/gudevenumtypes.c: src/udev/gudev/gudevenumtypes.c.template src/udev/gudev/gudevenums.h +src/gudev/gudevenumtypes.c: src/gudev/gudevenumtypes.c.template src/gudev/gudevenums.h $(AM_V_GEN)glib-mkenums --template $^ > \ $@.tmp && mv $@.tmp $@ if HAVE_INTROSPECTION -include $(INTROSPECTION_MAKEFILE) -src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la +src/gudev/GUdev-1.0.gir: libgudev-1.0.la -src_udev_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0 +src_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0 -src_udev_gudev_GUdev_1_0_gir_CFLAGS = \ +src_gudev_GUdev_1_0_gir_CFLAGS = \ $(INCLUDES) \ -D_GUDEV_COMPILATION \ -D_GUDEV_WORK_AROUND_DEV_T_BUG \ - -I$(top_srcdir)/src/udev \ - -I$(top_builddir)/src/udev + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + -I$(top_srcdir)/src/gdev \ + -I$(top_builddir)/src/gdev -src_udev_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la +src_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la -src_udev_gudev_GUdev_1_0_gir_SCANNERFLAGS = \ +src_gudev_GUdev_1_0_gir_SCANNERFLAGS = \ --pkg-export=gudev-1.0 \ --warn-all -src_udev_gudev_GUdev_1_0_gir_FILES = \ - $(top_srcdir)/src/udev/gudev/gudev.h \ - $(top_srcdir)/src/udev/gudev/gudevtypes.h \ - $(top_srcdir)/src/udev/gudev/gudevenums.h \ - $(or $(wildcard $(top_builddir)/src/udev/gudev/gudevenumtypes.h),$(top_srcdir)/src/udev/gudev/gudevenumtypes.h) \ - $(top_srcdir)/src/udev/gudev/gudevclient.h \ - $(top_srcdir)/src/udev/gudev/gudevdevice.h \ - $(top_srcdir)/src/udev/gudev/gudevenumerator.h \ - $(top_srcdir)/src/udev/gudev/gudevclient.c \ - $(top_srcdir)/src/udev/gudev/gudevdevice.c \ - $(top_srcdir)/src/udev/gudev/gudevenumerator.c - -INTROSPECTION_GIRS = src/udev/gudev/GUdev-1.0.gir +src_gudev_GUdev_1_0_gir_FILES = \ + $(top_srcdir)/src/gudev/gudev.h \ + $(top_srcdir)/src/gudev/gudevtypes.h \ + $(top_srcdir)/src/gudev/gudevenums.h \ + $(or $(wildcard $(top_builddir)/src/gudev/gudevenumtypes.h),$(top_srcdir)/src/gudev/gudevenumtypes.h) \ + $(top_srcdir)/src/gudev/gudevclient.h \ + $(top_srcdir)/src/gudev/gudevdevice.h \ + $(top_srcdir)/src/gudev/gudevenumerator.h \ + $(top_srcdir)/src/gudev/gudevclient.c \ + $(top_srcdir)/src/gudev/gudevdevice.c \ + $(top_srcdir)/src/gudev/gudevenumerator.c + +INTROSPECTION_GIRS = src/gudev/GUdev-1.0.gir INTROSPECTION_SCANNER_ARGS = --c-include=gudev/gudev.h girdir = $(datadir)/gir-1.0 gir_DATA = \ - src/udev/gudev/GUdev-1.0.gir + src/gudev/GUdev-1.0.gir typelibsdir = $(libdir)/girepository-1.0 typelibs_DATA = \ - src/udev/gudev/GUdev-1.0.typelib + src/gudev/GUdev-1.0.typelib CLEANFILES += $(gir_DATA) $(typelibs_DATA) endif # HAVE_INTROSPECTION diff --git a/configure.ac b/configure.ac index 1d8c0e84..793b9437 100644 --- a/configure.ac +++ b/configure.ac @@ -700,10 +700,10 @@ AC_SUBST([rootlibdir], [$with_rootlibdir]) AC_CONFIG_FILES([ Makefile po/Makefile.in - src/udev/docs/Makefile - src/udev/docs/version.xml - src/udev/gudev/docs/Makefile - src/udev/gudev/docs/version.xml + docs/libudev/Makefile + docs/libudev/version.xml + docs/gudev/Makefile + docs/gudev/version.xml ]) AC_OUTPUT diff --git a/src/udev/gudev/docs/.gitignore b/docs/gudev/.gitignore similarity index 100% rename from src/udev/gudev/docs/.gitignore rename to docs/gudev/.gitignore diff --git a/src/udev/gudev/docs/Makefile.am b/docs/gudev/Makefile.am similarity index 92% rename from src/udev/gudev/docs/Makefile.am rename to docs/gudev/Makefile.am index 036ef430..803a2bbd 100644 --- a/src/udev/gudev/docs/Makefile.am +++ b/docs/gudev/Makefile.am @@ -21,7 +21,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml # 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 +DOC_SOURCE_DIR=$(top_srcdir)/src/gudev # Extra options to pass to gtkdoc-scangobj. Not normally needed. SCANGOBJ_OPTIONS= @@ -48,8 +48,8 @@ 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 +HFILE_GLOB=$(top_srcdir)/src/gudev/*.h +CFILE_GLOB=$(top_srcdir)/src/gudev/*.c # Extra header to include when scanning, which are not under DOC_SOURCE_DIR # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h @@ -78,10 +78,9 @@ expand_content_files= # 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 + $(GLIB_CFLAGS) \ + -I$(top_srcdir)/src/gudev \ + -I$(top_builddir)/src/gudev GTKDOC_LIBS = \ $(GLIB_LIBS) \ diff --git a/src/udev/gudev/docs/gudev-docs.xml b/docs/gudev/gudev-docs.xml similarity index 97% rename from src/udev/gudev/docs/gudev-docs.xml rename to docs/gudev/gudev-docs.xml index f876c3bc..2798edab 100644 --- a/src/udev/gudev/docs/gudev-docs.xml +++ b/docs/gudev/gudev-docs.xml @@ -82,6 +82,7 @@ Object Hierarchy + Index @@ -90,4 +91,5 @@ + diff --git a/src/udev/gudev/docs/gudev-sections.txt b/docs/gudev/gudev-sections.txt similarity index 100% rename from src/udev/gudev/docs/gudev-sections.txt rename to docs/gudev/gudev-sections.txt diff --git a/src/udev/gudev/docs/gudev.types b/docs/gudev/gudev.types similarity index 100% rename from src/udev/gudev/docs/gudev.types rename to docs/gudev/gudev.types diff --git a/src/udev/docs/version.xml.in b/docs/gudev/version.xml.in similarity index 100% rename from src/udev/docs/version.xml.in rename to docs/gudev/version.xml.in diff --git a/src/udev/docs/.gitignore b/docs/libudev/.gitignore similarity index 100% rename from src/udev/docs/.gitignore rename to docs/libudev/.gitignore diff --git a/src/udev/docs/Makefile.am b/docs/libudev/Makefile.am similarity index 93% rename from src/udev/docs/Makefile.am rename to docs/libudev/Makefile.am index 7cd4f974..9d1e3646 100644 --- a/src/udev/docs/Makefile.am +++ b/docs/libudev/Makefile.am @@ -21,7 +21,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml # 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 +DOC_SOURCE_DIR=$(top_srcdir)/src/libudev # Extra options to pass to gtkdoc-scangobj. Not normally needed. SCANGOBJ_OPTIONS= @@ -32,7 +32,7 @@ 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 +MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=udev # Extra options to supply to gtkdoc-mktmpl # e.g. MKTMPL_OPTIONS=--only-section-tmpl @@ -48,8 +48,8 @@ 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 +HFILE_GLOB=$(top_srcdir)/src/libudev/libudev*.h +CFILE_GLOB=$(top_srcdir)/src/libudev/libudev*.c # Extra header to include when scanning, which are not under DOC_SOURCE_DIR # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h @@ -57,7 +57,7 @@ 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 +IGNORE_HFILES = libudev-private.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png diff --git a/src/udev/docs/libudev-docs.xml b/docs/libudev/libudev-docs.xml similarity index 100% rename from src/udev/docs/libudev-docs.xml rename to docs/libudev/libudev-docs.xml diff --git a/src/udev/docs/libudev-sections.txt b/docs/libudev/libudev-sections.txt similarity index 98% rename from src/udev/docs/libudev-sections.txt rename to docs/libudev/libudev-sections.txt index 15c3e934..83b2b79e 100644 --- a/src/udev/docs/libudev-sections.txt +++ b/docs/libudev/libudev-sections.txt @@ -69,7 +69,6 @@ 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 diff --git a/src/udev/docs/libudev.types b/docs/libudev/libudev.types similarity index 100% rename from src/udev/docs/libudev.types rename to docs/libudev/libudev.types diff --git a/src/udev/gudev/docs/version.xml.in b/docs/libudev/version.xml.in similarity index 100% rename from src/udev/gudev/docs/version.xml.in rename to docs/libudev/version.xml.in diff --git a/src/udev/gudev/.gitignore b/src/gudev/.gitignore similarity index 100% rename from src/udev/gudev/.gitignore rename to src/gudev/.gitignore diff --git a/src/udev/gudev/gjs-example.js b/src/gudev/gjs-example.js similarity index 100% rename from src/udev/gudev/gjs-example.js rename to src/gudev/gjs-example.js diff --git a/src/udev/gudev/gudev-1.0.pc.in b/src/gudev/gudev-1.0.pc.in similarity index 100% rename from src/udev/gudev/gudev-1.0.pc.in rename to src/gudev/gudev-1.0.pc.in diff --git a/src/udev/gudev/gudev.h b/src/gudev/gudev.h similarity index 100% rename from src/udev/gudev/gudev.h rename to src/gudev/gudev.h diff --git a/src/udev/gudev/gudevclient.c b/src/gudev/gudevclient.c similarity index 100% rename from src/udev/gudev/gudevclient.c rename to src/gudev/gudevclient.c diff --git a/src/udev/gudev/gudevclient.h b/src/gudev/gudevclient.h similarity index 100% rename from src/udev/gudev/gudevclient.h rename to src/gudev/gudevclient.h diff --git a/src/udev/gudev/gudevdevice.c b/src/gudev/gudevdevice.c similarity index 100% rename from src/udev/gudev/gudevdevice.c rename to src/gudev/gudevdevice.c diff --git a/src/udev/gudev/gudevdevice.h b/src/gudev/gudevdevice.h similarity index 100% rename from src/udev/gudev/gudevdevice.h rename to src/gudev/gudevdevice.h diff --git a/src/udev/gudev/gudevenumerator.c b/src/gudev/gudevenumerator.c similarity index 100% rename from src/udev/gudev/gudevenumerator.c rename to src/gudev/gudevenumerator.c diff --git a/src/udev/gudev/gudevenumerator.h b/src/gudev/gudevenumerator.h similarity index 100% rename from src/udev/gudev/gudevenumerator.h rename to src/gudev/gudevenumerator.h diff --git a/src/udev/gudev/gudevenums.h b/src/gudev/gudevenums.h similarity index 100% rename from src/udev/gudev/gudevenums.h rename to src/gudev/gudevenums.h diff --git a/src/udev/gudev/gudevenumtypes.c.template b/src/gudev/gudevenumtypes.c.template similarity index 100% rename from src/udev/gudev/gudevenumtypes.c.template rename to src/gudev/gudevenumtypes.c.template diff --git a/src/udev/gudev/gudevenumtypes.h.template b/src/gudev/gudevenumtypes.h.template similarity index 100% rename from src/udev/gudev/gudevenumtypes.h.template rename to src/gudev/gudevenumtypes.h.template diff --git a/src/udev/gudev/gudevmarshal.list b/src/gudev/gudevmarshal.list similarity index 100% rename from src/udev/gudev/gudevmarshal.list rename to src/gudev/gudevmarshal.list diff --git a/src/udev/gudev/gudevprivate.h b/src/gudev/gudevprivate.h similarity index 100% rename from src/udev/gudev/gudevprivate.h rename to src/gudev/gudevprivate.h diff --git a/src/udev/gudev/gudevtypes.h b/src/gudev/gudevtypes.h similarity index 100% rename from src/udev/gudev/gudevtypes.h rename to src/gudev/gudevtypes.h diff --git a/src/udev/gudev/seed-example-enum.js b/src/gudev/seed-example-enum.js similarity index 100% rename from src/udev/gudev/seed-example-enum.js rename to src/gudev/seed-example-enum.js diff --git a/src/udev/gudev/seed-example.js b/src/gudev/seed-example.js similarity index 100% rename from src/udev/gudev/seed-example.js rename to src/gudev/seed-example.js diff --git a/src/udev/libudev-device-private.c b/src/libudev/libudev-device-private.c similarity index 100% rename from src/udev/libudev-device-private.c rename to src/libudev/libudev-device-private.c diff --git a/src/udev/libudev-device.c b/src/libudev/libudev-device.c similarity index 99% rename from src/udev/libudev-device.c rename to src/libudev/libudev-device.c index 40b00ac5..257d6355 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 similarity index 100% rename from src/udev/libudev-enumerate.c rename to src/libudev/libudev-enumerate.c diff --git a/src/udev/libudev-list.c b/src/libudev/libudev-list.c similarity index 100% rename from src/udev/libudev-list.c rename to src/libudev/libudev-list.c diff --git a/src/udev/libudev-monitor.c b/src/libudev/libudev-monitor.c similarity index 100% rename from src/udev/libudev-monitor.c rename to src/libudev/libudev-monitor.c diff --git a/src/udev/libudev-private.h b/src/libudev/libudev-private.h similarity index 100% rename from src/udev/libudev-private.h rename to src/libudev/libudev-private.h diff --git a/src/udev/libudev-queue-private.c b/src/libudev/libudev-queue-private.c similarity index 100% rename from src/udev/libudev-queue-private.c rename to src/libudev/libudev-queue-private.c diff --git a/src/udev/libudev-queue.c b/src/libudev/libudev-queue.c similarity index 100% rename from src/udev/libudev-queue.c rename to src/libudev/libudev-queue.c diff --git a/src/udev/libudev-selinux-private.c b/src/libudev/libudev-selinux-private.c similarity index 100% rename from src/udev/libudev-selinux-private.c rename to src/libudev/libudev-selinux-private.c diff --git a/src/udev/libudev-util-private.c b/src/libudev/libudev-util-private.c similarity index 100% rename from src/udev/libudev-util-private.c rename to src/libudev/libudev-util-private.c diff --git a/src/udev/libudev-util.c b/src/libudev/libudev-util.c similarity index 100% rename from src/udev/libudev-util.c rename to src/libudev/libudev-util.c diff --git a/src/udev/libudev.c b/src/libudev/libudev.c similarity index 100% rename from src/udev/libudev.c rename to src/libudev/libudev.c diff --git a/src/udev/libudev.h b/src/libudev/libudev.h similarity index 100% rename from src/udev/libudev.h rename to src/libudev/libudev.h diff --git a/src/udev/libudev.pc.in b/src/libudev/libudev.pc.in similarity index 100% rename from src/udev/libudev.pc.in rename to src/libudev/libudev.pc.in diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c index 6bfb7f78..8440b4cb 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, -- 2.39.5