diff --git a/.gitignore b/.gitignore index 5a5c4a00b67..e80fd08c687 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,7 @@ stamp-h1 depcomp udev-test-install gtk-doc.make +udevd +udevadm +test-udev +test-libudev diff --git a/Makefile.am b/Makefile.am index 7abad22a61b..4329291243c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ # ------------------------------------------------------------------------------ -# Copyright (C) 2008-2009 Kay Sievers +# Copyright (C) 2008-2012 Kay Sievers # Copyright (C) 2009 Diego Elio 'Flameeyes' Pettenò # ------------------------------------------------------------------------------ @@ -11,7 +11,7 @@ AM_MAKEFLAGS = --no-print-directory AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ - -I$(top_srcdir)/libudev \ + -I$(top_srcdir)/src \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DPKGLIBEXECDIR=\""$(libexecdir)/udev"\" @@ -36,9 +36,11 @@ INSTALL_EXEC_HOOKS = INSTALL_DATA_HOOKS = UNINSTALL_EXEC_HOOKS = DISTCHECK_HOOKS = -pkglibexec_SCRIPTS = -dist_pkglibexec_SCRIPTS = -dist_pkglibexec_DATA = + +udevhomedir = $(libexecdir)/udev +udevhome_SCRIPTS = +dist_udevhome_SCRIPTS = +dist_udevhome_DATA = SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ @@ -76,45 +78,45 @@ LIBUDEV_CURRENT=13 LIBUDEV_REVISION=0 LIBUDEV_AGE=13 -SUBDIRS += libudev/docs +SUBDIRS += src/docs -include_HEADERS = libudev/libudev.h -lib_LTLIBRARIES = libudev/libudev.la +include_HEADERS = src/libudev.h +lib_LTLIBRARIES = src/libudev.la -libudev_libudev_la_SOURCES =\ - libudev/libudev-private.h \ - libudev/libudev.c \ - libudev/libudev-list.c \ - libudev/libudev-util.c \ - libudev/libudev-device.c \ - libudev/libudev-enumerate.c \ - libudev/libudev-monitor.c \ - libudev/libudev-queue.c +src_libudev_la_SOURCES =\ + src/libudev-private.h \ + src/libudev.c \ + src/libudev-list.c \ + src/libudev-util.c \ + src/libudev-device.c \ + src/libudev-enumerate.c \ + src/libudev-monitor.c \ + src/libudev-queue.c -libudev_libudev_la_LDFLAGS = \ +src_libudev_la_LDFLAGS = \ $(AM_LDFLAGS) \ -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) noinst_LTLIBRARIES = \ - libudev/libudev-private.la + src/libudev-private.la -libudev_libudev_private_la_SOURCES =\ - $(libudev_libudev_la_SOURCES) \ - libudev/libudev-util-private.c \ - libudev/libudev-device-private.c \ - libudev/libudev-queue-private.c +src_libudev_private_la_SOURCES =\ + $(src_libudev_la_SOURCES) \ + src/libudev-util-private.c \ + src/libudev-device-private.c \ + src/libudev-queue-private.c if WITH_SELINUX -libudev_libudev_private_la_SOURCES += libudev/libudev-selinux-private.c -libudev_libudev_private_la_LIBADD = $(SELINUX_LIBS) +src_libudev_private_la_SOURCES += src/libudev-selinux-private.c +src_libudev_private_la_LIBADD = $(SELINUX_LIBS) endif pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libudev/libudev.pc -EXTRA_DIST += libudev/libudev.pc.in -CLEANFILES += libudev/libudev.pc +pkgconfig_DATA = src/libudev.pc +EXTRA_DIST += src/libudev.pc.in +CLEANFILES += src/libudev.pc -EXTRA_DIST += libudev/COPYING +EXTRA_DIST += src/COPYING # move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed libudev-install-move-hook: if test "$(libdir)" != "$(rootlib_execdir)"; then \ @@ -159,32 +161,32 @@ dist_udevrules_DATA = \ rules/rules.d/95-udev-late.rules udevconfdir = $(sysconfdir)/udev -dist_udevconf_DATA = udev.conf +dist_udevconf_DATA = src/udev.conf sharepkgconfigdir = $(datadir)/pkgconfig -sharepkgconfig_DATA = udev/udev.pc -EXTRA_DIST += udev/udev.pc.in -CLEANFILES += udev/udev.pc +sharepkgconfig_DATA = src/udev.pc +EXTRA_DIST += src/udev.pc.in +CLEANFILES += src/udev.pc if WITH_SYSTEMD dist_systemdsystemunit_DATA = \ - systemd/udev-control.socket \ - systemd/udev-kernel.socket + src/udev-control.socket \ + src/udev-kernel.socket systemdsystemunit_DATA = \ - systemd/udev.service \ - systemd/udev-trigger.service \ - systemd/udev-settle.service + src/udev.service \ + src/udev-trigger.service \ + src/udev-settle.service EXTRA_DIST += \ - systemd/udev.service.in \ - systemd/udev-trigger.service.in \ - systemd/udev-settle.service.in + src/udev.service.in \ + src/udev-trigger.service.in \ + src/udev-settle.service.in CLEANFILES += \ - systemd/udev.service \ - systemd/udev-trigger.service \ - systemd/udev-settle.service + src/udev.service \ + src/udev-trigger.service \ + src/udev-settle.service systemd-install-hook: mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants @@ -198,33 +200,33 @@ INSTALL_DATA_HOOKS += systemd-install-hook endif bin_PROGRAMS = \ - udev/udevadm + src/udevadm pkglibexec_PROGRAMS = \ - udev/udevd + src/udevd udev_common_sources = \ - udev/udev.h \ - udev/udev-event.c \ - udev/udev-watch.c \ - udev/udev-node.c \ - udev/udev-rules.c \ - udev/udev-ctrl.c \ - udev/udev-builtin.c \ - udev/udev-builtin-blkid.c \ - udev/udev-builtin-firmware.c \ - udev/udev-builtin-hwdb.c \ - udev/udev-builtin-input_id.c \ - udev/udev-builtin-kmod.c \ - udev/udev-builtin-path_id.c \ - udev/udev-builtin-usb_id.c + src/udev.h \ + src/udev-event.c \ + src/udev-watch.c \ + src/udev-node.c \ + src/udev-rules.c \ + src/udev-ctrl.c \ + src/udev-builtin.c \ + src/udev-builtin-blkid.c \ + src/udev-builtin-firmware.c \ + src/udev-builtin-hwdb.c \ + src/udev-builtin-input_id.c \ + src/udev-builtin-kmod.c \ + src/udev-builtin-path_id.c \ + src/udev-builtin-usb_id.c udev_common_CFLAGS = \ $(BLKID_CFLAGS) \ $(KMOD_CFLAGS) udev_common_LDADD = \ - libudev/libudev-private.la \ + src/libudev-private.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -233,51 +235,51 @@ udev_common_CPPFLAGS = \ -DFIRMWARE_PATH="$(FIRMWARE_PATH)" \ -DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\" -udev_udevd_SOURCES = \ +src_udevd_SOURCES = \ $(udev_common_sources) \ - udev/udevd.c \ - udev/sd-daemon.h \ - udev/sd-daemon.c -udev_udevd_CFLAGS = $(udev_common_CFLAGS) -udev_udevd_LDADD = $(udev_common_LDADD) -udev_udevd_CPPFLAGS = $(udev_common_CPPFLAGS) + src/udevd.c \ + src/sd-daemon.h \ + src/sd-daemon.c +src_udevd_CFLAGS = $(udev_common_CFLAGS) +src_udevd_LDADD = $(udev_common_LDADD) +src_udevd_CPPFLAGS = $(udev_common_CPPFLAGS) -udev_udevadm_SOURCES = \ +src_udevadm_SOURCES = \ $(udev_common_sources) \ - udev/udevadm.c \ - udev/udevadm-info.c \ - udev/udevadm-control.c \ - udev/udevadm-monitor.c \ - udev/udevadm-settle.c \ - udev/udevadm-trigger.c \ - udev/udevadm-test.c \ - udev/udevadm-test-builtin.c -udev_udevadm_CFLAGS = $(udev_common_CFLAGS) -udev_udevadm_LDADD = $(udev_common_LDADD) -udev_udevadm_CPPFLAGS = $(udev_common_CPPFLAGS) + src/udevadm.c \ + src/udevadm-info.c \ + src/udevadm-control.c \ + src/udevadm-monitor.c \ + src/udevadm-settle.c \ + src/udevadm-trigger.c \ + src/udevadm-test.c \ + src/udevadm-test-builtin.c +src_udevadm_CFLAGS = $(udev_common_CFLAGS) +src_udevadm_LDADD = $(udev_common_LDADD) +src_udevadm_CPPFLAGS = $(udev_common_CPPFLAGS) # ------------------------------------------------------------------------------ # udev man pages # ------------------------------------------------------------------------------ dist_man_MANS = \ - udev/udev.7 \ - udev/udevadm.8 \ - udev/udevd.8 + src/udev.7 \ + src/udevadm.8 \ + src/udevd.8 dist_noinst_DATA = \ - udev/udev.html \ - udev/udevadm.html \ - udev/udevd.html + src/udev.html \ + src/udevadm.html \ + src/udevd.html EXTRA_DIST += \ - udev/udev.xml \ - udev/udevadm.xml \ - udev/udevd.xml + src/udev.xml \ + src/udevadm.xml \ + src/udevd.xml -udev/%.7 udev/%.8 : udev/%.xml +src/%.7 src/%.8 : src/%.xml $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -udev/%.html : udev/%.xml +src/%.html : src/%.xml $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< # ------------------------------------------------------------------------------ @@ -294,74 +296,74 @@ CLEANFILES += \ test/udev-test.pl check_PROGRAMS = \ - libudev/test-libudev \ - udev/test-udev + src/test-libudev \ + src/test-udev -libudev_test_libudev_SOURCES = libudev/test-libudev.c -libudev_test_libudev_LDADD = libudev/libudev.la +src_test_libudev_SOURCES = src/test-libudev.c +src_test_libudev_LDADD = src/libudev.la -udev_test_udev_SOURCES = \ +src_test_udev_SOURCES = \ $(udev_common_sources) \ - udev/test-udev.c -udev_test_udev_CFLAGS = $(udev_common_CFLAGS) -udev_test_udev_LDADD = $(udev_common_LDADD) -udev_test_udev_CPPFLAGS = $(udev_common_CPPFLAGS) + src/test-udev.c +src_test_udev_CFLAGS = $(udev_common_CFLAGS) +src_test_udev_LDADD = $(udev_common_LDADD) +src_test_udev_CPPFLAGS = $(udev_common_CPPFLAGS) # ------------------------------------------------------------------------------ # ata_id - ATA identify # ------------------------------------------------------------------------------ -extras_ata_id_ata_id_SOURCES = extras/ata_id/ata_id.c -extras_ata_id_ata_id_LDADD = libudev/libudev-private.la -pkglibexec_PROGRAMS += extras/ata_id/ata_id +src_extras_ata_id_ata_id_SOURCES = src/extras/ata_id/ata_id.c +src_extras_ata_id_ata_id_LDADD = src/libudev-private.la +pkglibexec_PROGRAMS += src/extras/ata_id/ata_id # ------------------------------------------------------------------------------ # cdrom_id - optical drive/media capability # ------------------------------------------------------------------------------ -extras_cdrom_id_cdrom_id_SOURCES = extras/cdrom_id/cdrom_id.c -extras_cdrom_id_cdrom_id_LDADD = libudev/libudev-private.la -pkglibexec_PROGRAMS += extras/cdrom_id/cdrom_id -dist_udevrules_DATA += extras/cdrom_id/60-cdrom_id.rules +src_extras_cdrom_id_cdrom_id_SOURCES = src/extras/cdrom_id/cdrom_id.c +src_extras_cdrom_id_cdrom_id_LDADD = src/libudev-private.la +pkglibexec_PROGRAMS += src/extras/cdrom_id/cdrom_id +dist_udevrules_DATA += src/extras/cdrom_id/60-cdrom_id.rules # ------------------------------------------------------------------------------ # collect - trigger action when a collection of devices appeared # ------------------------------------------------------------------------------ -extras_collect_collect_SOURCES = extras/collect/collect.c -extras_collect_collect_LDADD = libudev/libudev-private.la -pkglibexec_PROGRAMS += extras/collect/collect +src_extras_collect_collect_SOURCES = src/extras/collect/collect.c +src_extras_collect_collect_LDADD = src/libudev-private.la +pkglibexec_PROGRAMS += src/extras/collect/collect # ------------------------------------------------------------------------------ # scsi_id - SCSI inquiry to get various serial numbers # ------------------------------------------------------------------------------ -extras_scsi_id_scsi_id_SOURCES =\ - extras/scsi_id/scsi_id.c \ - extras/scsi_id/scsi_serial.c \ - extras/scsi_id/scsi.h \ - extras/scsi_id/scsi_id.h -extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la -pkglibexec_PROGRAMS += extras/scsi_id/scsi_id -dist_man_MANS += extras/scsi_id/scsi_id.8 -EXTRA_DIST += extras/scsi_id/README +src_extras_scsi_id_scsi_id_SOURCES =\ + src/extras/scsi_id/scsi_id.c \ + src/extras/scsi_id/scsi_serial.c \ + src/extras/scsi_id/scsi.h \ + src/extras/scsi_id/scsi_id.h +src_extras_scsi_id_scsi_id_LDADD = src/libudev-private.la +pkglibexec_PROGRAMS += src/extras/scsi_id/scsi_id +dist_man_MANS += src/extras/scsi_id/scsi_id.8 +EXTRA_DIST += src/extras/scsi_id/README # ------------------------------------------------------------------------------ # v4l_id - video4linux capabilities # ------------------------------------------------------------------------------ -extras_v4l_id_v4l_id_SOURCES = extras/v4l_id/v4l_id.c -extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la -pkglibexec_PROGRAMS += extras/v4l_id/v4l_id -dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules +src_extras_v4l_id_v4l_id_SOURCES = src/extras/v4l_id/v4l_id.c +src_extras_v4l_id_v4l_id_LDADD = src/libudev-private.la +pkglibexec_PROGRAMS += src/extras/v4l_id/v4l_id +dist_udevrules_DATA += src/extras/v4l_id/60-persistent-v4l.rules # ------------------------------------------------------------------------------ # accelerometer - updates device orientation # ------------------------------------------------------------------------------ -extras_accelerometer_accelerometer_SOURCES = extras/accelerometer/accelerometer.c -extras_accelerometer_accelerometer_LDADD = libudev/libudev-private.la -lm -pkglibexec_PROGRAMS += extras/accelerometer/accelerometer -dist_udevrules_DATA += extras/accelerometer/61-accelerometer.rules +src_extras_accelerometer_accelerometer_SOURCES = src/extras/accelerometer/accelerometer.c +src_extras_accelerometer_accelerometer_LDADD = src/libudev-private.la -lm +pkglibexec_PROGRAMS += src/extras/accelerometer/accelerometer +dist_udevrules_DATA += src/extras/accelerometer/61-accelerometer.rules # ------------------------------------------------------------------------------ # qemu -- qemu/kvm guest tweaks # ------------------------------------------------------------------------------ -dist_udevrules_DATA += extras/qemu/42-qemu-usb.rules +dist_udevrules_DATA += src/extras/qemu/42-qemu-usb.rules if ENABLE_GUDEV # ------------------------------------------------------------------------------ @@ -371,125 +373,125 @@ LIBGUDEV_CURRENT=1 LIBGUDEV_REVISION=1 LIBGUDEV_AGE=1 -SUBDIRS += extras/gudev/docs +SUBDIRS += src/extras/gudev/docs -libgudev_includedir=$(includedir)/gudev-1.0/gudev -libgudev_include_HEADERS = \ - extras/gudev/gudev.h \ - extras/gudev/gudevenums.h \ - extras/gudev/gudevenumtypes.h \ - extras/gudev/gudevtypes.h \ - extras/gudev/gudevclient.h \ - extras/gudev/gudevdevice.h \ - extras/gudev/gudevenumerator.h +src_extras_gudev_libgudev_includedir=$(includedir)/gudev-1.0/gudev +src_extras_gudev_libgudev_include_HEADERS = \ + src/extras/gudev/gudev.h \ + src/extras/gudev/gudevenums.h \ + src/extras/gudev/gudevenumtypes.h \ + src/extras/gudev/gudevtypes.h \ + src/extras/gudev/gudevclient.h \ + src/extras/gudev/gudevdevice.h \ + src/extras/gudev/gudevenumerator.h -lib_LTLIBRARIES += extras/gudev/libgudev-1.0.la +lib_LTLIBRARIES += src/extras/gudev/libgudev-1.0.la -pkgconfig_DATA += extras/gudev/gudev-1.0.pc -EXTRA_DIST += extras/gudev/gudev-1.0.pc.in -CLEANFILES += extras/gudev/gudev-1.0.pc +pkgconfig_DATA += src/extras/gudev/gudev-1.0.pc +EXTRA_DIST += src/extras/gudev/gudev-1.0.pc.in +CLEANFILES += src/extras/gudev/gudev-1.0.pc -extras_gudev_libgudev_1_0_la_SOURCES = \ - extras/gudev/gudevenums.h \ - extras/gudev/gudevenumtypes.h \ - extras/gudev/gudevenumtypes.h\ - extras/gudev/gudevtypes.h \ - extras/gudev/gudevclient.h \ - extras/gudev/gudevclient.c \ - extras/gudev/gudevdevice.h \ - extras/gudev/gudevdevice.c \ - extras/gudev/gudevenumerator.h \ - extras/gudev/gudevenumerator.c \ - extras/gudev/gudevprivate.h +src_extras_gudev_libgudev_1_0_la_SOURCES = \ + src/extras/gudev/gudevenums.h \ + src/extras/gudev/gudevenumtypes.h \ + src/extras/gudev/gudevenumtypes.h\ + src/extras/gudev/gudevtypes.h \ + src/extras/gudev/gudevclient.h \ + src/extras/gudev/gudevclient.c \ + src/extras/gudev/gudevdevice.h \ + src/extras/gudev/gudevdevice.c \ + src/extras/gudev/gudevenumerator.h \ + src/extras/gudev/gudevenumerator.c \ + src/extras/gudev/gudevprivate.h -nodist_extras_gudev_libgudev_1_0_la_SOURCES = \ - extras/gudev/gudevmarshal.h \ - extras/gudev/gudevmarshal.c \ - extras/gudev/gudevenumtypes.h \ - extras/gudev/gudevenumtypes.c -BUILT_SOURCES += $(nodist_extras_gudev_libgudev_1_0_la_SOURCES) +nodist_src_extras_gudev_libgudev_1_0_la_SOURCES = \ + src/extras/gudev/gudevmarshal.h \ + src/extras/gudev/gudevmarshal.c \ + src/extras/gudev/gudevenumtypes.h \ + src/extras/gudev/gudevenumtypes.c +BUILT_SOURCES += $(nodist_src_extras_gudev_libgudev_1_0_la_SOURCES) -extras_gudev_libgudev_1_0_la_CPPFLAGS = \ +src_extras_gudev_libgudev_1_0_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -I$(top_builddir)/extras \ - -I$(top_srcdir)/extras \ - -I$(top_builddir)/extras/gudev \ - -I$(top_srcdir)/extras/gudev \ + -I$(top_builddir)/src/extras \ + -I$(top_srcdir)/src/extras \ + -I$(top_builddir)/src/extras/gudev \ + -I$(top_srcdir)/src/extras/gudev \ -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ -D_GUDEV_COMPILATION \ -DG_LOG_DOMAIN=\"GUdev\" -extras_gudev_libgudev_1_0_la_CFLAGS = \ +src_extras_gudev_libgudev_1_0_la_CFLAGS = \ -fvisibility=default \ $(GLIB_CFLAGS) -extras_gudev_libgudev_1_0_la_LIBADD = libudev/libudev.la $(GLIB_LIBS) +src_extras_gudev_libgudev_1_0_la_LIBADD = src/libudev.la $(GLIB_LIBS) -extras_gudev_libgudev_1_0_la_LDFLAGS = \ +src_extras_gudev_libgudev_1_0_la_LDFLAGS = \ -version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \ -export-dynamic -no-undefined \ -export-symbols-regex '^g_udev_.*' EXTRA_DIST += \ - extras/gudev/COPYING \ - extras/gudev/gudevmarshal.list \ - extras/gudev/gudevenumtypes.h.template \ - extras/gudev/gudevenumtypes.c.template \ - extras/gudev/gjs-example.js \ - extras/gudev/seed-example-enum.js \ - extras/gudev/seed-example.js + src/extras/gudev/COPYING \ + src/extras/gudev/gudevmarshal.list \ + src/extras/gudev/gudevenumtypes.h.template \ + src/extras/gudev/gudevenumtypes.c.template \ + src/extras/gudev/gjs-example.js \ + src/extras/gudev/seed-example-enum.js \ + src/extras/gudev/seed-example.js -extras/gudev/gudevmarshal.h: extras/gudev/gudevmarshal.list +src/extras/gudev/gudevmarshal.h: src/extras/gudev/gudevmarshal.list $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@ -extras/gudev/gudevmarshal.c: extras/gudev/gudevmarshal.list +src/extras/gudev/gudevmarshal.c: src/extras/gudev/gudevmarshal.list $(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \ glib-genmarshal $< --prefix=g_udev_marshal --body >> $@ -extras/gudev/gudevenumtypes.h: extras/gudev/gudevenumtypes.h.template extras/gudev/gudevenums.h +src/extras/gudev/gudevenumtypes.h: src/extras/gudev/gudevenumtypes.h.template src/extras/gudev/gudevenums.h $(AM_V_GEN)glib-mkenums --template $^ > \ $@.tmp && mv $@.tmp $@ -extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gudev/gudevenums.h +src/extras/gudev/gudevenumtypes.c: src/extras/gudev/gudevenumtypes.c.template src/extras/gudev/gudevenums.h $(AM_V_GEN)glib-mkenums --template $^ > \ $@.tmp && mv $@.tmp $@ if ENABLE_INTROSPECTION -extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) +src/extras/gudev/GUdev-1.0.gir: src/extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) $(AM_V_GEN)$(G_IR_SCANNER) -v \ --warn-all \ --namespace GUdev \ --nsversion=1.0 \ --include=GObject-2.0 \ --library=gudev-1.0 \ - --library-path=$(top_builddir)/libudev \ - --library-path=$(top_builddir)/extras/gudev \ + --library-path=$(top_builddir)/src \ + --library-path=$(top_builddir)/src/extras/gudev \ --output $@ \ --pkg=glib-2.0 \ --pkg=gobject-2.0 \ - -I$(top_srcdir)/extras \ - -I$(top_builddir)/extras \ + -I$(top_srcdir)/src/extras \ + -I$(top_builddir)/src/extras \ -D_GUDEV_COMPILATION \ -D_GUDEV_WORK_AROUND_DEV_T_BUG \ - $(top_srcdir)/extras/gudev/gudev.h \ - $(top_srcdir)/extras/gudev/gudevtypes.h \ - $(top_srcdir)/extras/gudev/gudevenums.h \ - $(or $(wildcard $(top_builddir)/extras/gudev/gudevenumtypes.h),$(top_srcdir)/extras/gudev/gudevenumtypes.h) \ - $(top_srcdir)/extras/gudev/gudevclient.h \ - $(top_srcdir)/extras/gudev/gudevdevice.h \ - $(top_srcdir)/extras/gudev/gudevenumerator.h \ - $(top_srcdir)/extras/gudev/gudevclient.c \ - $(top_srcdir)/extras/gudev/gudevdevice.c \ - $(top_srcdir)/extras/gudev/gudevenumerator.c + $(top_srcdir)/src/extras/gudev/gudev.h \ + $(top_srcdir)/src/extras/gudev/gudevtypes.h \ + $(top_srcdir)/src/extras/gudev/gudevenums.h \ + $(or $(wildcard $(top_builddir)/src/extras/gudev/gudevenumtypes.h),$(top_srcdir)/src/extras/gudev/gudevenumtypes.h) \ + $(top_srcdir)/src/extras/gudev/gudevclient.h \ + $(top_srcdir)/src/extras/gudev/gudevdevice.h \ + $(top_srcdir)/src/extras/gudev/gudevenumerator.h \ + $(top_srcdir)/src/extras/gudev/gudevclient.c \ + $(top_srcdir)/src/extras/gudev/gudevdevice.c \ + $(top_srcdir)/src/extras/gudev/gudevenumerator.c -extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER) +src/extras/gudev/GUdev-1.0.typelib: src/extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER) $(AM_V_GEN)g-ir-compiler $< -o $@ girdir = $(GIRDIR) -gir_DATA = extras/gudev/GUdev-1.0.gir +gir_DATA = src/extras/gudev/GUdev-1.0.gir typelibsdir = $(GIRTYPELIBDIR) -typelibs_DATA = extras/gudev/GUdev-1.0.typelib +typelibs_DATA = src/extras/gudev/GUdev-1.0.typelib CLEANFILES += $(gir_DATA) $(typelibs_DATA) endif # ENABLE_INTROSPECTION @@ -515,113 +517,113 @@ if ENABLE_KEYMAP # ------------------------------------------------------------------------------ # keymap - map custom hardware's multimedia keys # ------------------------------------------------------------------------------ -extras_keymap_keymap_SOURCES = extras/keymap/keymap.c -extras_keymap_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I extras/keymap -nodist_extras_keymap_keymap_SOURCES = \ - extras/keymap/keys-from-name.h \ - extras/keymap/keys-to-name.h -BUILT_SOURCES += $(nodist_extras_keymap_keymap_SOURCES) +src_keymap_SOURCES = src/extras/keymap/keymap.c +src_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I src/extras/keymap +nodist_src_keymap_SOURCES = \ + src/extras/keymap/keys-from-name.h \ + src/extras/keymap/keys-to-name.h +BUILT_SOURCES += $(nodist_src_keymap_SOURCES) -pkglibexec_PROGRAMS += extras/keymap/keymap -dist_doc_DATA = extras/keymap/README.keymap.txt +pkglibexec_PROGRAMS += src/keymap +dist_doc_DATA = src/extras/keymap/README.keymap.txt dist_udevrules_DATA += \ - extras/keymap/95-keymap.rules \ - extras/keymap/95-keyboard-force-release.rules + src/extras/keymap/95-keymap.rules \ + src/extras/keymap/95-keyboard-force-release.rules -dist_pkglibexec_SCRIPTS += extras/keymap/findkeyboards -pkglibexec_SCRIPTS += extras/keymap/keyboard-force-release.sh +dist_udevhome_SCRIPTS += src/extras/keymap/findkeyboards +udevhome_SCRIPTS += src/extras/keymap/keyboard-force-release.sh EXTRA_DIST += \ - extras/keymap/check-keymaps.sh \ - extras/keymap/keyboard-force-release.sh.in + src/extras/keymap/check-keymaps.sh \ + src/extras/keymap/keyboard-force-release.sh.in CLEANFILES += \ - extras/keymap/keys.txt \ - extras/keymap/keys-from-name.gperf \ - extras/keymap/keyboard-force-release.sh + src/extras/keymap/keys.txt \ + src/extras/keymap/keys-from-name.gperf \ + src/extras/keymap/keyboard-force-release.sh udevkeymapdir = $(libexecdir)/udev/keymaps dist_udevkeymap_DATA = \ - extras/keymap/keymaps/acer \ - extras/keymap/keymaps/acer-aspire_5720 \ - extras/keymap/keymaps/acer-aspire_8930 \ - extras/keymap/keymaps/acer-aspire_5920g \ - extras/keymap/keymaps/acer-aspire_6920 \ - extras/keymap/keymaps/acer-travelmate_c300 \ - extras/keymap/keymaps/asus \ - extras/keymap/keymaps/compaq-e_evo \ - extras/keymap/keymaps/dell \ - extras/keymap/keymaps/dell-latitude-xt2 \ - extras/keymap/keymaps/everex-xt5000 \ - extras/keymap/keymaps/fujitsu-amilo_pa_2548 \ - extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \ - extras/keymap/keymaps/fujitsu-amilo_pro_v3205 \ - extras/keymap/keymaps/fujitsu-amilo_si_1520 \ - extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 \ - extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 \ - extras/keymap/keymaps/genius-slimstar-320 \ - extras/keymap/keymaps/hewlett-packard \ - extras/keymap/keymaps/hewlett-packard-2510p_2530p \ - extras/keymap/keymaps/hewlett-packard-compaq_elitebook \ - extras/keymap/keymaps/hewlett-packard-pavilion \ - extras/keymap/keymaps/hewlett-packard-presario-2100 \ - extras/keymap/keymaps/hewlett-packard-tablet \ - extras/keymap/keymaps/hewlett-packard-tx2 \ - extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ - extras/keymap/keymaps/inventec-symphony_6.0_7.0 \ - extras/keymap/keymaps/lenovo-3000 \ - extras/keymap/keymaps/lenovo-ideapad \ - extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ - extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \ - extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \ - extras/keymap/keymaps/lg-x110 \ - extras/keymap/keymaps/logitech-wave \ - extras/keymap/keymaps/logitech-wave-cordless \ - extras/keymap/keymaps/logitech-wave-pro-cordless \ - extras/keymap/keymaps/maxdata-pro_7000 \ - extras/keymap/keymaps/medion-fid2060 \ - extras/keymap/keymaps/medionnb-a555 \ - extras/keymap/keymaps/micro-star \ - extras/keymap/keymaps/module-asus-w3j \ - extras/keymap/keymaps/module-ibm \ - extras/keymap/keymaps/module-lenovo \ - extras/keymap/keymaps/module-sony \ - extras/keymap/keymaps/module-sony-old \ - extras/keymap/keymaps/module-sony-vgn \ - extras/keymap/keymaps/olpc-xo \ - extras/keymap/keymaps/onkyo \ - extras/keymap/keymaps/oqo-model2 \ - extras/keymap/keymaps/samsung-other \ - extras/keymap/keymaps/samsung-sq1us \ - extras/keymap/keymaps/samsung-sx20s \ - extras/keymap/keymaps/toshiba-satellite_a100 \ - extras/keymap/keymaps/toshiba-satellite_a110 \ - extras/keymap/keymaps/toshiba-satellite_m30x \ - extras/keymap/keymaps/zepto-znote + src/extras/keymap/keymaps/acer \ + src/extras/keymap/keymaps/acer-aspire_5720 \ + src/extras/keymap/keymaps/acer-aspire_8930 \ + src/extras/keymap/keymaps/acer-aspire_5920g \ + src/extras/keymap/keymaps/acer-aspire_6920 \ + src/extras/keymap/keymaps/acer-travelmate_c300 \ + src/extras/keymap/keymaps/asus \ + src/extras/keymap/keymaps/compaq-e_evo \ + src/extras/keymap/keymaps/dell \ + src/extras/keymap/keymaps/dell-latitude-xt2 \ + src/extras/keymap/keymaps/everex-xt5000 \ + src/extras/keymap/keymaps/fujitsu-amilo_pa_2548 \ + src/extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \ + src/extras/keymap/keymaps/fujitsu-amilo_pro_v3205 \ + src/extras/keymap/keymaps/fujitsu-amilo_si_1520 \ + src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 \ + src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 \ + src/extras/keymap/keymaps/genius-slimstar-320 \ + src/extras/keymap/keymaps/hewlett-packard \ + src/extras/keymap/keymaps/hewlett-packard-2510p_2530p \ + src/extras/keymap/keymaps/hewlett-packard-compaq_elitebook \ + src/extras/keymap/keymaps/hewlett-packard-pavilion \ + src/extras/keymap/keymaps/hewlett-packard-presario-2100 \ + src/extras/keymap/keymaps/hewlett-packard-tablet \ + src/extras/keymap/keymaps/hewlett-packard-tx2 \ + src/extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ + src/extras/keymap/keymaps/inventec-symphony_6.0_7.0 \ + src/extras/keymap/keymaps/lenovo-3000 \ + src/extras/keymap/keymaps/lenovo-ideapad \ + src/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ + src/extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \ + src/extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \ + src/extras/keymap/keymaps/lg-x110 \ + src/extras/keymap/keymaps/logitech-wave \ + src/extras/keymap/keymaps/logitech-wave-cordless \ + src/extras/keymap/keymaps/logitech-wave-pro-cordless \ + src/extras/keymap/keymaps/maxdata-pro_7000 \ + src/extras/keymap/keymaps/medion-fid2060 \ + src/extras/keymap/keymaps/medionnb-a555 \ + src/extras/keymap/keymaps/micro-star \ + src/extras/keymap/keymaps/module-asus-w3j \ + src/extras/keymap/keymaps/module-ibm \ + src/extras/keymap/keymaps/module-lenovo \ + src/extras/keymap/keymaps/module-sony \ + src/extras/keymap/keymaps/module-sony-old \ + src/extras/keymap/keymaps/module-sony-vgn \ + src/extras/keymap/keymaps/olpc-xo \ + src/extras/keymap/keymaps/onkyo \ + src/extras/keymap/keymaps/oqo-model2 \ + src/extras/keymap/keymaps/samsung-other \ + src/extras/keymap/keymaps/samsung-sq1us \ + src/extras/keymap/keymaps/samsung-sx20s \ + src/extras/keymap/keymaps/toshiba-satellite_a100 \ + src/extras/keymap/keymaps/toshiba-satellite_a110 \ + src/extras/keymap/keymaps/toshiba-satellite_m30x \ + src/extras/keymap/keymaps/zepto-znote udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release dist_udevkeymapforcerel_DATA = \ - extras/keymap/force-release-maps/dell-touchpad \ - extras/keymap/force-release-maps/hp-other \ - extras/keymap/force-release-maps/samsung-other \ - extras/keymap/force-release-maps/common-volume-keys + src/extras/keymap/force-release-maps/dell-touchpad \ + src/extras/keymap/force-release-maps/hp-other \ + src/extras/keymap/force-release-maps/samsung-other \ + src/extras/keymap/force-release-maps/common-volume-keys -extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h - $(AM_V_at)mkdir -p extras/keymap +src/extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h + $(AM_V_at)mkdir -p src/extras/keymap $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ -extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt +src/extras/keymap/keys-from-name.gperf: src/extras/keymap/keys.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@ -extras/keymap/keys-from-name.h: extras/keymap/keys-from-name.gperf Makefile +src/extras/keymap/keys-from-name.h: src/extras/keymap/keys-from-name.gperf Makefile $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@ -extras/keymap/keys-to-name.h: extras/keymap/keys.txt Makefile +src/extras/keymap/keys-to-name.h: src/extras/keymap/keys.txt Makefile $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@ -keymaps-distcheck-hook: extras/keymap/keys.txt - $(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^ +keymaps-distcheck-hook: src/extras/keymap/keys.txt + $(top_srcdir)/src/extras/keymap/check-keymaps.sh $(top_srcdir) $^ DISTCHECK_HOOKS += keymaps-distcheck-hook endif @@ -629,38 +631,38 @@ if ENABLE_MTD_PROBE # ------------------------------------------------------------------------------ # mtd_probe - autoloads FTL module for mtd devices # ------------------------------------------------------------------------------ -extras_mtd_probe_mtd_probe_SOURCES = \ - extras/mtd_probe/mtd_probe.c \ - extras/mtd_probe/mtd_probe.h \ - extras/mtd_probe/probe_smartmedia.c -extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS) -dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules -pkglibexec_PROGRAMS += extras/mtd_probe/mtd_probe +src_mtd_probe_SOURCES = \ + src/extras/mtd_probe/mtd_probe.c \ + src/extras/mtd_probe/mtd_probe.h \ + src/extras/mtd_probe/probe_smartmedia.c +src_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS) +dist_udevrules_DATA += src/extras/mtd_probe/75-probe_mtd.rules +pkglibexec_PROGRAMS += src/mtd_probe endif if ENABLE_RULE_GENERATOR # ------------------------------------------------------------------------------ # rule_generator - persistent network and optical device rule generator # ------------------------------------------------------------------------------ -dist_pkglibexec_SCRIPTS += \ - extras/rule_generator/write_cd_rules \ - extras/rule_generator/write_net_rules +dist_udevhome_SCRIPTS += \ + src/extras/rule_generator/write_cd_rules \ + src/extras/rule_generator/write_net_rules -pkglibexec_DATA = extras/rule_generator/rule_generator.functions -dist_pkglibexec_DATA += \ - extras/rule_generator/75-cd-aliases-generator.rules \ - extras/rule_generator/75-persistent-net-generator.rules +udevhome_DATA = src/extras/rule_generator/rule_generator.functions +dist_udevhome_DATA = \ + src/extras/rule_generator/75-cd-aliases-generator.rules \ + src/extras/rule_generator/75-persistent-net-generator.rules endif if ENABLE_UDEV_ACL # ------------------------------------------------------------------------------ # udev_acl - apply ACLs for users with local forground sessions # ------------------------------------------------------------------------------ -extras_udev_acl_udev_acl_SOURCES = extras/udev-acl/udev-acl.c -extras_udev_acl_udev_acl_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) -extras_udev_acl_udev_acl_LDADD = libudev/libudev-private.la -lacl $(GLIB_LIBS) -dist_udevrules_DATA += extras/udev-acl/70-udev-acl.rules -pkglibexec_PROGRAMS += extras/udev-acl/udev-acl +src_udev_acl_SOURCES = src/extras/udev-acl/udev-acl.c +src_udev_acl_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) +src_udev_acl_LDADD = src/libudev-private.la -lacl $(GLIB_LIBS) +dist_udevrules_DATA += src/extras/udev-acl/70-udev-acl.rules +pkglibexec_PROGRAMS += src/udev-acl udevacl-install-hook: mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d @@ -673,20 +675,20 @@ if ENABLE_FLOPPY # ------------------------------------------------------------------------------ # create_floppy_devices - historical floppy kernel device nodes (/dev/fd0h1440, ...) # ------------------------------------------------------------------------------ -extras_floppy_create_floppy_devices_SOURCES = extras/floppy/create_floppy_devices.c -extras_floppy_create_floppy_devices_LDADD = libudev/libudev-private.la -pkglibexec_PROGRAMS += extras/floppy/create_floppy_devices -dist_udevrules_DATA += extras/floppy/60-floppy.rules +src_create_floppy_devices_SOURCES = src/extras/floppy/create_floppy_devices.c +src_create_floppy_devices_LDADD = src/libudev-private.la +pkglibexec_PROGRAMS += src/create_floppy_devices +dist_udevrules_DATA += src/extras/floppy/60-floppy.rules endif if ENABLE_EDD # ------------------------------------------------------------------------------ # edd_id - create /dev/disk/by-id/edd-* links for BIOS EDD data # ------------------------------------------------------------------------------ -extras_edd_id_edd_id_SOURCES = extras/edd_id/edd_id.c -extras_edd_id_edd_id_LDADD = libudev/libudev-private.la -pkglibexec_PROGRAMS += extras/edd_id/edd_id -dist_udevrules_DATA += extras/edd_id/61-persistent-storage-edd.rules +src_edd_id_SOURCES = src/extras/edd_id/edd_id.c +src_edd_id_LDADD = src/libudev-private.la +pkglibexec_PROGRAMS += src/edd_id +dist_udevrules_DATA += src/extras/edd_id/61-persistent-storage-edd.rules endif # ------------------------------------------------------------------------------ @@ -753,6 +755,6 @@ tar-sync: scp udev-$(VERSION).tar.xz master.kernel.org:/pub/linux/utils/kernel/hotplug/ doc-sync: - rsync -av udev/*.html master.kernel.org:/pub/linux/utils/kernel/hotplug/udev/ - rsync -av --delete libudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/libudev/ - rsync -av --delete extras/gudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/gudev/ + rsync -av src/*.html master.kernel.org:/pub/linux/utils/kernel/hotplug/udev/ + rsync -av --delete src/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/src/ + rsync -av --delete src/extras/gudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/gudev/ diff --git a/configure.ac b/configure.ac index bd154181e5e..4ba9964cbdc 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT([udev], [linux-hotplug@vger.kernel.org], [udev], [http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html]) -AC_CONFIG_SRCDIR([udev/udevd.c]) +AC_CONFIG_SRCDIR([src/udevd.c]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([check-news foreign 1.11 -Wall -Wno-portability silent-rules tar-pax no-dist-gzip dist-xz subdir-objects]) AC_USE_SYSTEM_EXTENSIONS @@ -210,10 +210,10 @@ AC_SUBST([my_CFLAGS]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_FILES([ Makefile - libudev/docs/Makefile - libudev/docs/version.xml - extras/gudev/docs/Makefile - extras/gudev/docs/version.xml + src/docs/Makefile + src/docs/version.xml + src/extras/gudev/docs/Makefile + src/extras/gudev/docs/version.xml ]) AC_OUTPUT diff --git a/libudev/.gitignore b/libudev/.gitignore deleted file mode 100644 index 74a5f1d3794..00000000000 --- a/libudev/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -test-libudev -libudev.pc -libudev.so* - diff --git a/libudev/docs/libudev-overrides.txt b/libudev/docs/libudev-overrides.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 00000000000..5da27a94dc6 --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,6 @@ +*.[78] +*.html +udev.pc +libudev.pc +libudev.so* +udev*.service diff --git a/libudev/COPYING b/src/COPYING similarity index 99% rename from libudev/COPYING rename to src/COPYING index 8add30ad590..0851b141d8d 100644 --- a/libudev/COPYING +++ b/src/COPYING @@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an @@ -158,7 +158,7 @@ Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - + 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 @@ -500,5 +500,3 @@ necessary. Here is a sample; alter the names: Ty Coon, President of Vice That's all there is to it! - - diff --git a/libudev/docs/.gitignore b/src/docs/.gitignore similarity index 99% rename from libudev/docs/.gitignore rename to src/docs/.gitignore index 286f244fa2b..dca700a9982 100644 --- a/libudev/docs/.gitignore +++ b/src/docs/.gitignore @@ -15,4 +15,3 @@ libudev.hierarchy libudev.interfaces libudev.prerequisites libudev.signals - diff --git a/libudev/docs/Makefile.am b/src/docs/Makefile.am similarity index 97% rename from libudev/docs/Makefile.am rename to src/docs/Makefile.am index 965902627f4..3b280d87a7f 100644 --- a/libudev/docs/Makefile.am +++ b/src/docs/Makefile.am @@ -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)/libudev/libudev*.h -CFILE_GLOB=$(top_srcdir)/libudev/libudev*.c +HFILE_GLOB=$(top_srcdir)/src/libudev*.h +CFILE_GLOB=$(top_srcdir)/src/libudev*.c # Extra header to include when scanning, which are not under DOC_SOURCE_DIR # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h diff --git a/libudev/docs/libudev-docs.xml b/src/docs/libudev-docs.xml similarity index 100% rename from libudev/docs/libudev-docs.xml rename to src/docs/libudev-docs.xml diff --git a/libudev/docs/libudev-sections.txt b/src/docs/libudev-sections.txt similarity index 100% rename from libudev/docs/libudev-sections.txt rename to src/docs/libudev-sections.txt diff --git a/libudev/docs/libudev.types b/src/docs/libudev.types similarity index 100% rename from libudev/docs/libudev.types rename to src/docs/libudev.types diff --git a/extras/gudev/docs/version.xml.in b/src/docs/version.xml.in similarity index 100% rename from extras/gudev/docs/version.xml.in rename to src/docs/version.xml.in diff --git a/extras/accelerometer/.gitignore b/src/extras/accelerometer/.gitignore similarity index 100% rename from extras/accelerometer/.gitignore rename to src/extras/accelerometer/.gitignore diff --git a/extras/accelerometer/61-accelerometer.rules b/src/extras/accelerometer/61-accelerometer.rules similarity index 100% rename from extras/accelerometer/61-accelerometer.rules rename to src/extras/accelerometer/61-accelerometer.rules diff --git a/extras/accelerometer/accelerometer.c b/src/extras/accelerometer/accelerometer.c similarity index 100% rename from extras/accelerometer/accelerometer.c rename to src/extras/accelerometer/accelerometer.c diff --git a/extras/ata_id/.gitignore b/src/extras/ata_id/.gitignore similarity index 100% rename from extras/ata_id/.gitignore rename to src/extras/ata_id/.gitignore diff --git a/extras/ata_id/ata_id.c b/src/extras/ata_id/ata_id.c similarity index 100% rename from extras/ata_id/ata_id.c rename to src/extras/ata_id/ata_id.c diff --git a/extras/cdrom_id/.gitignore b/src/extras/cdrom_id/.gitignore similarity index 100% rename from extras/cdrom_id/.gitignore rename to src/extras/cdrom_id/.gitignore diff --git a/extras/cdrom_id/60-cdrom_id.rules b/src/extras/cdrom_id/60-cdrom_id.rules similarity index 100% rename from extras/cdrom_id/60-cdrom_id.rules rename to src/extras/cdrom_id/60-cdrom_id.rules diff --git a/extras/cdrom_id/cdrom_id.c b/src/extras/cdrom_id/cdrom_id.c similarity index 100% rename from extras/cdrom_id/cdrom_id.c rename to src/extras/cdrom_id/cdrom_id.c diff --git a/extras/collect/.gitignore b/src/extras/collect/.gitignore similarity index 100% rename from extras/collect/.gitignore rename to src/extras/collect/.gitignore diff --git a/extras/collect/collect.c b/src/extras/collect/collect.c similarity index 100% rename from extras/collect/collect.c rename to src/extras/collect/collect.c diff --git a/extras/edd_id/.gitignore b/src/extras/edd_id/.gitignore similarity index 100% rename from extras/edd_id/.gitignore rename to src/extras/edd_id/.gitignore diff --git a/extras/edd_id/61-persistent-storage-edd.rules b/src/extras/edd_id/61-persistent-storage-edd.rules similarity index 100% rename from extras/edd_id/61-persistent-storage-edd.rules rename to src/extras/edd_id/61-persistent-storage-edd.rules diff --git a/extras/edd_id/edd_id.c b/src/extras/edd_id/edd_id.c similarity index 100% rename from extras/edd_id/edd_id.c rename to src/extras/edd_id/edd_id.c diff --git a/extras/floppy/.gitignore b/src/extras/floppy/.gitignore similarity index 100% rename from extras/floppy/.gitignore rename to src/extras/floppy/.gitignore diff --git a/extras/floppy/60-floppy.rules b/src/extras/floppy/60-floppy.rules similarity index 100% rename from extras/floppy/60-floppy.rules rename to src/extras/floppy/60-floppy.rules diff --git a/extras/floppy/create_floppy_devices.c b/src/extras/floppy/create_floppy_devices.c similarity index 100% rename from extras/floppy/create_floppy_devices.c rename to src/extras/floppy/create_floppy_devices.c diff --git a/extras/gudev/.gitignore b/src/extras/gudev/.gitignore similarity index 100% rename from extras/gudev/.gitignore rename to src/extras/gudev/.gitignore diff --git a/extras/gudev/COPYING b/src/extras/gudev/COPYING similarity index 99% rename from extras/gudev/COPYING rename to src/extras/gudev/COPYING index 8add30ad590..47044a8c58e 100644 --- a/extras/gudev/COPYING +++ b/src/extras/gudev/COPYING @@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an @@ -500,5 +500,3 @@ necessary. Here is a sample; alter the names: Ty Coon, President of Vice That's all there is to it! - - diff --git a/extras/gudev/docs/.gitignore b/src/extras/gudev/docs/.gitignore similarity index 99% rename from extras/gudev/docs/.gitignore rename to src/extras/gudev/docs/.gitignore index a24184ac83f..8eada6d4095 100644 --- a/extras/gudev/docs/.gitignore +++ b/src/extras/gudev/docs/.gitignore @@ -14,4 +14,3 @@ html/* xml/* tmpl/* *.stamp - diff --git a/extras/gudev/docs/Makefile.am b/src/extras/gudev/docs/Makefile.am similarity index 94% rename from extras/gudev/docs/Makefile.am rename to src/extras/gudev/docs/Makefile.am index 5507434d5f6..d03fc651277 100644 --- a/extras/gudev/docs/Makefile.am +++ b/src/extras/gudev/docs/Makefile.am @@ -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)/extras/gudev/*.h -CFILE_GLOB=$(top_srcdir)/extras/gudev/*.c +HFILE_GLOB=$(top_srcdir)/src/extras/gudev/*.h +CFILE_GLOB=$(top_srcdir)/src/extras/gudev/*.c # Extra header to include when scanning, which are not under DOC_SOURCE_DIR # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h @@ -80,12 +80,12 @@ expand_content_files= GTKDOC_CFLAGS = \ $(DBUS_GLIB_CFLAGS) \ $(GLIB_CFLAGS) \ - -I$(top_srcdir)/extras/gudev \ - -I$(top_builddir)/extras/gudev + -I$(top_srcdir)/src/extras/gudev \ + -I$(top_builddir)/src/extras/gudev GTKDOC_LIBS = \ $(GLIB_LIBS) \ - $(top_builddir)/extras/gudev/libgudev-1.0.la + $(top_builddir)/src/extras/gudev/libgudev-1.0.la # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/extras/gudev/docs/gudev-docs.xml b/src/extras/gudev/docs/gudev-docs.xml similarity index 100% rename from extras/gudev/docs/gudev-docs.xml rename to src/extras/gudev/docs/gudev-docs.xml diff --git a/extras/gudev/docs/gudev-sections.txt b/src/extras/gudev/docs/gudev-sections.txt similarity index 100% rename from extras/gudev/docs/gudev-sections.txt rename to src/extras/gudev/docs/gudev-sections.txt diff --git a/extras/gudev/docs/gudev.types b/src/extras/gudev/docs/gudev.types similarity index 100% rename from extras/gudev/docs/gudev.types rename to src/extras/gudev/docs/gudev.types diff --git a/libudev/docs/version.xml.in b/src/extras/gudev/docs/version.xml.in similarity index 100% rename from libudev/docs/version.xml.in rename to src/extras/gudev/docs/version.xml.in diff --git a/extras/gudev/gjs-example.js b/src/extras/gudev/gjs-example.js similarity index 100% rename from extras/gudev/gjs-example.js rename to src/extras/gudev/gjs-example.js diff --git a/extras/gudev/gudev-1.0.pc.in b/src/extras/gudev/gudev-1.0.pc.in similarity index 100% rename from extras/gudev/gudev-1.0.pc.in rename to src/extras/gudev/gudev-1.0.pc.in diff --git a/extras/gudev/gudev.h b/src/extras/gudev/gudev.h similarity index 100% rename from extras/gudev/gudev.h rename to src/extras/gudev/gudev.h diff --git a/extras/gudev/gudevclient.c b/src/extras/gudev/gudevclient.c similarity index 99% rename from extras/gudev/gudevclient.c rename to src/extras/gudev/gudevclient.c index 97b951adcd4..a6465ad9437 100644 --- a/extras/gudev/gudevclient.c +++ b/src/extras/gudev/gudevclient.c @@ -525,4 +525,3 @@ _g_udev_client_get_udev (GUdevClient *client) g_return_val_if_fail (G_UDEV_IS_CLIENT (client), NULL); return client->priv->udev; } - diff --git a/extras/gudev/gudevclient.h b/src/extras/gudev/gudevclient.h similarity index 100% rename from extras/gudev/gudevclient.h rename to src/extras/gudev/gudevclient.h diff --git a/extras/gudev/gudevdevice.c b/src/extras/gudev/gudevdevice.c similarity index 99% rename from extras/gudev/gudevdevice.c rename to src/extras/gudev/gudevdevice.c index 38d602c42ac..0c3340ffeb8 100644 --- a/extras/gudev/gudevdevice.c +++ b/src/extras/gudev/gudevdevice.c @@ -961,4 +961,3 @@ g_udev_device_get_usec_since_initialized (GUdevDevice *device) g_return_val_if_fail (G_UDEV_IS_DEVICE (device), 0); return udev_device_get_usec_since_initialized (device->priv->udevice); } - diff --git a/extras/gudev/gudevdevice.h b/src/extras/gudev/gudevdevice.h similarity index 100% rename from extras/gudev/gudevdevice.h rename to src/extras/gudev/gudevdevice.h diff --git a/extras/gudev/gudevenumerator.c b/src/extras/gudev/gudevenumerator.c similarity index 100% rename from extras/gudev/gudevenumerator.c rename to src/extras/gudev/gudevenumerator.c diff --git a/extras/gudev/gudevenumerator.h b/src/extras/gudev/gudevenumerator.h similarity index 100% rename from extras/gudev/gudevenumerator.h rename to src/extras/gudev/gudevenumerator.h diff --git a/extras/gudev/gudevenums.h b/src/extras/gudev/gudevenums.h similarity index 100% rename from extras/gudev/gudevenums.h rename to src/extras/gudev/gudevenums.h diff --git a/extras/gudev/gudevenumtypes.c.template b/src/extras/gudev/gudevenumtypes.c.template similarity index 100% rename from extras/gudev/gudevenumtypes.c.template rename to src/extras/gudev/gudevenumtypes.c.template diff --git a/extras/gudev/gudevenumtypes.h.template b/src/extras/gudev/gudevenumtypes.h.template similarity index 100% rename from extras/gudev/gudevenumtypes.h.template rename to src/extras/gudev/gudevenumtypes.h.template diff --git a/extras/gudev/gudevmarshal.list b/src/extras/gudev/gudevmarshal.list similarity index 100% rename from extras/gudev/gudevmarshal.list rename to src/extras/gudev/gudevmarshal.list diff --git a/extras/gudev/gudevprivate.h b/src/extras/gudev/gudevprivate.h similarity index 100% rename from extras/gudev/gudevprivate.h rename to src/extras/gudev/gudevprivate.h diff --git a/extras/gudev/gudevtypes.h b/src/extras/gudev/gudevtypes.h similarity index 100% rename from extras/gudev/gudevtypes.h rename to src/extras/gudev/gudevtypes.h diff --git a/extras/gudev/seed-example-enum.js b/src/extras/gudev/seed-example-enum.js similarity index 100% rename from extras/gudev/seed-example-enum.js rename to src/extras/gudev/seed-example-enum.js diff --git a/extras/gudev/seed-example.js b/src/extras/gudev/seed-example.js similarity index 100% rename from extras/gudev/seed-example.js rename to src/extras/gudev/seed-example.js diff --git a/extras/keymap/.gitignore b/src/extras/keymap/.gitignore similarity index 100% rename from extras/keymap/.gitignore rename to src/extras/keymap/.gitignore diff --git a/extras/keymap/95-keyboard-force-release.rules b/src/extras/keymap/95-keyboard-force-release.rules similarity index 100% rename from extras/keymap/95-keyboard-force-release.rules rename to src/extras/keymap/95-keyboard-force-release.rules diff --git a/extras/keymap/95-keymap.rules b/src/extras/keymap/95-keymap.rules similarity index 100% rename from extras/keymap/95-keymap.rules rename to src/extras/keymap/95-keymap.rules diff --git a/extras/keymap/README.keymap.txt b/src/extras/keymap/README.keymap.txt similarity index 99% rename from extras/keymap/README.keymap.txt rename to src/extras/keymap/README.keymap.txt index acdc00283a0..52d50ed2de5 100644 --- a/extras/keymap/README.keymap.txt +++ b/src/extras/keymap/README.keymap.txt @@ -21,7 +21,7 @@ code mapping is incorrect on your computer. udev-keymap consists of the following parts: keymaps/*:: mappings of scan codes to key code names - + 95-keymap.rules:: udev rules for mapping system vendor/product names and input module names to one of the keymaps above @@ -59,8 +59,8 @@ for inclusion you need to do the following steps: out is plausible. If it is unknown or wrong, write down the scan code (looks like "0x1E") and the intended functionality of this key. Look in /usr/include/linux/input.h for an available KEY_XXXXX constant which most - closely approximates this functionality and write it down as the new key code. - + closely approximates this functionality and write it down as the new key code. + For example, you might press a key labeled "web browser" which currently produces "unknown". Note down this: diff --git a/extras/keymap/check-keymaps.sh b/src/extras/keymap/check-keymaps.sh similarity index 86% rename from extras/keymap/check-keymaps.sh rename to src/extras/keymap/check-keymaps.sh index 350a857171c..ea77b69c241 100755 --- a/extras/keymap/check-keymaps.sh +++ b/src/extras/keymap/check-keymaps.sh @@ -4,9 +4,9 @@ # and that all key maps listed in the rules are valid and present in # Makefile.am SRCDIR=${1:-.} -KEYLIST=${2:-extras/keymap/keys.txt} -KEYMAPS_DIR=$SRCDIR/extras/keymap/keymaps #extras/keymap/keymaps -RULES=$SRCDIR/extras/keymap/95-keymap.rules +KEYLIST=${2:-src/extras/keymap/keys.txt} +KEYMAPS_DIR=$SRCDIR/src/extras/keymap/keymaps #extras/keymap/keymaps +RULES=$SRCDIR/src/extras/keymap/95-keymap.rules [ -e "$KEYLIST" ] || { echo "need $KEYLIST please build first" >&2 diff --git a/extras/keymap/findkeyboards b/src/extras/keymap/findkeyboards similarity index 100% rename from extras/keymap/findkeyboards rename to src/extras/keymap/findkeyboards diff --git a/extras/keymap/force-release-maps/common-volume-keys b/src/extras/keymap/force-release-maps/common-volume-keys similarity index 100% rename from extras/keymap/force-release-maps/common-volume-keys rename to src/extras/keymap/force-release-maps/common-volume-keys diff --git a/extras/keymap/force-release-maps/dell-touchpad b/src/extras/keymap/force-release-maps/dell-touchpad similarity index 100% rename from extras/keymap/force-release-maps/dell-touchpad rename to src/extras/keymap/force-release-maps/dell-touchpad diff --git a/extras/keymap/force-release-maps/hp-other b/src/extras/keymap/force-release-maps/hp-other similarity index 100% rename from extras/keymap/force-release-maps/hp-other rename to src/extras/keymap/force-release-maps/hp-other diff --git a/extras/keymap/force-release-maps/samsung-other b/src/extras/keymap/force-release-maps/samsung-other similarity index 100% rename from extras/keymap/force-release-maps/samsung-other rename to src/extras/keymap/force-release-maps/samsung-other diff --git a/extras/keymap/keyboard-force-release.sh.in b/src/extras/keymap/keyboard-force-release.sh.in similarity index 100% rename from extras/keymap/keyboard-force-release.sh.in rename to src/extras/keymap/keyboard-force-release.sh.in diff --git a/extras/keymap/keymap.c b/src/extras/keymap/keymap.c similarity index 98% rename from extras/keymap/keymap.c rename to src/extras/keymap/keymap.c index 79fd0599a92..6bcfaefa182 100644 --- a/extras/keymap/keymap.c +++ b/src/extras/keymap/keymap.c @@ -177,10 +177,10 @@ static void set_key(int fd, const char* scancode_str, const char* keyname) } if (evdev_set_keycode(fd, scancode, k->id) < 0) - fprintf(stderr, "setting scancode 0x%2X to key code %i failed\n", + fprintf(stderr, "setting scancode 0x%2X to key code %i failed\n", scancode, k->id); else - printf("setting scancode 0x%2X to key code %i\n", + printf("setting scancode 0x%2X to key code %i\n", scancode, k->id); } @@ -324,7 +324,7 @@ static void interactive(int fd) has_scan = 0; } - last_key = ev.code; + last_key = ev.code; has_key = 1 + ev.value; /*printf("--- got key %hu; has scan %i key %i\n", last_key, has_scan, has_key);*/ @@ -437,7 +437,7 @@ int main(int argc, char **argv) /* more arguments (device, scancode/keyname pairs): set keys directly */ if ((argc - optind - 1) % 2 == 0) { for (i = optind+1; i < argc; i += 2) - set_key(fd, argv[i], argv[i+1]); + set_key(fd, argv[i], argv[i+1]); return 0; } diff --git a/extras/keymap/keymaps/acer b/src/extras/keymap/keymaps/acer similarity index 100% rename from extras/keymap/keymaps/acer rename to src/extras/keymap/keymaps/acer diff --git a/extras/keymap/keymaps/acer-aspire_5720 b/src/extras/keymap/keymaps/acer-aspire_5720 similarity index 99% rename from extras/keymap/keymaps/acer-aspire_5720 rename to src/extras/keymap/keymaps/acer-aspire_5720 index b3515b772f1..c4a84593677 100644 --- a/extras/keymap/keymaps/acer-aspire_5720 +++ b/src/extras/keymap/keymaps/acer-aspire_5720 @@ -2,4 +2,3 @@ 0x92 media # acer arcade 0xD4 bluetooth # bluetooth on 0xD9 bluetooth # bluetooth off - diff --git a/extras/keymap/keymaps/acer-aspire_5920g b/src/extras/keymap/keymaps/acer-aspire_5920g similarity index 100% rename from extras/keymap/keymaps/acer-aspire_5920g rename to src/extras/keymap/keymaps/acer-aspire_5920g diff --git a/extras/keymap/keymaps/acer-aspire_6920 b/src/extras/keymap/keymaps/acer-aspire_6920 similarity index 100% rename from extras/keymap/keymaps/acer-aspire_6920 rename to src/extras/keymap/keymaps/acer-aspire_6920 diff --git a/extras/keymap/keymaps/acer-aspire_8930 b/src/extras/keymap/keymaps/acer-aspire_8930 similarity index 99% rename from extras/keymap/keymaps/acer-aspire_8930 rename to src/extras/keymap/keymaps/acer-aspire_8930 index ffe9f372f71..fb27bfb4f5f 100644 --- a/extras/keymap/keymaps/acer-aspire_8930 +++ b/src/extras/keymap/keymaps/acer-aspire_8930 @@ -3,4 +3,3 @@ 0x89 fastforward 0x92 media # key 'ARCADE' on cine dash media console 0x9E back - diff --git a/extras/keymap/keymaps/acer-travelmate_c300 b/src/extras/keymap/keymaps/acer-travelmate_c300 similarity index 100% rename from extras/keymap/keymaps/acer-travelmate_c300 rename to src/extras/keymap/keymaps/acer-travelmate_c300 diff --git a/extras/keymap/keymaps/asus b/src/extras/keymap/keymaps/asus similarity index 100% rename from extras/keymap/keymaps/asus rename to src/extras/keymap/keymaps/asus diff --git a/extras/keymap/keymaps/compaq-e_evo b/src/extras/keymap/keymaps/compaq-e_evo similarity index 100% rename from extras/keymap/keymaps/compaq-e_evo rename to src/extras/keymap/keymaps/compaq-e_evo diff --git a/extras/keymap/keymaps/dell b/src/extras/keymap/keymaps/dell similarity index 100% rename from extras/keymap/keymaps/dell rename to src/extras/keymap/keymaps/dell diff --git a/extras/keymap/keymaps/dell-latitude-xt2 b/src/extras/keymap/keymaps/dell-latitude-xt2 similarity index 100% rename from extras/keymap/keymaps/dell-latitude-xt2 rename to src/extras/keymap/keymaps/dell-latitude-xt2 diff --git a/extras/keymap/keymaps/everex-xt5000 b/src/extras/keymap/keymaps/everex-xt5000 similarity index 100% rename from extras/keymap/keymaps/everex-xt5000 rename to src/extras/keymap/keymaps/everex-xt5000 diff --git a/extras/keymap/keymaps/fujitsu-amilo_pa_2548 b/src/extras/keymap/keymaps/fujitsu-amilo_pa_2548 similarity index 100% rename from extras/keymap/keymaps/fujitsu-amilo_pa_2548 rename to src/extras/keymap/keymaps/fujitsu-amilo_pa_2548 diff --git a/extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 b/src/extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 similarity index 100% rename from extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 rename to src/extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 diff --git a/extras/keymap/keymaps/fujitsu-amilo_pro_v3205 b/src/extras/keymap/keymaps/fujitsu-amilo_pro_v3205 similarity index 100% rename from extras/keymap/keymaps/fujitsu-amilo_pro_v3205 rename to src/extras/keymap/keymaps/fujitsu-amilo_pro_v3205 diff --git a/extras/keymap/keymaps/fujitsu-amilo_si_1520 b/src/extras/keymap/keymaps/fujitsu-amilo_si_1520 similarity index 100% rename from extras/keymap/keymaps/fujitsu-amilo_si_1520 rename to src/extras/keymap/keymaps/fujitsu-amilo_si_1520 diff --git a/extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 b/src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 similarity index 100% rename from extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 rename to src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 diff --git a/extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 b/src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 similarity index 100% rename from extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 rename to src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 diff --git a/extras/keymap/keymaps/genius-slimstar-320 b/src/extras/keymap/keymaps/genius-slimstar-320 similarity index 100% rename from extras/keymap/keymaps/genius-slimstar-320 rename to src/extras/keymap/keymaps/genius-slimstar-320 diff --git a/extras/keymap/keymaps/hewlett-packard b/src/extras/keymap/keymaps/hewlett-packard similarity index 100% rename from extras/keymap/keymaps/hewlett-packard rename to src/extras/keymap/keymaps/hewlett-packard diff --git a/extras/keymap/keymaps/hewlett-packard-2510p_2530p b/src/extras/keymap/keymaps/hewlett-packard-2510p_2530p similarity index 100% rename from extras/keymap/keymaps/hewlett-packard-2510p_2530p rename to src/extras/keymap/keymaps/hewlett-packard-2510p_2530p diff --git a/extras/keymap/keymaps/hewlett-packard-compaq_elitebook b/src/extras/keymap/keymaps/hewlett-packard-compaq_elitebook similarity index 100% rename from extras/keymap/keymaps/hewlett-packard-compaq_elitebook rename to src/extras/keymap/keymaps/hewlett-packard-compaq_elitebook diff --git a/extras/keymap/keymaps/hewlett-packard-pavilion b/src/extras/keymap/keymaps/hewlett-packard-pavilion similarity index 100% rename from extras/keymap/keymaps/hewlett-packard-pavilion rename to src/extras/keymap/keymaps/hewlett-packard-pavilion diff --git a/extras/keymap/keymaps/hewlett-packard-presario-2100 b/src/extras/keymap/keymaps/hewlett-packard-presario-2100 similarity index 100% rename from extras/keymap/keymaps/hewlett-packard-presario-2100 rename to src/extras/keymap/keymaps/hewlett-packard-presario-2100 diff --git a/extras/keymap/keymaps/hewlett-packard-tablet b/src/extras/keymap/keymaps/hewlett-packard-tablet similarity index 100% rename from extras/keymap/keymaps/hewlett-packard-tablet rename to src/extras/keymap/keymaps/hewlett-packard-tablet diff --git a/extras/keymap/keymaps/hewlett-packard-tx2 b/src/extras/keymap/keymaps/hewlett-packard-tx2 similarity index 100% rename from extras/keymap/keymaps/hewlett-packard-tx2 rename to src/extras/keymap/keymaps/hewlett-packard-tx2 diff --git a/extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint b/src/extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint similarity index 100% rename from extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint rename to src/extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint diff --git a/extras/keymap/keymaps/inventec-symphony_6.0_7.0 b/src/extras/keymap/keymaps/inventec-symphony_6.0_7.0 similarity index 100% rename from extras/keymap/keymaps/inventec-symphony_6.0_7.0 rename to src/extras/keymap/keymaps/inventec-symphony_6.0_7.0 diff --git a/extras/keymap/keymaps/lenovo-3000 b/src/extras/keymap/keymaps/lenovo-3000 similarity index 100% rename from extras/keymap/keymaps/lenovo-3000 rename to src/extras/keymap/keymaps/lenovo-3000 diff --git a/extras/keymap/keymaps/lenovo-ideapad b/src/extras/keymap/keymaps/lenovo-ideapad similarity index 100% rename from extras/keymap/keymaps/lenovo-ideapad rename to src/extras/keymap/keymaps/lenovo-ideapad diff --git a/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint b/src/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint similarity index 89% rename from extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint rename to src/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint index 3e94547270c..47e8846a680 100644 --- a/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint +++ b/src/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint @@ -10,4 +10,4 @@ 0x90011 prog1 # Thinkvantage button 0x90015 camera # Fn+F6 headset/camera VoIP key ?? -0x90010 micmute # Microphone mute button +0x90010 micmute # Microphone mute button diff --git a/extras/keymap/keymaps/lenovo-thinkpad_x200_tablet b/src/extras/keymap/keymaps/lenovo-thinkpad_x200_tablet similarity index 100% rename from extras/keymap/keymaps/lenovo-thinkpad_x200_tablet rename to src/extras/keymap/keymaps/lenovo-thinkpad_x200_tablet diff --git a/extras/keymap/keymaps/lenovo-thinkpad_x6_tablet b/src/extras/keymap/keymaps/lenovo-thinkpad_x6_tablet similarity index 100% rename from extras/keymap/keymaps/lenovo-thinkpad_x6_tablet rename to src/extras/keymap/keymaps/lenovo-thinkpad_x6_tablet diff --git a/extras/keymap/keymaps/lg-x110 b/src/extras/keymap/keymaps/lg-x110 similarity index 100% rename from extras/keymap/keymaps/lg-x110 rename to src/extras/keymap/keymaps/lg-x110 diff --git a/extras/keymap/keymaps/logitech-wave b/src/extras/keymap/keymaps/logitech-wave similarity index 100% rename from extras/keymap/keymaps/logitech-wave rename to src/extras/keymap/keymaps/logitech-wave diff --git a/extras/keymap/keymaps/logitech-wave-cordless b/src/extras/keymap/keymaps/logitech-wave-cordless similarity index 100% rename from extras/keymap/keymaps/logitech-wave-cordless rename to src/extras/keymap/keymaps/logitech-wave-cordless diff --git a/extras/keymap/keymaps/logitech-wave-pro-cordless b/src/extras/keymap/keymaps/logitech-wave-pro-cordless similarity index 100% rename from extras/keymap/keymaps/logitech-wave-pro-cordless rename to src/extras/keymap/keymaps/logitech-wave-pro-cordless diff --git a/extras/keymap/keymaps/maxdata-pro_7000 b/src/extras/keymap/keymaps/maxdata-pro_7000 similarity index 100% rename from extras/keymap/keymaps/maxdata-pro_7000 rename to src/extras/keymap/keymaps/maxdata-pro_7000 diff --git a/extras/keymap/keymaps/medion-fid2060 b/src/extras/keymap/keymaps/medion-fid2060 similarity index 100% rename from extras/keymap/keymaps/medion-fid2060 rename to src/extras/keymap/keymaps/medion-fid2060 diff --git a/extras/keymap/keymaps/medionnb-a555 b/src/extras/keymap/keymaps/medionnb-a555 similarity index 100% rename from extras/keymap/keymaps/medionnb-a555 rename to src/extras/keymap/keymaps/medionnb-a555 diff --git a/extras/keymap/keymaps/micro-star b/src/extras/keymap/keymaps/micro-star similarity index 100% rename from extras/keymap/keymaps/micro-star rename to src/extras/keymap/keymaps/micro-star diff --git a/extras/keymap/keymaps/module-asus-w3j b/src/extras/keymap/keymaps/module-asus-w3j similarity index 100% rename from extras/keymap/keymaps/module-asus-w3j rename to src/extras/keymap/keymaps/module-asus-w3j diff --git a/extras/keymap/keymaps/module-ibm b/src/extras/keymap/keymaps/module-ibm similarity index 100% rename from extras/keymap/keymaps/module-ibm rename to src/extras/keymap/keymaps/module-ibm diff --git a/extras/keymap/keymaps/module-lenovo b/src/extras/keymap/keymaps/module-lenovo similarity index 100% rename from extras/keymap/keymaps/module-lenovo rename to src/extras/keymap/keymaps/module-lenovo diff --git a/extras/keymap/keymaps/module-sony b/src/extras/keymap/keymaps/module-sony similarity index 100% rename from extras/keymap/keymaps/module-sony rename to src/extras/keymap/keymaps/module-sony diff --git a/extras/keymap/keymaps/module-sony-old b/src/extras/keymap/keymaps/module-sony-old similarity index 100% rename from extras/keymap/keymaps/module-sony-old rename to src/extras/keymap/keymaps/module-sony-old diff --git a/extras/keymap/keymaps/module-sony-vgn b/src/extras/keymap/keymaps/module-sony-vgn similarity index 100% rename from extras/keymap/keymaps/module-sony-vgn rename to src/extras/keymap/keymaps/module-sony-vgn diff --git a/extras/keymap/keymaps/olpc-xo b/src/extras/keymap/keymaps/olpc-xo similarity index 100% rename from extras/keymap/keymaps/olpc-xo rename to src/extras/keymap/keymaps/olpc-xo diff --git a/extras/keymap/keymaps/onkyo b/src/extras/keymap/keymaps/onkyo similarity index 100% rename from extras/keymap/keymaps/onkyo rename to src/extras/keymap/keymaps/onkyo diff --git a/extras/keymap/keymaps/oqo-model2 b/src/extras/keymap/keymaps/oqo-model2 similarity index 100% rename from extras/keymap/keymaps/oqo-model2 rename to src/extras/keymap/keymaps/oqo-model2 diff --git a/extras/keymap/keymaps/samsung-other b/src/extras/keymap/keymaps/samsung-other similarity index 100% rename from extras/keymap/keymaps/samsung-other rename to src/extras/keymap/keymaps/samsung-other diff --git a/extras/keymap/keymaps/samsung-sq1us b/src/extras/keymap/keymaps/samsung-sq1us similarity index 83% rename from extras/keymap/keymaps/samsung-sq1us rename to src/extras/keymap/keymaps/samsung-sq1us index 3e051997856..ea2141ef84f 100644 --- a/extras/keymap/keymaps/samsung-sq1us +++ b/src/extras/keymap/keymaps/samsung-sq1us @@ -1,6 +1,6 @@ 0xD4 menu 0xD8 f1 -0xD9 f10 +0xD9 f10 0xD6 f3 0xD7 f9 0xE4 f5 diff --git a/extras/keymap/keymaps/samsung-sx20s b/src/extras/keymap/keymaps/samsung-sx20s similarity index 100% rename from extras/keymap/keymaps/samsung-sx20s rename to src/extras/keymap/keymaps/samsung-sx20s diff --git a/extras/keymap/keymaps/toshiba-satellite_a100 b/src/extras/keymap/keymaps/toshiba-satellite_a100 similarity index 100% rename from extras/keymap/keymaps/toshiba-satellite_a100 rename to src/extras/keymap/keymaps/toshiba-satellite_a100 diff --git a/extras/keymap/keymaps/toshiba-satellite_a110 b/src/extras/keymap/keymaps/toshiba-satellite_a110 similarity index 100% rename from extras/keymap/keymaps/toshiba-satellite_a110 rename to src/extras/keymap/keymaps/toshiba-satellite_a110 diff --git a/extras/keymap/keymaps/toshiba-satellite_m30x b/src/extras/keymap/keymaps/toshiba-satellite_m30x similarity index 99% rename from extras/keymap/keymaps/toshiba-satellite_m30x rename to src/extras/keymap/keymaps/toshiba-satellite_m30x index 9280ae0c5f9..ae8e34941b3 100644 --- a/extras/keymap/keymaps/toshiba-satellite_m30x +++ b/src/extras/keymap/keymaps/toshiba-satellite_m30x @@ -4,4 +4,3 @@ 0x93 media 0x9e f22 #touchpad_enable 0x9f f23 #touchpad_disable - diff --git a/extras/keymap/keymaps/zepto-znote b/src/extras/keymap/keymaps/zepto-znote similarity index 100% rename from extras/keymap/keymaps/zepto-znote rename to src/extras/keymap/keymaps/zepto-znote diff --git a/extras/mtd_probe/.gitignore b/src/extras/mtd_probe/.gitignore similarity index 100% rename from extras/mtd_probe/.gitignore rename to src/extras/mtd_probe/.gitignore diff --git a/extras/mtd_probe/75-probe_mtd.rules b/src/extras/mtd_probe/75-probe_mtd.rules similarity index 100% rename from extras/mtd_probe/75-probe_mtd.rules rename to src/extras/mtd_probe/75-probe_mtd.rules diff --git a/extras/mtd_probe/mtd_probe.c b/src/extras/mtd_probe/mtd_probe.c similarity index 100% rename from extras/mtd_probe/mtd_probe.c rename to src/extras/mtd_probe/mtd_probe.c diff --git a/extras/mtd_probe/mtd_probe.h b/src/extras/mtd_probe/mtd_probe.h similarity index 96% rename from extras/mtd_probe/mtd_probe.h rename to src/extras/mtd_probe/mtd_probe.h index 30396d07f62..20ecd4578e0 100644 --- a/extras/mtd_probe/mtd_probe.h +++ b/src/extras/mtd_probe/mtd_probe.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with mtd_probe; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, + * Foundation, Inc., 51 Franklin St, Fifth Floor, * Boston, MA 02110-1301 USA */ diff --git a/extras/mtd_probe/probe_smartmedia.c b/src/extras/mtd_probe/probe_smartmedia.c similarity index 97% rename from extras/mtd_probe/probe_smartmedia.c rename to src/extras/mtd_probe/probe_smartmedia.c index 78841f05da8..49704e380ac 100644 --- a/extras/mtd_probe/probe_smartmedia.c +++ b/src/extras/mtd_probe/probe_smartmedia.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with mtd_probe; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, + * Foundation, Inc., 51 Franklin St, Fifth Floor, * Boston, MA 02110-1301 USA */ diff --git a/extras/qemu/42-qemu-usb.rules b/src/extras/qemu/42-qemu-usb.rules similarity index 100% rename from extras/qemu/42-qemu-usb.rules rename to src/extras/qemu/42-qemu-usb.rules diff --git a/extras/rule_generator/75-cd-aliases-generator.rules b/src/extras/rule_generator/75-cd-aliases-generator.rules similarity index 100% rename from extras/rule_generator/75-cd-aliases-generator.rules rename to src/extras/rule_generator/75-cd-aliases-generator.rules diff --git a/extras/rule_generator/75-persistent-net-generator.rules b/src/extras/rule_generator/75-persistent-net-generator.rules similarity index 99% rename from extras/rule_generator/75-persistent-net-generator.rules rename to src/extras/rule_generator/75-persistent-net-generator.rules index aab579cde9e..4f80573478d 100644 --- a/extras/rule_generator/75-persistent-net-generator.rules +++ b/src/extras/rule_generator/75-persistent-net-generator.rules @@ -100,4 +100,3 @@ DRIVERS=="?*", IMPORT{program}="write_net_rules" ENV{INTERFACE_NEW}=="?*", NAME="$env{INTERFACE_NEW}" LABEL="persistent_net_generator_end" - diff --git a/extras/rule_generator/rule_generator.functions b/src/extras/rule_generator/rule_generator.functions similarity index 100% rename from extras/rule_generator/rule_generator.functions rename to src/extras/rule_generator/rule_generator.functions diff --git a/extras/rule_generator/write_cd_rules b/src/extras/rule_generator/write_cd_rules similarity index 99% rename from extras/rule_generator/write_cd_rules rename to src/extras/rule_generator/write_cd_rules index 00382ada2fd..3f93c7447a0 100644 --- a/extras/rule_generator/write_cd_rules +++ b/src/extras/rule_generator/write_cd_rules @@ -124,4 +124,3 @@ unlock_rules_file echo $SYMLINKS exit 0 - diff --git a/extras/rule_generator/write_net_rules b/src/extras/rule_generator/write_net_rules similarity index 100% rename from extras/rule_generator/write_net_rules rename to src/extras/rule_generator/write_net_rules diff --git a/extras/scsi_id/.gitignore b/src/extras/scsi_id/.gitignore similarity index 100% rename from extras/scsi_id/.gitignore rename to src/extras/scsi_id/.gitignore diff --git a/extras/scsi_id/README b/src/extras/scsi_id/README similarity index 100% rename from extras/scsi_id/README rename to src/extras/scsi_id/README diff --git a/extras/scsi_id/scsi.h b/src/extras/scsi_id/scsi.h similarity index 100% rename from extras/scsi_id/scsi.h rename to src/extras/scsi_id/scsi.h diff --git a/extras/scsi_id/scsi_id.8 b/src/extras/scsi_id/scsi_id.8 similarity index 95% rename from extras/scsi_id/scsi_id.8 rename to src/extras/scsi_id/scsi_id.8 index 8f83f390209..0d4dba9149a 100644 --- a/extras/scsi_id/scsi_id.8 +++ b/src/extras/scsi_id/scsi_id.8 @@ -2,13 +2,13 @@ .SH NAME scsi_id \- retrieve and generate a unique SCSI identifier .SH SYNOPSIS -.BI scsi_id +.BI scsi_id [\fIoptions\fP] .SH "DESCRIPTION" .B scsi_id queries a SCSI device via the SCSI INQUIRY vital product data (VPD) page 0x80 or 0x83 and uses the resulting data to generate a value that is unique across -all SCSI devices that properly support page 0x80 or page 0x83. +all SCSI devices that properly support page 0x80 or page 0x83. If a result is generated it is sent to standard output, and the program exits with a zero value. If no identifier is output, the program exits @@ -61,14 +61,14 @@ Send SG_IO commands to \fBdevice\fP, such as \fB/dev/sdc\fP. .TP .BI \-\-config=\| config\-file Read configuration and black/white list entries from -.B config\-file +.B config\-file rather than the default .B /etc/scsi_id.config file. .TP .BI \-\-whitelisted Treat the device as white listed. The \fB\-\-whitelisted\fP option must be specified -on the command line or in the scsi_id configuration file for +on the command line or in the scsi_id configuration file for .B scsi_id to generate any output. .TP diff --git a/extras/scsi_id/scsi_id.c b/src/extras/scsi_id/scsi_id.c similarity index 99% rename from extras/scsi_id/scsi_id.c rename to src/extras/scsi_id/scsi_id.c index 26b92e3fcda..da81d083cef 100644 --- a/extras/scsi_id/scsi_id.c +++ b/src/extras/scsi_id/scsi_id.c @@ -394,7 +394,7 @@ static int set_options(struct udev *udev, } else if (strcmp(optarg, "0x83") == 0) { default_page_code = PAGE_83; } else if (strcmp(optarg, "pre-spc3-83") == 0) { - default_page_code = PAGE_83_PRE_SPC3; + default_page_code = PAGE_83_PRE_SPC3; } else { err(udev, "Unknown page code '%s'\n", optarg); return -1; @@ -476,7 +476,7 @@ static int per_dev_options(struct udev *udev, } else if (strcmp(optarg, "0x83") == 0) { *page_code = PAGE_83; } else if (strcmp(optarg, "pre-spc3-83") == 0) { - *page_code = PAGE_83_PRE_SPC3; + *page_code = PAGE_83_PRE_SPC3; } else { err(udev, "Unknown page code '%s'\n", optarg); retval = -1; diff --git a/extras/scsi_id/scsi_id.h b/src/extras/scsi_id/scsi_id.h similarity index 99% rename from extras/scsi_id/scsi_id.h rename to src/extras/scsi_id/scsi_id.h index f6c269fc591..a28f5e073c7 100644 --- a/extras/scsi_id/scsi_id.h +++ b/src/extras/scsi_id/scsi_id.h @@ -71,4 +71,3 @@ enum page_code { PAGE_80 = 0x80, PAGE_83 = 0x83, }; - diff --git a/extras/scsi_id/scsi_serial.c b/src/extras/scsi_id/scsi_serial.c similarity index 99% rename from extras/scsi_id/scsi_serial.c rename to src/extras/scsi_id/scsi_serial.c index 5cde9a54a06..61ec618e997 100644 --- a/extras/scsi_id/scsi_serial.c +++ b/src/extras/scsi_id/scsi_serial.c @@ -642,7 +642,7 @@ static int do_scsi_page83_inquiry(struct udev *udev, info(udev, "%s: Invalid page 0x83\n", dev_scsi->kernel); return 1; } - + /* * XXX Some devices (IBM 3542) return all spaces for an identifier if * the LUN is not actually configured. This leads to identifiers of @@ -671,8 +671,8 @@ static int do_scsi_page83_inquiry(struct udev *udev, * to the 4th and 5th nibbles of the 6-byte OUI for EMC, that is, * 0x006048. */ - - if (page_83[6] != 0) + + if (page_83[6] != 0) return check_fill_0x83_prespc3(udev, dev_scsi, page_83, id_search_list, serial, serial_short, len); diff --git a/extras/udev-acl/.gitignore b/src/extras/udev-acl/.gitignore similarity index 100% rename from extras/udev-acl/.gitignore rename to src/extras/udev-acl/.gitignore diff --git a/extras/udev-acl/70-udev-acl.rules b/src/extras/udev-acl/70-udev-acl.rules similarity index 100% rename from extras/udev-acl/70-udev-acl.rules rename to src/extras/udev-acl/70-udev-acl.rules diff --git a/extras/udev-acl/udev-acl.c b/src/extras/udev-acl/udev-acl.c similarity index 100% rename from extras/udev-acl/udev-acl.c rename to src/extras/udev-acl/udev-acl.c diff --git a/extras/v4l_id/.gitignore b/src/extras/v4l_id/.gitignore similarity index 100% rename from extras/v4l_id/.gitignore rename to src/extras/v4l_id/.gitignore diff --git a/extras/v4l_id/60-persistent-v4l.rules b/src/extras/v4l_id/60-persistent-v4l.rules similarity index 100% rename from extras/v4l_id/60-persistent-v4l.rules rename to src/extras/v4l_id/60-persistent-v4l.rules diff --git a/extras/v4l_id/v4l_id.c b/src/extras/v4l_id/v4l_id.c similarity index 100% rename from extras/v4l_id/v4l_id.c rename to src/extras/v4l_id/v4l_id.c diff --git a/libudev/libudev-device-private.c b/src/libudev-device-private.c similarity index 99% rename from libudev/libudev-device-private.c rename to src/libudev-device-private.c index 08649193010..487d39bb5b9 100644 --- a/libudev/libudev-device-private.c +++ b/src/libudev-device-private.c @@ -165,7 +165,7 @@ int udev_device_update_db(struct udev_device *udev_device) fclose(f); rename(filename_tmp, filename); - info(udev, "created %s file '%s' for '%s'\n", has_info ? "db" : "empty", + info(udev, "created %s file '%s' for '%s'\n", has_info ? "db" : "empty", filename, udev_device_get_devpath(udev_device)); return 0; } diff --git a/libudev/libudev-device.c b/src/libudev-device.c similarity index 100% rename from libudev/libudev-device.c rename to src/libudev-device.c diff --git a/libudev/libudev-enumerate.c b/src/libudev-enumerate.c similarity index 100% rename from libudev/libudev-enumerate.c rename to src/libudev-enumerate.c diff --git a/libudev/libudev-list.c b/src/libudev-list.c similarity index 100% rename from libudev/libudev-list.c rename to src/libudev-list.c diff --git a/libudev/libudev-monitor.c b/src/libudev-monitor.c similarity index 100% rename from libudev/libudev-monitor.c rename to src/libudev-monitor.c diff --git a/libudev/libudev-private.h b/src/libudev-private.h similarity index 100% rename from libudev/libudev-private.h rename to src/libudev-private.h diff --git a/libudev/libudev-queue-private.c b/src/libudev-queue-private.c similarity index 100% rename from libudev/libudev-queue-private.c rename to src/libudev-queue-private.c diff --git a/libudev/libudev-queue.c b/src/libudev-queue.c similarity index 100% rename from libudev/libudev-queue.c rename to src/libudev-queue.c diff --git a/libudev/libudev-selinux-private.c b/src/libudev-selinux-private.c similarity index 100% rename from libudev/libudev-selinux-private.c rename to src/libudev-selinux-private.c diff --git a/libudev/libudev-util-private.c b/src/libudev-util-private.c similarity index 100% rename from libudev/libudev-util-private.c rename to src/libudev-util-private.c diff --git a/libudev/libudev-util.c b/src/libudev-util.c similarity index 99% rename from libudev/libudev-util.c rename to src/libudev-util.c index 5369fe734e5..559aa06dc69 100644 --- a/libudev/libudev-util.c +++ b/src/libudev-util.c @@ -503,10 +503,10 @@ static unsigned int murmur_hash2(const char *key, int len, unsigned int seed) while(len >= 4) { unsigned int k = *(unsigned int *)data; - k *= m; - k ^= k >> r; - k *= m; - h *= m; + k *= m; + k ^= k >> r; + k *= m; + h *= m; h ^= k; data += 4; diff --git a/libudev/libudev.c b/src/libudev.c similarity index 100% rename from libudev/libudev.c rename to src/libudev.c diff --git a/libudev/libudev.h b/src/libudev.h similarity index 99% rename from libudev/libudev.h rename to src/libudev.h index 497f752fca5..28d7d0a388e 100644 --- a/libudev/libudev.h +++ b/src/libudev.h @@ -22,7 +22,7 @@ extern "C" { /* * udev - library context - * + * * reads the udev config and system environment * allows custom logging */ diff --git a/libudev/libudev.pc.in b/src/libudev.pc.in similarity index 93% rename from libudev/libudev.pc.in rename to src/libudev.pc.in index 93c83664805..c9a47fc9b85 100644 --- a/libudev/libudev.pc.in +++ b/src/libudev.pc.in @@ -7,5 +7,5 @@ Name: libudev Description: Library to access udev device information Version: @VERSION@ Libs: -L${libdir} -ludev -lrt -Libs.private: +Libs.private: Cflags: -I${includedir} diff --git a/udev/sd-daemon.c b/src/sd-daemon.c similarity index 100% rename from udev/sd-daemon.c rename to src/sd-daemon.c diff --git a/udev/sd-daemon.h b/src/sd-daemon.h similarity index 100% rename from udev/sd-daemon.h rename to src/sd-daemon.h diff --git a/libudev/test-libudev.c b/src/test-libudev.c similarity index 100% rename from libudev/test-libudev.c rename to src/test-libudev.c diff --git a/udev/test-udev.c b/src/test-udev.c similarity index 100% rename from udev/test-udev.c rename to src/test-udev.c diff --git a/udev/udev-builtin-blkid.c b/src/udev-builtin-blkid.c similarity index 100% rename from udev/udev-builtin-blkid.c rename to src/udev-builtin-blkid.c diff --git a/udev/udev-builtin-firmware.c b/src/udev-builtin-firmware.c similarity index 99% rename from udev/udev-builtin-firmware.c rename to src/udev-builtin-firmware.c index d7921a26931..6d03085af78 100644 --- a/udev/udev-builtin-firmware.c +++ b/src/udev-builtin-firmware.c @@ -104,7 +104,7 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo dbg(udev, "trying %s\n", fwpath); fwfile = fopen(fwpath, "re"); if (fwfile != NULL) - break; + break; util_strscpyl(fwpath, sizeof(fwpath), searchpath[i], firmware, NULL); dbg(udev, "trying %s\n", fwpath); diff --git a/udev/udev-builtin-hwdb.c b/src/udev-builtin-hwdb.c similarity index 100% rename from udev/udev-builtin-hwdb.c rename to src/udev-builtin-hwdb.c diff --git a/udev/udev-builtin-input_id.c b/src/udev-builtin-input_id.c similarity index 98% rename from udev/udev-builtin-input_id.c rename to src/udev-builtin-input_id.c index 4ef060d8999..c0c42702568 100644 --- a/udev/udev-builtin-input_id.c +++ b/src/udev-builtin-input_id.c @@ -114,8 +114,8 @@ static void test_pointers (struct udev_device *dev, udev_builtin_add_property(dev, test, "ID_INPUT_TABLET", "1"); else if (test_bit (BTN_TOOL_FINGER, bitmask_key) && !test_bit (BTN_TOOL_PEN, bitmask_key)) is_touchpad = 1; - else if (test_bit (BTN_TRIGGER, bitmask_key) || - test_bit (BTN_A, bitmask_key) || + else if (test_bit (BTN_TRIGGER, bitmask_key) || + test_bit (BTN_A, bitmask_key) || test_bit (BTN_1, bitmask_key)) udev_builtin_add_property(dev, test, "ID_INPUT_JOYSTICK", "1"); else if (test_bit (BTN_MOUSE, bitmask_key)) @@ -126,7 +126,7 @@ static void test_pointers (struct udev_device *dev, udev_builtin_add_property(dev, test, "ID_INPUT_TOUCHSCREEN", "1"); } - if (test_bit (EV_REL, bitmask_ev) && + if (test_bit (EV_REL, bitmask_ev) && test_bit (REL_X, bitmask_rel) && test_bit (REL_Y, bitmask_rel) && test_bit (BTN_MOUSE, bitmask_key)) is_mouse = 1; diff --git a/udev/udev-builtin-kmod.c b/src/udev-builtin-kmod.c similarity index 100% rename from udev/udev-builtin-kmod.c rename to src/udev-builtin-kmod.c diff --git a/udev/udev-builtin-path_id.c b/src/udev-builtin-path_id.c similarity index 99% rename from udev/udev-builtin-path_id.c rename to src/udev-builtin-path_id.c index 18af12f29a4..049e89b2778 100644 --- a/udev/udev-builtin-path_id.c +++ b/src/udev-builtin-path_id.c @@ -138,7 +138,7 @@ static struct udev_device *handle_scsi_sas(struct udev_device *parent, char **pa if (target_parent == NULL) return NULL; - sasdev = udev_device_new_from_subsystem_sysname(udev, "sas_device", + sasdev = udev_device_new_from_subsystem_sysname(udev, "sas_device", udev_device_get_sysname(target_parent)); if (sasdev == NULL) return NULL; diff --git a/udev/udev-builtin-usb_id.c b/src/udev-builtin-usb_id.c similarity index 100% rename from udev/udev-builtin-usb_id.c rename to src/udev-builtin-usb_id.c diff --git a/udev/udev-builtin.c b/src/udev-builtin.c similarity index 100% rename from udev/udev-builtin.c rename to src/udev-builtin.c diff --git a/systemd/udev-control.socket b/src/udev-control.socket similarity index 100% rename from systemd/udev-control.socket rename to src/udev-control.socket diff --git a/udev/udev-ctrl.c b/src/udev-ctrl.c similarity index 100% rename from udev/udev-ctrl.c rename to src/udev-ctrl.c diff --git a/udev/udev-event.c b/src/udev-event.c similarity index 100% rename from udev/udev-event.c rename to src/udev-event.c diff --git a/systemd/udev-kernel.socket b/src/udev-kernel.socket similarity index 100% rename from systemd/udev-kernel.socket rename to src/udev-kernel.socket diff --git a/udev/udev-node.c b/src/udev-node.c similarity index 100% rename from udev/udev-node.c rename to src/udev-node.c diff --git a/udev/udev-rules.c b/src/udev-rules.c similarity index 100% rename from udev/udev-rules.c rename to src/udev-rules.c diff --git a/systemd/udev-settle.service.in b/src/udev-settle.service.in similarity index 100% rename from systemd/udev-settle.service.in rename to src/udev-settle.service.in diff --git a/systemd/udev-trigger.service.in b/src/udev-trigger.service.in similarity index 100% rename from systemd/udev-trigger.service.in rename to src/udev-trigger.service.in diff --git a/udev/udev-watch.c b/src/udev-watch.c similarity index 100% rename from udev/udev-watch.c rename to src/udev-watch.c diff --git a/udev.conf b/src/udev.conf similarity index 100% rename from udev.conf rename to src/udev.conf diff --git a/udev/udev.h b/src/udev.h similarity index 100% rename from udev/udev.h rename to src/udev.h diff --git a/udev/udev.pc.in b/src/udev.pc.in similarity index 100% rename from udev/udev.pc.in rename to src/udev.pc.in diff --git a/systemd/udev.service.in b/src/udev.service.in similarity index 100% rename from systemd/udev.service.in rename to src/udev.service.in diff --git a/udev/udev.xml b/src/udev.xml similarity index 99% rename from udev/udev.xml rename to src/udev.xml index 79213b4bbe2..88e19f30d1e 100644 --- a/udev/udev.xml +++ b/src/udev.xml @@ -686,7 +686,7 @@ See Also udevd8 - , + , udevadm8 diff --git a/udev/udevadm-control.c b/src/udevadm-control.c similarity index 100% rename from udev/udevadm-control.c rename to src/udevadm-control.c diff --git a/udev/udevadm-info.c b/src/udevadm-info.c similarity index 100% rename from udev/udevadm-info.c rename to src/udevadm-info.c diff --git a/udev/udevadm-monitor.c b/src/udevadm-monitor.c similarity index 100% rename from udev/udevadm-monitor.c rename to src/udevadm-monitor.c diff --git a/udev/udevadm-settle.c b/src/udevadm-settle.c similarity index 100% rename from udev/udevadm-settle.c rename to src/udevadm-settle.c diff --git a/udev/udevadm-test-builtin.c b/src/udevadm-test-builtin.c similarity index 100% rename from udev/udevadm-test-builtin.c rename to src/udevadm-test-builtin.c diff --git a/udev/udevadm-test.c b/src/udevadm-test.c similarity index 100% rename from udev/udevadm-test.c rename to src/udevadm-test.c diff --git a/udev/udevadm-trigger.c b/src/udevadm-trigger.c similarity index 100% rename from udev/udevadm-trigger.c rename to src/udevadm-trigger.c diff --git a/udev/udevadm.c b/src/udevadm.c similarity index 100% rename from udev/udevadm.c rename to src/udevadm.c diff --git a/udev/udevadm.xml b/src/udevadm.xml similarity index 100% rename from udev/udevadm.xml rename to src/udevadm.xml diff --git a/udev/udevd.c b/src/udevd.c similarity index 99% rename from udev/udevd.c rename to src/udevd.c index 196e63fd0d0..b88213e5b5e 100644 --- a/udev/udevd.c +++ b/src/udevd.c @@ -1253,7 +1253,7 @@ int main(int argc, char *argv[]) " --debug\n" " --children-max=\n" " --exec-delay=\n" - " --resolve-names=early|late|never\n" + " --resolve-names=early|late|never\n" " --version\n" " --help\n" "\n"); diff --git a/udev/udevd.xml b/src/udevd.xml similarity index 100% rename from udev/udevd.xml rename to src/udevd.xml diff --git a/systemd/.gitignore b/systemd/.gitignore deleted file mode 100644 index 904e445e72b..00000000000 --- a/systemd/.gitignore +++ /dev/null @@ -1 +0,0 @@ -udev*.service diff --git a/test/udev-test.pl.in b/test/udev-test.pl.in index 05055013d5d..6c5eeee7621 100755 --- a/test/udev-test.pl.in +++ b/test/udev-test.pl.in @@ -22,7 +22,7 @@ use strict; my $PWD = $ENV{PWD}; my $sysfs = "test/sys/"; -my $udev_bin = "udev/test-udev"; +my $udev_bin = "src/test-udev"; my $valgrind = 0; my $udev_bin_valgrind = "valgrind --tool=memcheck --leak-check=yes --quiet $udev_bin"; my $udev_root = "udev-root"; diff --git a/udev/.gitignore b/udev/.gitignore deleted file mode 100644 index 73f746cb7df..00000000000 --- a/udev/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -udevd -udevadm -test-udev -*.[78] -*.html -udev.pc