summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac16
-rw-r--r--docs/gudev/version.xml1
-rw-r--r--docs/libudev/version.xml1
-rw-r--r--src/Makefile.am21
-rw-r--r--src/accelerometer/Makefile.am7
-rw-r--r--src/ata_id/Makefile.am8
-rw-r--r--src/cdrom_id/Makefile.am8
-rw-r--r--src/collect/Makefile.am8
-rw-r--r--src/gudev/Makefile.am2
-rw-r--r--src/gudev/gudevenumtypes.c30
-rw-r--r--src/gudev/gudevenumtypes.h19
-rw-r--r--src/gudev/gudevmarshal.c89
-rw-r--r--src/gudev/gudevmarshal.h20
-rw-r--r--src/mtd_probe/Makefile.am10
-rw-r--r--src/scsi_id/Makefile.am9
-rw-r--r--src/test/Makefile.am22
-rw-r--r--src/udev/Makefile.am5
-rw-r--r--src/v4l_id/Makefile.am4
18 files changed, 230 insertions, 50 deletions
diff --git a/configure.ac b/configure.ac
index 74ddba6032..87385e406c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -276,24 +276,24 @@ AC_CONFIG_FILES([Makefile
man/Makefile
rules/Makefile
src/Makefile
+ src/accelerometer/Makefile
+ src/ata_id/Makefile
+ src/cdrom_id/Makefile
+ src/collect/Makefile
+ src/mtd_probe/Makefile
+ src/scsi_id/Makefile
+ src/v4l_id/Makefile
src/gudev/Makefile
src/gudev/gudev-1.0.pc
src/libudev/Makefile
src/libudev/libudev.pc
src/udev/Makefile
src/udev/udev.pc
+ src/test/Makefile
test/Makefile])
-# src/accelerometer/Makefile
-# src/ata_id/Makefile
-# src/cdrom_id/Makefile
-# src/collect/Makefile
# src/keymap/Makefile
# src/keymap/keyboard-force-release.sh
-# src/mtd_probe/Makefile
-# src/scsi_id/Makefile
-# src/v4l_id/Makefile
#
-# src/test/Makefile
AC_OUTPUT
diff --git a/docs/gudev/version.xml b/docs/gudev/version.xml
new file mode 100644
index 0000000000..49d59571fb
--- /dev/null
+++ b/docs/gudev/version.xml
@@ -0,0 +1 @@
+0.1
diff --git a/docs/libudev/version.xml b/docs/libudev/version.xml
new file mode 100644
index 0000000000..49d59571fb
--- /dev/null
+++ b/docs/libudev/version.xml
@@ -0,0 +1 @@
+0.1
diff --git a/src/Makefile.am b/src/Makefile.am
index ef91872e5e..8b5821fa19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,19 +3,18 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
libudev \
udev \
- gudev
-
-# test
+ gudev \
+ test
# Helper programs
-#SUBDIRS += \
-# accelerometer
-# ata_id
-# cdrom_id
-# collect
-# mtd_probe
-# scsi_id
-# v4l_id
+SUBDIRS += \
+ accelerometer \
+ ata_id \
+ cdrom_id \
+ collect \
+ mtd_probe \
+ scsi_id \
+ v4l_id
#if ENABLE_KEYMAP
#SUBDIRS += \
diff --git a/src/accelerometer/Makefile.am b/src/accelerometer/Makefile.am
index dc06d4f747..5bb7ee4a58 100644
--- a/src/accelerometer/Makefile.am
+++ b/src/accelerometer/Makefile.am
@@ -3,6 +3,10 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
rootprefix=@rootprefix@
udevlibexecdir=$(rootprefix)/lib/udev
+AM_CPPFLAGS = \
+ -I $(top_srcdir)/src/libudev \
+ -I $(top_srcdir)/src/udev
+
udevlibexec_PROGRAMS = \
accelerometer
@@ -10,5 +14,6 @@ accelerometer_SOURCES = \
accelerometer.c
accelerometer_LDADD = \
- $(top_srcdir)/src/libudev/libudev.la \
+ $(top_builddir)/src/libudev/libudev-private.la \
+ $(top_builddir)/src/udev/libudev-core.la \
-lm
diff --git a/src/ata_id/Makefile.am b/src/ata_id/Makefile.am
index 50cb070344..a93d93f256 100644
--- a/src/ata_id/Makefile.am
+++ b/src/ata_id/Makefile.am
@@ -3,6 +3,10 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
rootprefix=@rootprefix@
udevlibexecdir=$(rootprefix)/lib/udev
+AM_CPPFLAGS = \
+ -I $(top_srcdir)/src/libudev \
+ -I $(top_srcdir)/src/udev
+
udevlibexec_PROGRAMS = \
ata_id
@@ -10,5 +14,5 @@ ata_id_SOURCES = \
ata_id.c
ata_id_LDADD = \
- $(top_srcdir)/src/libudev/libudev-private.la \
- $(top_srcdir)/src/udev/libudev-core.la
+ $(top_builddir)/src/libudev/libudev-private.la \
+ $(top_builddir)/src/udev/libudev-core.la
diff --git a/src/cdrom_id/Makefile.am b/src/cdrom_id/Makefile.am
index b08faeb77a..d5168b29cc 100644
--- a/src/cdrom_id/Makefile.am
+++ b/src/cdrom_id/Makefile.am
@@ -3,6 +3,10 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
rootprefix=@rootprefix@
udevlibexecdir=$(rootprefix)/lib/udev
+AM_CPPFLAGS = \
+ -I $(top_srcdir)/src/libudev \
+ -I $(top_srcdir)/src/udev
+
udevlibexec_PROGRAMS = \
cdrom_id
@@ -10,5 +14,5 @@ cdrom_id_SOURCES = \
cdrom_id.c
cdrom_id_LDADD = \
- $(top_srcdir)/src/libudev/libudev-private.la \
- $(top_srcdir)/src/udev/libudev-core.la
+ $(top_builddir)/src/libudev/libudev-private.la \
+ $(top_builddir)/src/udev/libudev-core.la
diff --git a/src/collect/Makefile.am b/src/collect/Makefile.am
index 4c954b99a9..58bc818475 100644
--- a/src/collect/Makefile.am
+++ b/src/collect/Makefile.am
@@ -3,6 +3,10 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
rootprefix=@rootprefix@
udevlibexecdir=$(rootprefix)/lib/udev
+AM_CPPFLAGS = \
+ -I $(top_srcdir)/src/libudev \
+ -I $(top_srcdir)/src/udev
+
udevlibexec_PROGRAMS = \
collect
@@ -10,5 +14,5 @@ collect_SOURCES = \
collect.c
collect_LDADD = \
- $(top_srcdir)/src/libudev/libudev-private.la \
- $(top_srcdir)/src/udev/libudev-core.la
+ $(top_builddir)/src/libudev/libudev-private.la \
+ $(top_builddir)/src/udev/libudev-core.la
diff --git a/src/gudev/Makefile.am b/src/gudev/Makefile.am
index c09e44d25d..7248e5b713 100644
--- a/src/gudev/Makefile.am
+++ b/src/gudev/Makefile.am
@@ -65,7 +65,7 @@ libgudev_1_0_la_CFLAGS = \
$(GLIB_CFLAGS)
libgudev_1_0_la_LIBADD = \
- $(top_srcdir)/src/libudev/libudev.la \
+ $(top_builddir)/src/libudev/libudev.la \
$(GLIB_LIBS)
libgudev_1_0_la_LDFLAGS = \
diff --git a/src/gudev/gudevenumtypes.c b/src/gudev/gudevenumtypes.c
new file mode 100644
index 0000000000..bcf633614a
--- /dev/null
+++ b/src/gudev/gudevenumtypes.c
@@ -0,0 +1,30 @@
+
+/* Generated data (by glib-mkenums) */
+
+#include <gudev.h>
+
+/* enumerations from "gudevenums.h" */
+GType
+g_udev_device_type_get_type (void)
+{
+ static volatile gsize g_define_type_id__volatile = 0;
+
+ if (g_once_init_enter (&g_define_type_id__volatile))
+ {
+ static const GEnumValue values[] = {
+ { G_UDEV_DEVICE_TYPE_NONE, "G_UDEV_DEVICE_TYPE_NONE", "none" },
+ { G_UDEV_DEVICE_TYPE_BLOCK, "G_UDEV_DEVICE_TYPE_BLOCK", "block" },
+ { G_UDEV_DEVICE_TYPE_CHAR, "G_UDEV_DEVICE_TYPE_CHAR", "char" },
+ { 0, NULL, NULL }
+ };
+ GType g_define_type_id =
+ g_enum_register_static (g_intern_static_string ("GUdevDeviceType"), values);
+ g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+ }
+
+ return g_define_type_id__volatile;
+}
+
+
+/* Generated data ends here */
+
diff --git a/src/gudev/gudevenumtypes.h b/src/gudev/gudevenumtypes.h
new file mode 100644
index 0000000000..8b431401f3
--- /dev/null
+++ b/src/gudev/gudevenumtypes.h
@@ -0,0 +1,19 @@
+
+/* Generated data (by glib-mkenums) */
+
+#ifndef __GUDEV_ENUM_TYPES_H__
+#define __GUDEV_ENUM_TYPES_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/* enumerations from "gudevenums.h" */
+GType g_udev_device_type_get_type (void) G_GNUC_CONST;
+#define G_TYPE_UDEV_DEVICE_TYPE (g_udev_device_type_get_type ())
+G_END_DECLS
+
+#endif /* __GUDEV_ENUM_TYPES_H__ */
+
+/* Generated data ends here */
+
diff --git a/src/gudev/gudevmarshal.c b/src/gudev/gudevmarshal.c
new file mode 100644
index 0000000000..26e747d172
--- /dev/null
+++ b/src/gudev/gudevmarshal.c
@@ -0,0 +1,89 @@
+#include "gudevmarshal.h"
+
+#include <glib-object.h>
+
+
+#ifdef G_ENABLE_DEBUG
+#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
+#define g_marshal_value_peek_char(v) g_value_get_schar (v)
+#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v)
+#define g_marshal_value_peek_int(v) g_value_get_int (v)
+#define g_marshal_value_peek_uint(v) g_value_get_uint (v)
+#define g_marshal_value_peek_long(v) g_value_get_long (v)
+#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v)
+#define g_marshal_value_peek_int64(v) g_value_get_int64 (v)
+#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v)
+#define g_marshal_value_peek_enum(v) g_value_get_enum (v)
+#define g_marshal_value_peek_flags(v) g_value_get_flags (v)
+#define g_marshal_value_peek_float(v) g_value_get_float (v)
+#define g_marshal_value_peek_double(v) g_value_get_double (v)
+#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
+#define g_marshal_value_peek_param(v) g_value_get_param (v)
+#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
+#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
+#define g_marshal_value_peek_object(v) g_value_get_object (v)
+#define g_marshal_value_peek_variant(v) g_value_get_variant (v)
+#else /* !G_ENABLE_DEBUG */
+/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
+ * Do not access GValues directly in your code. Instead, use the
+ * g_value_get_*() functions
+ */
+#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int
+#define g_marshal_value_peek_char(v) (v)->data[0].v_int
+#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint
+#define g_marshal_value_peek_int(v) (v)->data[0].v_int
+#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint
+#define g_marshal_value_peek_long(v) (v)->data[0].v_long
+#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong
+#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64
+#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64
+#define g_marshal_value_peek_enum(v) (v)->data[0].v_long
+#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong
+#define g_marshal_value_peek_float(v) (v)->data[0].v_float
+#define g_marshal_value_peek_double(v) (v)->data[0].v_double
+#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer
+#endif /* !G_ENABLE_DEBUG */
+
+
+/* VOID:STRING,OBJECT (gudevmarshal.list:1) */
+void
+g_udev_marshal_VOID__STRING_OBJECT (GClosure *closure,
+ GValue *return_value G_GNUC_UNUSED,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint G_GNUC_UNUSED,
+ gpointer marshal_data)
+{
+ typedef void (*GMarshalFunc_VOID__STRING_OBJECT) (gpointer data1,
+ gpointer arg_1,
+ gpointer arg_2,
+ gpointer data2);
+ register GMarshalFunc_VOID__STRING_OBJECT callback;
+ register GCClosure *cc = (GCClosure*) closure;
+ register gpointer data1, data2;
+
+ g_return_if_fail (n_param_values == 3);
+
+ if (G_CCLOSURE_SWAP_DATA (closure))
+ {
+ data1 = closure->data;
+ data2 = g_value_peek_pointer (param_values + 0);
+ }
+ else
+ {
+ data1 = g_value_peek_pointer (param_values + 0);
+ data2 = closure->data;
+ }
+ callback = (GMarshalFunc_VOID__STRING_OBJECT) (marshal_data ? marshal_data : cc->callback);
+
+ callback (data1,
+ g_marshal_value_peek_string (param_values + 1),
+ g_marshal_value_peek_object (param_values + 2),
+ data2);
+}
+
diff --git a/src/gudev/gudevmarshal.h b/src/gudev/gudevmarshal.h
new file mode 100644
index 0000000000..0c059e3a04
--- /dev/null
+++ b/src/gudev/gudevmarshal.h
@@ -0,0 +1,20 @@
+
+#ifndef __g_udev_marshal_MARSHAL_H__
+#define __g_udev_marshal_MARSHAL_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+/* VOID:STRING,OBJECT (gudevmarshal.list:1) */
+extern void g_udev_marshal_VOID__STRING_OBJECT (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+
+G_END_DECLS
+
+#endif /* __g_udev_marshal_MARSHAL_H__ */
+
diff --git a/src/mtd_probe/Makefile.am b/src/mtd_probe/Makefile.am
index dc87d37fe3..2c6cca00ae 100644
--- a/src/mtd_probe/Makefile.am
+++ b/src/mtd_probe/Makefile.am
@@ -3,13 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
rootprefix=@rootprefix@
udevlibexecdir=$(rootprefix)/lib/udev
-AM_CPPFLAGS = \
- -include $(top_builddir)/config.h \
- -DROOTPREFIX=\"$(rootprefix)\" \
- -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
- -I $(top_srcdir)/src/libudev \
- -I $(top_srcdir)/src/udev
-
udevlibexec_PROGRAMS = \
mtd_probe
@@ -17,6 +10,3 @@ mtd_probe_SOURCES = \
mtd_probe.c \
mtd_probe.h \
probe_smartmedia.c
-
-mtd_probe_CPPFLAGS = \
- $(AM_CPPFLAGS)
diff --git a/src/scsi_id/Makefile.am b/src/scsi_id/Makefile.am
index 9628bc2670..6412692afe 100644
--- a/src/scsi_id/Makefile.am
+++ b/src/scsi_id/Makefile.am
@@ -3,6 +3,11 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
rootprefix=@rootprefix@
udevlibexecdir=$(rootprefix)/lib/udev
+AM_CPPFLAGS = \
+ -DVERSION \
+ -I $(top_srcdir)/src/libudev \
+ -I $(top_srcdir)/src/udev
+
udevlibexec_PROGRAMS = \
scsi_id
@@ -13,8 +18,8 @@ scsi_id_SOURCES =\
scsi_id.h
scsi_id_LDADD = \
- $(top_srcdir)/src/libudev/libudev-private.la \
- $(top_srcdir)/src/udev/libudev-core.la
+ $(top_builddir)/src/libudev/libudev-private.la \
+ $(top_builddir)/src/udev/libudev-core.la
EXTRA_DIST = \
README
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 3c6095ee88..ff45517cdf 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -1,5 +1,11 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+AM_CPPFLAGS = \
+ -DVERSION \
+ -DCLONE_NEWNS \
+ -I $(top_srcdir)/src/libudev \
+ -I $(top_srcdir)/src/udev
+
noinst_PROGRAMS = \
test-libudev \
test-udev
@@ -8,17 +14,21 @@ test_libudev_SOURCES = \
test-libudev.c
test_libudev_LDADD = \
- $(top_srcdir)/src/libudev/libudev.la
+ $(top_builddir)/src/libudev/libudev-private.la \
+ $(top_builddir)/src/udev/libudev-core.la
test_libudev_CPPFLAGS = \
- -I $(top_srcdir)/src/libudev
+ -I $(top_srcdir)/src/libudev \
+ $(AM_CPPFLAGS)
test_udev_SOURCES = \
test-udev.c
-test_udev_CPPFLAGS = \
- -I $(top_srcdir)/src/udev
-
test_udev_LDADD = \
- $(top_srcdir)/src/udev/libudev-core.la \
+ $(top_builddir)/src/libudev/libudev-private.la \
+ $(top_builddir)/src/udev/libudev-core.la \
$(SELINUX_LIBS)
+
+test_udev_CPPFLAGS = \
+ -I $(top_srcdir)/src/udev \
+ $(AM_CPPFLAGS)
diff --git a/src/udev/Makefile.am b/src/udev/Makefile.am
index 0052c75234..e373ce2183 100644
--- a/src/udev/Makefile.am
+++ b/src/udev/Makefile.am
@@ -8,8 +8,7 @@ AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DROOTPREFIX=\"$(rootprefix)\" \
-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
- -I $(top_srcdir)/src/libudev \
- -I $(top_srcdir)/src/udev
+ -I $(top_srcdir)/src/libudev
sbin_PROGRAMS = \
udevd \
@@ -102,7 +101,7 @@ libudev_core_la_CFLAGS = \
$(AM_CFLAGS)
libudev_core_la_LIBADD = \
- $(top_srcdir)/src/libudev/libudev-private.la
+ $(top_builddir)/src/libudev/libudev-private.la
if HAVE_ACL
libudev_core_la_SOURCES += \
diff --git a/src/v4l_id/Makefile.am b/src/v4l_id/Makefile.am
index 0cb18e8ad3..4569535d8d 100644
--- a/src/v4l_id/Makefile.am
+++ b/src/v4l_id/Makefile.am
@@ -10,5 +10,5 @@ v4l_id_SOURCES = \
v4l_id.c
v4l_id_LDADD = \
- $(top_srcdir)/src/libudev/libudev-private.la \
- $(top_srcdir)/src/udev/libudev-core.la
+ $(top_builddir)/src/libudev/libudev-private.la \
+ $(top_builddir)/src/udev/libudev-core.la
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-12 04:37:58 +0000