udev: move libudev, gudev to src/; move gudev/docs/, udev/docs/ to to docs/
This commit is contained in:
Kay Sievers
parent
74afee9c18
commit
bb061708d5
158
Makefile.am
158
Makefile.am
|
|
@ -136,7 +136,7 @@ AM_CPPFLAGS = \
|
||||||
-I $(top_srcdir)/src/journal \
|
-I $(top_srcdir)/src/journal \
|
||||||
-I $(top_srcdir)/src/systemd \
|
-I $(top_srcdir)/src/systemd \
|
||||||
-I $(top_srcdir)/src/core \
|
-I $(top_srcdir)/src/core \
|
||||||
-I $(top_srcdir)/src/udev
|
-I $(top_srcdir)/src/libudev
|
||||||
|
|
||||||
AM_CFLAGS = $(WARNINGFLAGS)
|
AM_CFLAGS = $(WARNINGFLAGS)
|
||||||
AM_LDFLAGS = $(GCLDFLAGS)
|
AM_LDFLAGS = $(GCLDFLAGS)
|
||||||
|
|
@ -1275,23 +1275,23 @@ EXTRA_DIST += \
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
SUBDIRS += \
|
SUBDIRS += \
|
||||||
src/udev/docs
|
docs/libudev
|
||||||
|
|
||||||
include_HEADERS += \
|
include_HEADERS += \
|
||||||
src/udev/libudev.h
|
src/libudev/libudev.h
|
||||||
|
|
||||||
lib_LTLIBRARIES += \
|
lib_LTLIBRARIES += \
|
||||||
libudev.la
|
libudev.la
|
||||||
|
|
||||||
libudev_la_SOURCES =\
|
libudev_la_SOURCES =\
|
||||||
src/udev/libudev-private.h \
|
src/libudev/libudev-private.h \
|
||||||
src/udev/libudev.c \
|
src/libudev/libudev.c \
|
||||||
src/udev/libudev-list.c \
|
src/libudev/libudev-list.c \
|
||||||
src/udev/libudev-util.c \
|
src/libudev/libudev-util.c \
|
||||||
src/udev/libudev-device.c \
|
src/libudev/libudev-device.c \
|
||||||
src/udev/libudev-enumerate.c \
|
src/libudev/libudev-enumerate.c \
|
||||||
src/udev/libudev-monitor.c \
|
src/libudev/libudev-monitor.c \
|
||||||
src/udev/libudev-queue.c
|
src/libudev/libudev-queue.c
|
||||||
|
|
||||||
libudev_la_CFLAGS = \
|
libudev_la_CFLAGS = \
|
||||||
$(AM_CFLAGS) \
|
$(AM_CFLAGS) \
|
||||||
|
|
@ -1302,13 +1302,13 @@ libudev_la_LDFLAGS = \
|
||||||
-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
|
-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
|
||||||
|
|
||||||
pkgconfiglib_DATA += \
|
pkgconfiglib_DATA += \
|
||||||
src/udev/libudev.pc
|
src/libudev/libudev.pc
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
src/udev/libudev.pc.in
|
src/libudev/libudev.pc.in
|
||||||
|
|
||||||
CLEANFILES += \
|
CLEANFILES += \
|
||||||
src/udev/libudev.pc
|
src/libudev/libudev.pc
|
||||||
|
|
||||||
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
|
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
|
||||||
libudev-install-move-hook:
|
libudev-install-move-hook:
|
||||||
|
|
@ -1332,13 +1332,13 @@ noinst_LTLIBRARIES += \
|
||||||
|
|
||||||
libudev_private_la_SOURCES =\
|
libudev_private_la_SOURCES =\
|
||||||
$(libudev_la_SOURCES) \
|
$(libudev_la_SOURCES) \
|
||||||
src/udev/libudev-util-private.c \
|
src/libudev/libudev-util-private.c \
|
||||||
src/udev/libudev-device-private.c \
|
src/libudev/libudev-device-private.c \
|
||||||
src/udev/libudev-queue-private.c
|
src/libudev/libudev-queue-private.c
|
||||||
|
|
||||||
if HAVE_SELINUX
|
if HAVE_SELINUX
|
||||||
libudev_private_la_SOURCES +=\
|
libudev_private_la_SOURCES +=\
|
||||||
src/udev/libudev-selinux-private.c
|
src/libudev/libudev-selinux-private.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libudev_private_la_CFLAGS = \
|
libudev_private_la_CFLAGS = \
|
||||||
|
|
@ -1606,49 +1606,49 @@ dist_udevrules_DATA += \
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
if ENABLE_GUDEV
|
if ENABLE_GUDEV
|
||||||
SUBDIRS += \
|
SUBDIRS += \
|
||||||
src/udev/gudev/docs
|
docs/gudev
|
||||||
|
|
||||||
libgudev_includedir = \
|
libgudev_includedir = \
|
||||||
$(includedir)/gudev-1.0/gudev
|
$(includedir)/gudev-1.0/gudev
|
||||||
|
|
||||||
libgudev_include_HEADERS = \
|
libgudev_include_HEADERS = \
|
||||||
src/udev/gudev/gudev.h \
|
src/gudev/gudev.h \
|
||||||
src/udev/gudev/gudevenums.h \
|
src/gudev/gudevenums.h \
|
||||||
src/udev/gudev/gudevenumtypes.h \
|
src/gudev/gudevenumtypes.h \
|
||||||
src/udev/gudev/gudevtypes.h \
|
src/gudev/gudevtypes.h \
|
||||||
src/udev/gudev/gudevclient.h \
|
src/gudev/gudevclient.h \
|
||||||
src/udev/gudev/gudevdevice.h \
|
src/gudev/gudevdevice.h \
|
||||||
src/udev/gudev/gudevenumerator.h
|
src/gudev/gudevenumerator.h
|
||||||
|
|
||||||
lib_LTLIBRARIES += libgudev-1.0.la
|
lib_LTLIBRARIES += libgudev-1.0.la
|
||||||
|
|
||||||
pkgconfiglib_DATA += \
|
pkgconfiglib_DATA += \
|
||||||
src/udev/gudev/gudev-1.0.pc
|
src/gudev/gudev-1.0.pc
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
src/udev/gudev/gudev-1.0.pc.in
|
src/gudev/gudev-1.0.pc.in
|
||||||
|
|
||||||
CLEANFILES += \
|
CLEANFILES += \
|
||||||
src/udev/gudev/gudev-1.0.pc
|
src/gudev/gudev-1.0.pc
|
||||||
|
|
||||||
libgudev_1_0_la_SOURCES = \
|
libgudev_1_0_la_SOURCES = \
|
||||||
src/udev/gudev/gudevenums.h \
|
src/gudev/gudevenums.h \
|
||||||
src/udev/gudev/gudevenumtypes.h \
|
src/gudev/gudevenumtypes.h \
|
||||||
src/udev/gudev/gudevenumtypes.h\
|
src/gudev/gudevenumtypes.h\
|
||||||
src/udev/gudev/gudevtypes.h \
|
src/gudev/gudevtypes.h \
|
||||||
src/udev/gudev/gudevclient.h \
|
src/gudev/gudevclient.h \
|
||||||
src/udev/gudev/gudevclient.c \
|
src/gudev/gudevclient.c \
|
||||||
src/udev/gudev/gudevdevice.h \
|
src/gudev/gudevdevice.h \
|
||||||
src/udev/gudev/gudevdevice.c \
|
src/gudev/gudevdevice.c \
|
||||||
src/udev/gudev/gudevenumerator.h \
|
src/gudev/gudevenumerator.h \
|
||||||
src/udev/gudev/gudevenumerator.c \
|
src/gudev/gudevenumerator.c \
|
||||||
src/udev/gudev/gudevprivate.h
|
src/gudev/gudevprivate.h
|
||||||
|
|
||||||
nodist_libgudev_1_0_la_SOURCES = \
|
nodist_libgudev_1_0_la_SOURCES = \
|
||||||
src/udev/gudev/gudevmarshal.h \
|
src/gudev/gudevmarshal.h \
|
||||||
src/udev/gudev/gudevmarshal.c \
|
src/gudev/gudevmarshal.c \
|
||||||
src/udev/gudev/gudevenumtypes.h \
|
src/gudev/gudevenumtypes.h \
|
||||||
src/udev/gudev/gudevenumtypes.c
|
src/gudev/gudevenumtypes.c
|
||||||
|
|
||||||
BUILT_SOURCES += \
|
BUILT_SOURCES += \
|
||||||
$(nodist_libgudev_1_0_la_SOURCES)
|
$(nodist_libgudev_1_0_la_SOURCES)
|
||||||
|
|
@ -1657,10 +1657,8 @@ libgudev_1_0_la_CPPFLAGS = \
|
||||||
$(AM_CPPFLAGS) \
|
$(AM_CPPFLAGS) \
|
||||||
-I$(top_builddir)/src\
|
-I$(top_builddir)/src\
|
||||||
-I$(top_srcdir)/src\
|
-I$(top_srcdir)/src\
|
||||||
-I$(top_builddir)/src/udev \
|
-I$(top_builddir)/src/gudev \
|
||||||
-I$(top_srcdir)/src/udev \
|
-I$(top_srcdir)/src/gudev \
|
||||||
-I$(top_builddir)/src/udev/gudev \
|
|
||||||
-I$(top_srcdir)/src/udev/gudev \
|
|
||||||
-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
|
-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
|
||||||
-D_GUDEV_COMPILATION \
|
-D_GUDEV_COMPILATION \
|
||||||
-DG_LOG_DOMAIN=\"GUdev\"
|
-DG_LOG_DOMAIN=\"GUdev\"
|
||||||
|
|
@ -1681,73 +1679,75 @@ libgudev_1_0_la_LDFLAGS = \
|
||||||
-export-symbols-regex '^g_udev_.*'
|
-export-symbols-regex '^g_udev_.*'
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
src/udev/gudev/gudevmarshal.list \
|
src/gudev/gudevmarshal.list \
|
||||||
src/udev/gudev/gudevenumtypes.h.template \
|
src/gudev/gudevenumtypes.h.template \
|
||||||
src/udev/gudev/gudevenumtypes.c.template \
|
src/gudev/gudevenumtypes.c.template \
|
||||||
src/udev/gudev/gjs-example.js \
|
src/gudev/gjs-example.js \
|
||||||
src/udev/gudev/seed-example-enum.js \
|
src/gudev/seed-example-enum.js \
|
||||||
src/udev/gudev/seed-example.js
|
src/gudev/seed-example.js
|
||||||
|
|
||||||
CLEANFILES += \
|
CLEANFILES += \
|
||||||
$(nodist_libgudev_1_0_la_SOURCES)
|
$(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 > $@
|
$(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\"" > $@ && \
|
$(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \
|
||||||
glib-genmarshal $< --prefix=g_udev_marshal --body >> $@
|
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 $^ > \
|
$(AM_V_GEN)glib-mkenums --template $^ > \
|
||||||
$@.tmp && mv $@.tmp $@
|
$@.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 $^ > \
|
$(AM_V_GEN)glib-mkenums --template $^ > \
|
||||||
$@.tmp && mv $@.tmp $@
|
$@.tmp && mv $@.tmp $@
|
||||||
|
|
||||||
if HAVE_INTROSPECTION
|
if HAVE_INTROSPECTION
|
||||||
-include $(INTROSPECTION_MAKEFILE)
|
-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) \
|
$(INCLUDES) \
|
||||||
-D_GUDEV_COMPILATION \
|
-D_GUDEV_COMPILATION \
|
||||||
-D_GUDEV_WORK_AROUND_DEV_T_BUG \
|
-D_GUDEV_WORK_AROUND_DEV_T_BUG \
|
||||||
-I$(top_srcdir)/src/udev \
|
-I$(top_srcdir)/src \
|
||||||
-I$(top_builddir)/src/udev
|
-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 \
|
--pkg-export=gudev-1.0 \
|
||||||
--warn-all
|
--warn-all
|
||||||
|
|
||||||
src_udev_gudev_GUdev_1_0_gir_FILES = \
|
src_gudev_GUdev_1_0_gir_FILES = \
|
||||||
$(top_srcdir)/src/udev/gudev/gudev.h \
|
$(top_srcdir)/src/gudev/gudev.h \
|
||||||
$(top_srcdir)/src/udev/gudev/gudevtypes.h \
|
$(top_srcdir)/src/gudev/gudevtypes.h \
|
||||||
$(top_srcdir)/src/udev/gudev/gudevenums.h \
|
$(top_srcdir)/src/gudev/gudevenums.h \
|
||||||
$(or $(wildcard $(top_builddir)/src/udev/gudev/gudevenumtypes.h),$(top_srcdir)/src/udev/gudev/gudevenumtypes.h) \
|
$(or $(wildcard $(top_builddir)/src/gudev/gudevenumtypes.h),$(top_srcdir)/src/gudev/gudevenumtypes.h) \
|
||||||
$(top_srcdir)/src/udev/gudev/gudevclient.h \
|
$(top_srcdir)/src/gudev/gudevclient.h \
|
||||||
$(top_srcdir)/src/udev/gudev/gudevdevice.h \
|
$(top_srcdir)/src/gudev/gudevdevice.h \
|
||||||
$(top_srcdir)/src/udev/gudev/gudevenumerator.h \
|
$(top_srcdir)/src/gudev/gudevenumerator.h \
|
||||||
$(top_srcdir)/src/udev/gudev/gudevclient.c \
|
$(top_srcdir)/src/gudev/gudevclient.c \
|
||||||
$(top_srcdir)/src/udev/gudev/gudevdevice.c \
|
$(top_srcdir)/src/gudev/gudevdevice.c \
|
||||||
$(top_srcdir)/src/udev/gudev/gudevenumerator.c
|
$(top_srcdir)/src/gudev/gudevenumerator.c
|
||||||
|
|
||||||
INTROSPECTION_GIRS = src/udev/gudev/GUdev-1.0.gir
|
INTROSPECTION_GIRS = src/gudev/GUdev-1.0.gir
|
||||||
INTROSPECTION_SCANNER_ARGS = --c-include=gudev/gudev.h
|
INTROSPECTION_SCANNER_ARGS = --c-include=gudev/gudev.h
|
||||||
|
|
||||||
girdir = $(datadir)/gir-1.0
|
girdir = $(datadir)/gir-1.0
|
||||||
gir_DATA = \
|
gir_DATA = \
|
||||||
src/udev/gudev/GUdev-1.0.gir
|
src/gudev/GUdev-1.0.gir
|
||||||
|
|
||||||
typelibsdir = $(libdir)/girepository-1.0
|
typelibsdir = $(libdir)/girepository-1.0
|
||||||
typelibs_DATA = \
|
typelibs_DATA = \
|
||||||
src/udev/gudev/GUdev-1.0.typelib
|
src/gudev/GUdev-1.0.typelib
|
||||||
|
|
||||||
CLEANFILES += $(gir_DATA) $(typelibs_DATA)
|
CLEANFILES += $(gir_DATA) $(typelibs_DATA)
|
||||||
endif # HAVE_INTROSPECTION
|
endif # HAVE_INTROSPECTION
|
||||||
|
|
|
||||||
|
|
@ -700,10 +700,10 @@ AC_SUBST([rootlibdir], [$with_rootlibdir])
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
Makefile po/Makefile.in
|
Makefile po/Makefile.in
|
||||||
src/udev/docs/Makefile
|
docs/libudev/Makefile
|
||||||
src/udev/docs/version.xml
|
docs/libudev/version.xml
|
||||||
src/udev/gudev/docs/Makefile
|
docs/gudev/Makefile
|
||||||
src/udev/gudev/docs/version.xml
|
docs/gudev/version.xml
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
|
||||||
|
|
@ -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
|
# gtk-doc will search all .c & .h files beneath here for inline comments
|
||||||
# documenting the functions and macros.
|
# documenting the functions and macros.
|
||||||
# e.g. DOC_SOURCE_DIR=../../../gtk
|
# 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.
|
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
|
||||||
SCANGOBJ_OPTIONS=
|
SCANGOBJ_OPTIONS=
|
||||||
|
|
@ -48,8 +48,8 @@ FIXXREF_OPTIONS=
|
||||||
# Used for dependencies. The docs will be rebuilt if any of these change.
|
# Used for dependencies. The docs will be rebuilt if any of these change.
|
||||||
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
|
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
|
||||||
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
|
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
|
||||||
HFILE_GLOB=$(top_srcdir)/src/udev/gudev/*.h
|
HFILE_GLOB=$(top_srcdir)/src/gudev/*.h
|
||||||
CFILE_GLOB=$(top_srcdir)/src/udev/gudev/*.c
|
CFILE_GLOB=$(top_srcdir)/src/gudev/*.c
|
||||||
|
|
||||||
# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
|
# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
|
||||||
# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
|
# 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_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
|
||||||
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
|
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
|
||||||
GTKDOC_CFLAGS = \
|
GTKDOC_CFLAGS = \
|
||||||
$(DBUS_GLIB_CFLAGS) \
|
$(GLIB_CFLAGS) \
|
||||||
$(GLIB_CFLAGS) \
|
-I$(top_srcdir)/src/gudev \
|
||||||
-I$(top_srcdir)/src/udev/gudev \
|
-I$(top_builddir)/src/gudev
|
||||||
-I$(top_builddir)/src/udev/gudev
|
|
||||||
|
|
||||||
GTKDOC_LIBS = \
|
GTKDOC_LIBS = \
|
||||||
$(GLIB_LIBS) \
|
$(GLIB_LIBS) \
|
||||||
|
|
@ -82,6 +82,7 @@
|
||||||
<title>Object Hierarchy</title>
|
<title>Object Hierarchy</title>
|
||||||
<xi:include href="xml/tree_index.sgml"/>
|
<xi:include href="xml/tree_index.sgml"/>
|
||||||
</chapter>
|
</chapter>
|
||||||
|
|
||||||
<index>
|
<index>
|
||||||
<title>Index</title>
|
<title>Index</title>
|
||||||
</index>
|
</index>
|
||||||
|
|
@ -90,4 +91,5 @@
|
||||||
<xi:include href="xml/api-index-165.xml"><xi:fallback /></xi:include>
|
<xi:include href="xml/api-index-165.xml"><xi:fallback /></xi:include>
|
||||||
</index>
|
</index>
|
||||||
|
|
||||||
|
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
|
||||||
</book>
|
</book>
|
||||||
|
|
@ -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
|
# gtk-doc will search all .c & .h files beneath here for inline comments
|
||||||
# documenting the functions and macros.
|
# documenting the functions and macros.
|
||||||
# e.g. DOC_SOURCE_DIR=../../../gtk
|
# 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.
|
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
|
||||||
SCANGOBJ_OPTIONS=
|
SCANGOBJ_OPTIONS=
|
||||||
|
|
@ -32,7 +32,7 @@ SCAN_OPTIONS=
|
||||||
|
|
||||||
# Extra options to supply to gtkdoc-mkdb.
|
# Extra options to supply to gtkdoc-mkdb.
|
||||||
# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
|
# 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
|
# Extra options to supply to gtkdoc-mktmpl
|
||||||
# e.g. MKTMPL_OPTIONS=--only-section-tmpl
|
# 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.
|
# Used for dependencies. The docs will be rebuilt if any of these change.
|
||||||
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
|
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
|
||||||
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
|
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
|
||||||
HFILE_GLOB=$(top_srcdir)/src/udev/libudev*.h
|
HFILE_GLOB=$(top_srcdir)/src/libudev/libudev*.h
|
||||||
CFILE_GLOB=$(top_srcdir)/src/udev/libudev*.c
|
CFILE_GLOB=$(top_srcdir)/src/libudev/libudev*.c
|
||||||
|
|
||||||
# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
|
# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
|
||||||
# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
|
# 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
|
# Header files to ignore when scanning. Use base file name, no paths
|
||||||
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
|
# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
|
||||||
IGNORE_HFILES= libudev-private.h
|
IGNORE_HFILES = libudev-private.h
|
||||||
|
|
||||||
# Images to copy into HTML directory.
|
# Images to copy into HTML directory.
|
||||||
# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
|
# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
|
||||||
|
|
@ -69,7 +69,6 @@ udev_monitor_ref
|
||||||
udev_monitor_unref
|
udev_monitor_unref
|
||||||
udev_monitor_get_udev
|
udev_monitor_get_udev
|
||||||
udev_monitor_new_from_netlink
|
udev_monitor_new_from_netlink
|
||||||
udev_monitor_new_from_socket
|
|
||||||
udev_monitor_enable_receiving
|
udev_monitor_enable_receiving
|
||||||
udev_monitor_set_receive_buffer_size
|
udev_monitor_set_receive_buffer_size
|
||||||
udev_monitor_get_fd
|
udev_monitor_get_fd
|
||||||
|
|
@ -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
|
* Retrieve the list of device links pointing to the device file of
|
||||||
* the udev device. The next list entry can be retrieved with
|
* 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
|
* 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
|
* udev_list_entry_get_name(). The path is an absolute path, and starts with
|
||||||
* the device directory.
|
* the device directory.
|
||||||
|
|
@ -1163,10 +1163,10 @@ void udev_device_cleanup_devlinks_list(struct udev_device *udev_device)
|
||||||
* @udev_device: udev device
|
* @udev_device: udev device
|
||||||
*
|
*
|
||||||
* Retrieve the list of key/value device properties of the udev
|
* 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
|
* which returns #NULL if no more entries exist. The property name
|
||||||
* 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(),
|
||||||
* the property value by udev_list_get_value().
|
* the property value by udev_list_entry_get_value().
|
||||||
*
|
*
|
||||||
* Returns: the first entry of the property list
|
* 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
|
* @udev_device: udev device
|
||||||
*
|
*
|
||||||
* Retrieve the list of tags attached to the udev device. The next
|
* 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
|
* 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
|
* Returns: the first entry of the tag list
|
||||||
**/
|
**/
|
||||||
|
|
@ -469,10 +469,10 @@ static int prepend_vendor_model(struct udev *udev,
|
||||||
return ind;
|
return ind;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* check_fill_0x83_id - check the page 0x83 id, if OK allocate and fill
|
* check_fill_0x83_id - check the page 0x83 id, if OK allocate and fill
|
||||||
* serial number.
|
* serial number.
|
||||||
**/
|
*/
|
||||||
static int check_fill_0x83_id(struct udev *udev,
|
static int check_fill_0x83_id(struct udev *udev,
|
||||||
struct scsi_id_device *dev_scsi,
|
struct scsi_id_device *dev_scsi,
|
||||||
unsigned char *page_83,
|
unsigned char *page_83,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue