move src/extras subdirectories to src/

diff --git a/Makefile.am b/Makefile.am
index 95cb52cdda2d8b6ef3d8b2cccf228de6fc4fc283..11b4c8477df4f47f14d11a12172c9797289b7bab 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -328,58 +328,58 @@ EXTRA_DIST += test/sys.tar.xz
 # ------------------------------------------------------------------------------
 # ata_id - ATA identify
 # ------------------------------------------------------------------------------
-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
+src_ata_id_ata_id_SOURCES = src/ata_id/ata_id.c
+src_ata_id_ata_id_LDADD = src/libudev-private.la
+pkglibexec_PROGRAMS += src/ata_id/ata_id
 
 # ------------------------------------------------------------------------------
 # cdrom_id - optical drive/media capability
 # ------------------------------------------------------------------------------
-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
+src_cdrom_id_cdrom_id_SOURCES = src/cdrom_id/cdrom_id.c
+src_cdrom_id_cdrom_id_LDADD = src/libudev-private.la
+pkglibexec_PROGRAMS += src/cdrom_id/cdrom_id
+dist_udevrules_DATA += src/cdrom_id/60-cdrom_id.rules
 
 # ------------------------------------------------------------------------------
 # collect - trigger action when a collection of devices appeared
 # ------------------------------------------------------------------------------
-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
+src_collect_collect_SOURCES = src/collect/collect.c
+src_collect_collect_LDADD = src/libudev-private.la
+pkglibexec_PROGRAMS += src/collect/collect
 
 # ------------------------------------------------------------------------------
 # scsi_id - SCSI inquiry to get various serial numbers
 # ------------------------------------------------------------------------------
-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
+src_scsi_id_scsi_id_SOURCES =\
+       src/scsi_id/scsi_id.c \
+       src/scsi_id/scsi_serial.c \
+       src/scsi_id/scsi.h \
+       src/scsi_id/scsi_id.h
+src_scsi_id_scsi_id_LDADD = src/libudev-private.la
+pkglibexec_PROGRAMS += src/scsi_id/scsi_id
+dist_man_MANS += src/scsi_id/scsi_id.8
+EXTRA_DIST += src/scsi_id/README
 
 # ------------------------------------------------------------------------------
 # v4l_id - video4linux capabilities
 # ------------------------------------------------------------------------------
-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
+src_v4l_id_v4l_id_SOURCES = src/v4l_id/v4l_id.c
+src_v4l_id_v4l_id_LDADD = src/libudev-private.la
+pkglibexec_PROGRAMS += src/v4l_id/v4l_id
+dist_udevrules_DATA += src/v4l_id/60-persistent-v4l.rules
 
 # ------------------------------------------------------------------------------
 # accelerometer - updates device orientation
 # ------------------------------------------------------------------------------
-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
+src_accelerometer_accelerometer_SOURCES = src/accelerometer/accelerometer.c
+src_accelerometer_accelerometer_LDADD = src/libudev-private.la -lm
+pkglibexec_PROGRAMS += src/accelerometer/accelerometer
+dist_udevrules_DATA += src/accelerometer/61-accelerometer.rules
 
 # ------------------------------------------------------------------------------
 # qemu -- qemu/kvm guest tweaks
 # ------------------------------------------------------------------------------
-dist_udevrules_DATA += src/extras/qemu/42-qemu-usb.rules
+dist_udevrules_DATA += src/qemu/42-qemu-usb.rules
 
 if ENABLE_GUDEV
 # ------------------------------------------------------------------------------
@@ -389,91 +389,91 @@ LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=1
 LIBGUDEV_AGE=1
 
-SUBDIRS += src/extras/gudev/docs
-
-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 += src/extras/gudev/libgudev-1.0.la
-
-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
-
-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_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)
-
-src_extras_gudev_libgudev_1_0_la_CPPFLAGS = \
+SUBDIRS += src/gudev/docs
+
+src_gudev_libgudev_includedir=$(includedir)/gudev-1.0/gudev
+src_gudev_libgudev_include_HEADERS = \
+       src/gudev/gudev.h \
+       src/gudev/gudevenums.h \
+       src/gudev/gudevenumtypes.h \
+       src/gudev/gudevtypes.h \
+       src/gudev/gudevclient.h \
+       src/gudev/gudevdevice.h \
+       src/gudev/gudevenumerator.h
+
+lib_LTLIBRARIES += src/gudev/libgudev-1.0.la
+
+pkgconfig_DATA += src/gudev/gudev-1.0.pc
+EXTRA_DIST += src/gudev/gudev-1.0.pc.in
+CLEANFILES += src/gudev/gudev-1.0.pc
+
+src_gudev_libgudev_1_0_la_SOURCES = \
+       src/gudev/gudevenums.h \
+       src/gudev/gudevenumtypes.h \
+       src/gudev/gudevenumtypes.h\
+       src/gudev/gudevtypes.h \
+       src/gudev/gudevclient.h \
+       src/gudev/gudevclient.c \
+       src/gudev/gudevdevice.h \
+       src/gudev/gudevdevice.c \
+       src/gudev/gudevenumerator.h \
+       src/gudev/gudevenumerator.c \
+       src/gudev/gudevprivate.h
+
+nodist_src_gudev_libgudev_1_0_la_SOURCES = \
+       src/gudev/gudevmarshal.h \
+       src/gudev/gudevmarshal.c \
+       src/gudev/gudevenumtypes.h \
+       src/gudev/gudevenumtypes.c
+BUILT_SOURCES += $(nodist_src_gudev_libgudev_1_0_la_SOURCES)
+
+src_gudev_libgudev_1_0_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
-       -I$(top_builddir)/src/extras \
-       -I$(top_srcdir)/src/extras \
-       -I$(top_builddir)/src/extras/gudev \
-       -I$(top_srcdir)/src/extras/gudev \
+       -I$(top_builddir)/src\
+       -I$(top_srcdir)/src\
+       -I$(top_builddir)/src/gudev \
+       -I$(top_srcdir)/src/gudev \
        -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
        -D_GUDEV_COMPILATION \
        -DG_LOG_DOMAIN=\"GUdev\"
 
-src_extras_gudev_libgudev_1_0_la_CFLAGS = \
+src_gudev_libgudev_1_0_la_CFLAGS = \
        -fvisibility=default \
        $(GLIB_CFLAGS)
 
-src_extras_gudev_libgudev_1_0_la_LIBADD = src/libudev.la $(GLIB_LIBS)
+src_gudev_libgudev_1_0_la_LIBADD = src/libudev.la $(GLIB_LIBS)
 
-src_extras_gudev_libgudev_1_0_la_LDFLAGS = \
+src_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 += \
-       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
-
-src/extras/gudev/gudevmarshal.h: src/extras/gudev/gudevmarshal.list
+       src/gudev/COPYING \
+       src/gudev/gudevmarshal.list \
+       src/gudev/gudevenumtypes.h.template \
+       src/gudev/gudevenumtypes.c.template \
+       src/gudev/gjs-example.js \
+       src/gudev/seed-example-enum.js \
+       src/gudev/seed-example.js
+
+src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list
        $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
 
-src/extras/gudev/gudevmarshal.c: src/extras/gudev/gudevmarshal.list
+src/gudev/gudevmarshal.c: src/gudev/gudevmarshal.list
        $(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \
        glib-genmarshal $< --prefix=g_udev_marshal --body >> $@
 
-src/extras/gudev/gudevenumtypes.h: src/extras/gudev/gudevenumtypes.h.template src/extras/gudev/gudevenums.h
+src/gudev/gudevenumtypes.h: src/gudev/gudevenumtypes.h.template src/gudev/gudevenums.h
        $(AM_V_GEN)glib-mkenums --template $^ > \
            $@.tmp && mv $@.tmp $@
 
-src/extras/gudev/gudevenumtypes.c: src/extras/gudev/gudevenumtypes.c.template src/extras/gudev/gudevenums.h
+src/gudev/gudevenumtypes.c: src/gudev/gudevenumtypes.c.template src/gudev/gudevenums.h
        $(AM_V_GEN)glib-mkenums --template $^ > \
            $@.tmp && mv $@.tmp $@
 
 if ENABLE_INTROSPECTION
-src/extras/gudev/GUdev-1.0.gir: src/extras/gudev/libgudev-1.0.la $(G_IR_SCANNER)
+src/gudev/GUdev-1.0.gir: src/gudev/libgudev-1.0.la $(G_IR_SCANNER)
        $(AM_V_GEN)$(G_IR_SCANNER) -v \
                --warn-all \
                --namespace GUdev \
@@ -481,35 +481,35 @@ src/extras/gudev/GUdev-1.0.gir: src/extras/gudev/libgudev-1.0.la $(G_IR_SCANNER)
                --include=GObject-2.0 \
                --library=gudev-1.0 \
                --library-path=$(top_builddir)/src \
-               --library-path=$(top_builddir)/src/extras/gudev \
+               --library-path=$(top_builddir)/src/gudev \
                --output $@ \
                --pkg=glib-2.0 \
                --pkg=gobject-2.0 \
                --pkg-export=gudev-1.0 \
                --c-include=gudev/gudev.h \
-               -I$(top_srcdir)/src/extras \
-               -I$(top_builddir)/src/extras \
+               -I$(top_srcdir)/src/\
+               -I$(top_builddir)/src/\
                -D_GUDEV_COMPILATION \
                -D_GUDEV_WORK_AROUND_DEV_T_BUG \
-               $(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
-
-src/extras/gudev/GUdev-1.0.typelib: src/extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
+               $(top_srcdir)/src/gudev/gudev.h \
+               $(top_srcdir)/src/gudev/gudevtypes.h \
+               $(top_srcdir)/src/gudev/gudevenums.h \
+               $(or $(wildcard $(top_builddir)/src/gudev/gudevenumtypes.h),$(top_srcdir)/src/gudev/gudevenumtypes.h) \
+               $(top_srcdir)/src/gudev/gudevclient.h \
+               $(top_srcdir)/src/gudev/gudevdevice.h \
+               $(top_srcdir)/src/gudev/gudevenumerator.h \
+               $(top_srcdir)/src/gudev/gudevclient.c \
+               $(top_srcdir)/src/gudev/gudevdevice.c \
+               $(top_srcdir)/src/gudev/gudevenumerator.c
+
+src/gudev/GUdev-1.0.typelib: src/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
        $(AM_V_GEN)g-ir-compiler $< -o $@
 
 girdir = $(GIRDIR)
-gir_DATA = src/extras/gudev/GUdev-1.0.gir
+gir_DATA = src/gudev/GUdev-1.0.gir
 
 typelibsdir = $(GIRTYPELIBDIR)
-typelibs_DATA = src/extras/gudev/GUdev-1.0.typelib
+typelibs_DATA = src/gudev/GUdev-1.0.typelib
 
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # ENABLE_INTROSPECTION
@@ -535,114 +535,114 @@ if ENABLE_KEYMAP
 # ------------------------------------------------------------------------------
 # keymap - map custom hardware's multimedia keys
 # ------------------------------------------------------------------------------
-src_extras_keymap_keymap_SOURCES = src/extras/keymap/keymap.c
-src_extras_keymap_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I src/extras/keymap
-nodist_src_extras_keymap_keymap_SOURCES = \
-       src/extras/keymap/keys-from-name.h \
-       src/extras/keymap/keys-to-name.h
-BUILT_SOURCES += $(nodist_src_extras_keymap_keymap_SOURCES)
+src_keymap_keymap_SOURCES = src/keymap/keymap.c
+src_keymap_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I src/keymap
+nodist_src_keymap_keymap_SOURCES = \
+       src/keymap/keys-from-name.h \
+       src/keymap/keys-to-name.h
+BUILT_SOURCES += $(nodist_src_keymap_keymap_SOURCES)
 
-pkglibexec_PROGRAMS += src/extras/keymap/keymap
-dist_doc_DATA = src/extras/keymap/README.keymap.txt
+pkglibexec_PROGRAMS += src/keymap/keymap
+dist_doc_DATA = src/keymap/README.keymap.txt
 
 dist_udevrules_DATA += \
-       src/extras/keymap/95-keymap.rules \
-       src/extras/keymap/95-keyboard-force-release.rules
+       src/keymap/95-keymap.rules \
+       src/keymap/95-keyboard-force-release.rules
 
-dist_udevhome_SCRIPTS += src/extras/keymap/findkeyboards
-udevhome_SCRIPTS += src/extras/keymap/keyboard-force-release.sh
+dist_udevhome_SCRIPTS += src/keymap/findkeyboards
+udevhome_SCRIPTS += src/keymap/keyboard-force-release.sh
 
 EXTRA_DIST += \
-       src/extras/keymap/check-keymaps.sh \
-       src/extras/keymap/keyboard-force-release.sh.in
+       src/keymap/check-keymaps.sh \
+       src/keymap/keyboard-force-release.sh.in
 
 CLEANFILES += \
-       src/extras/keymap/keys.txt \
-       src/extras/keymap/keys-from-name.gperf \
-       src/extras/keymap/keyboard-force-release.sh
+       src/keymap/keys.txt \
+       src/keymap/keys-from-name.gperf \
+       src/keymap/keyboard-force-release.sh
 
 udevkeymapdir = $(libexecdir)/udev/keymaps
 dist_udevkeymap_DATA = \
-       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_li_2732 \
-       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
+       src/keymap/keymaps/acer \
+       src/keymap/keymaps/acer-aspire_5720 \
+       src/keymap/keymaps/acer-aspire_8930 \
+       src/keymap/keymaps/acer-aspire_5920g \
+       src/keymap/keymaps/acer-aspire_6920 \
+       src/keymap/keymaps/acer-travelmate_c300 \
+       src/keymap/keymaps/asus \
+       src/keymap/keymaps/compaq-e_evo \
+       src/keymap/keymaps/dell \
+       src/keymap/keymaps/dell-latitude-xt2 \
+       src/keymap/keymaps/everex-xt5000 \
+       src/keymap/keymaps/fujitsu-amilo_li_2732 \
+       src/keymap/keymaps/fujitsu-amilo_pa_2548 \
+       src/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
+       src/keymap/keymaps/fujitsu-amilo_pro_v3205 \
+       src/keymap/keymaps/fujitsu-amilo_si_1520 \
+       src/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
+       src/keymap/keymaps/fujitsu-esprimo_mobile_v6 \
+       src/keymap/keymaps/genius-slimstar-320 \
+       src/keymap/keymaps/hewlett-packard \
+       src/keymap/keymaps/hewlett-packard-2510p_2530p \
+       src/keymap/keymaps/hewlett-packard-compaq_elitebook \
+       src/keymap/keymaps/hewlett-packard-pavilion \
+       src/keymap/keymaps/hewlett-packard-presario-2100 \
+       src/keymap/keymaps/hewlett-packard-tablet \
+       src/keymap/keymaps/hewlett-packard-tx2 \
+       src/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
+       src/keymap/keymaps/inventec-symphony_6.0_7.0 \
+       src/keymap/keymaps/lenovo-3000 \
+       src/keymap/keymaps/lenovo-ideapad \
+       src/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
+       src/keymap/keymaps/lenovo-thinkpad_x6_tablet \
+       src/keymap/keymaps/lenovo-thinkpad_x200_tablet \
+       src/keymap/keymaps/lg-x110 \
+       src/keymap/keymaps/logitech-wave \
+       src/keymap/keymaps/logitech-wave-cordless \
+       src/keymap/keymaps/logitech-wave-pro-cordless \
+       src/keymap/keymaps/maxdata-pro_7000 \
+       src/keymap/keymaps/medion-fid2060 \
+       src/keymap/keymaps/medionnb-a555 \
+       src/keymap/keymaps/micro-star \
+       src/keymap/keymaps/module-asus-w3j \
+       src/keymap/keymaps/module-ibm \
+       src/keymap/keymaps/module-lenovo \
+       src/keymap/keymaps/module-sony \
+       src/keymap/keymaps/module-sony-old \
+       src/keymap/keymaps/module-sony-vgn \
+       src/keymap/keymaps/olpc-xo \
+       src/keymap/keymaps/onkyo \
+       src/keymap/keymaps/oqo-model2 \
+       src/keymap/keymaps/samsung-other \
+       src/keymap/keymaps/samsung-sq1us \
+       src/keymap/keymaps/samsung-sx20s \
+       src/keymap/keymaps/toshiba-satellite_a100 \
+       src/keymap/keymaps/toshiba-satellite_a110 \
+       src/keymap/keymaps/toshiba-satellite_m30x \
+       src/keymap/keymaps/zepto-znote
 
 udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
-       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
+       src/keymap/force-release-maps/dell-touchpad \
+       src/keymap/force-release-maps/hp-other \
+       src/keymap/force-release-maps/samsung-other \
+       src/keymap/force-release-maps/common-volume-keys
 
-src/extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
-       $(AM_V_at)mkdir -p src/extras/keymap
+src/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
+       $(AM_V_at)mkdir -p src/keymap
        $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
-src/extras/keymap/keys-from-name.gperf: src/extras/keymap/keys.txt
+src/keymap/keys-from-name.gperf: src/keymap/keys.txt
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
 
-src/extras/keymap/keys-from-name.h: src/extras/keymap/keys-from-name.gperf Makefile
+src/keymap/keys-from-name.h: src/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 < $< > $@
 
-src/extras/keymap/keys-to-name.h: src/extras/keymap/keys.txt Makefile
+src/keymap/keys-to-name.h: src/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: src/extras/keymap/keys.txt
-       $(top_srcdir)/src/extras/keymap/check-keymaps.sh $(top_srcdir) $^
+keymaps-distcheck-hook: src/keymap/keys.txt
+       $(top_srcdir)/src/keymap/check-keymaps.sh $(top_srcdir) $^
 DISTCHECK_HOOKS += keymaps-distcheck-hook
 endif
 
@@ -650,13 +650,13 @@ if ENABLE_MTD_PROBE
 # ------------------------------------------------------------------------------
 # mtd_probe - autoloads FTL module for mtd devices
 # ------------------------------------------------------------------------------
-src_extras_mtd_probe_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_extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
-dist_udevrules_DATA += src/extras/mtd_probe/75-probe_mtd.rules
-pkglibexec_PROGRAMS += src/extras/mtd_probe/mtd_probe
+src_mtd_probe_mtd_probe_SOURCES =  \
+       src/mtd_probe/mtd_probe.c \
+       src/mtd_probe/mtd_probe.h \
+       src/mtd_probe/probe_smartmedia.c
+src_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
+dist_udevrules_DATA += src/mtd_probe/75-probe_mtd.rules
+pkglibexec_PROGRAMS += src/mtd_probe/mtd_probe
 endif
 
 if ENABLE_RULE_GENERATOR
@@ -664,35 +664,35 @@ if ENABLE_RULE_GENERATOR
 # rule_generator - persistent network and optical device rule generator
 # ------------------------------------------------------------------------------
 dist_udevhome_SCRIPTS += \
-       src/extras/rule_generator/write_cd_rules \
-       src/extras/rule_generator/write_net_rules
+       src/rule_generator/write_cd_rules \
+       src/rule_generator/write_net_rules
 
 dist_udevhome_DATA += \
-       src/extras/rule_generator/rule_generator.functions
+       src/rule_generator/rule_generator.functions
 
 dist_udevrules_DATA += \
-       src/extras/rule_generator/75-cd-aliases-generator.rules \
-       src/extras/rule_generator/75-persistent-net-generator.rules
+       src/rule_generator/75-cd-aliases-generator.rules \
+       src/rule_generator/75-persistent-net-generator.rules
 endif
 
 if ENABLE_FLOPPY
 # ------------------------------------------------------------------------------
 # create_floppy_devices - historical floppy kernel device nodes (/dev/fd0h1440, ...)
 # ------------------------------------------------------------------------------
-src_create_floppy_devices_SOURCES = src/extras/floppy/create_floppy_devices.c
+src_create_floppy_devices_SOURCES = src/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
+dist_udevrules_DATA += src/floppy/60-floppy.rules
 endif
 
 if ENABLE_EDD
 # ------------------------------------------------------------------------------
 # edd_id - create /dev/disk/by-id/edd-* links for BIOS EDD data
 # ------------------------------------------------------------------------------
-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
+src__edd_id_edd_id_SOURCES = src/edd_id/edd_id.c
+src_edd_id_edd_id_LDADD = src/libudev-private.la
+pkglibexec_PROGRAMS += src/edd_id/edd_id
+dist_udevrules_DATA += src/edd_id/61-persistent-storage-edd.rules
 endif
 
 # ------------------------------------------------------------------------------
@@ -763,5 +763,5 @@ doc-sync:
        for i in src/*.html; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/udev/; done
        for i in src/docs/html/*.{html,css,png}; do rm -f $$i.sign; gpg --armor --detach-sign --output=$$i.sign $$i; done
        for i in src/docs/html/*.{html,css,png}; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/libudev/; done
-       for i in src/extras/gudev/docs/html/*.{html,css,png}; do rm -f $$i.sign; gpg --armor --detach-sign --output=$$i.sign $$i; done
-       for i in src/extras/gudev/docs/html/*.{html,css,png}; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/gudev/; done
+       for i in src/gudev/docs/html/*.{html,css,png}; do rm -f $$i.sign; gpg --armor --detach-sign --output=$$i.sign $$i; done
+       for i in src/gudev/docs/html/*.{html,css,png}; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/gudev/; done

diff --git a/configure.ac b/configure.ac
index 2e750babe895650e459f4fdf3e7907baeb0c92c1..8f6e004392e067150040bdcbbc40f3850c5ea2d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -205,8 +205,8 @@ AC_CONFIG_FILES([
        Makefile
        src/docs/Makefile
        src/docs/version.xml
-       src/extras/gudev/docs/Makefile
-       src/extras/gudev/docs/version.xml
+       src/gudev/docs/Makefile
+       src/gudev/docs/version.xml
 ])
 
 AC_OUTPUT

diff --git a/rules/misc/30-kernel-compat.rules b/rules/misc/30-kernel-compat.rules
index cddf371d3b3c6cacd9faba2c334c8e7c6e647ca0..2596095506800e037af7223adc52f64851e0b160 100644 (file)
--- a/rules/misc/30-kernel-compat.rules
+++ b/rules/misc/30-kernel-compat.rules
@@ -7,7 +7,7 @@
 
 ACTION!="add", GOTO="kernel_compat_end"
 
-# see src/extras/qemu/42-qemu-usb.rules, version for 2.6.32 + older.
+# see src/qemu/42-qemu-usb.rules, version for 2.6.32 + older.
 ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Mouse", ATTR{serial}=="42", TEST=="power/level", ATTR{power/level}="auto"
 ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Tablet", ATTR{serial}=="42", TEST=="power/level", ATTR{power/level}="auto"
 ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Keyboard", ATTR{serial}=="42", TEST=="power/level", ATTR{power/level}="auto"

diff --git a/src/extras/accelerometer/.gitignore b/src/accelerometer/.gitignore
similarity index 100%
rename from src/extras/accelerometer/.gitignore
rename to src/accelerometer/.gitignore

diff --git a/src/extras/accelerometer/61-accelerometer.rules b/src/accelerometer/61-accelerometer.rules
similarity index 100%
rename from src/extras/accelerometer/61-accelerometer.rules
rename to src/accelerometer/61-accelerometer.rules

diff --git a/src/extras/accelerometer/accelerometer.c b/src/accelerometer/accelerometer.c
similarity index 100%
rename from src/extras/accelerometer/accelerometer.c
rename to src/accelerometer/accelerometer.c

diff --git a/src/extras/ata_id/.gitignore b/src/ata_id/.gitignore
similarity index 100%
rename from src/extras/ata_id/.gitignore
rename to src/ata_id/.gitignore

diff --git a/src/extras/ata_id/ata_id.c b/src/ata_id/ata_id.c
similarity index 100%
rename from src/extras/ata_id/ata_id.c
rename to src/ata_id/ata_id.c

diff --git a/src/extras/cdrom_id/.gitignore b/src/cdrom_id/.gitignore
similarity index 100%
rename from src/extras/cdrom_id/.gitignore
rename to src/cdrom_id/.gitignore

diff --git a/src/extras/cdrom_id/60-cdrom_id.rules b/src/cdrom_id/60-cdrom_id.rules
similarity index 100%
rename from src/extras/cdrom_id/60-cdrom_id.rules
rename to src/cdrom_id/60-cdrom_id.rules

diff --git a/src/extras/cdrom_id/cdrom_id.c b/src/cdrom_id/cdrom_id.c
similarity index 100%
rename from src/extras/cdrom_id/cdrom_id.c
rename to src/cdrom_id/cdrom_id.c

diff --git a/src/extras/collect/.gitignore b/src/collect/.gitignore
similarity index 100%
rename from src/extras/collect/.gitignore
rename to src/collect/.gitignore

diff --git a/src/extras/collect/collect.c b/src/collect/collect.c
similarity index 100%
rename from src/extras/collect/collect.c
rename to src/collect/collect.c

diff --git a/src/extras/edd_id/.gitignore b/src/edd_id/.gitignore
similarity index 100%
rename from src/extras/edd_id/.gitignore
rename to src/edd_id/.gitignore

diff --git a/src/extras/edd_id/61-persistent-storage-edd.rules b/src/edd_id/61-persistent-storage-edd.rules
similarity index 100%
rename from src/extras/edd_id/61-persistent-storage-edd.rules
rename to src/edd_id/61-persistent-storage-edd.rules

diff --git a/src/extras/edd_id/edd_id.c b/src/edd_id/edd_id.c
similarity index 100%
rename from src/extras/edd_id/edd_id.c
rename to src/edd_id/edd_id.c

diff --git a/src/extras/floppy/.gitignore b/src/floppy/.gitignore
similarity index 100%
rename from src/extras/floppy/.gitignore
rename to src/floppy/.gitignore

diff --git a/src/extras/floppy/60-floppy.rules b/src/floppy/60-floppy.rules
similarity index 100%
rename from src/extras/floppy/60-floppy.rules
rename to src/floppy/60-floppy.rules

diff --git a/src/extras/floppy/create_floppy_devices.c b/src/floppy/create_floppy_devices.c
similarity index 100%
rename from src/extras/floppy/create_floppy_devices.c
rename to src/floppy/create_floppy_devices.c

diff --git a/src/extras/gudev/.gitignore b/src/gudev/.gitignore
similarity index 100%
rename from src/extras/gudev/.gitignore
rename to src/gudev/.gitignore

diff --git a/src/extras/gudev/COPYING b/src/gudev/COPYING
similarity index 100%
rename from src/extras/gudev/COPYING
rename to src/gudev/COPYING

diff --git a/src/extras/gudev/docs/.gitignore b/src/gudev/docs/.gitignore
similarity index 100%
rename from src/extras/gudev/docs/.gitignore
rename to src/gudev/docs/.gitignore

diff --git a/src/extras/gudev/docs/Makefile.am b/src/gudev/docs/Makefile.am
similarity index 93%
rename from src/extras/gudev/docs/Makefile.am
rename to src/gudev/docs/Makefile.am
index 35121976606679585496f8a6f34a0ea015f7a56f..2f0a8cb3ebf072144d0a381becdc4c6cef9b5c8a 100644 (file)
--- a/src/extras/gudev/docs/Makefile.am
+++ b/src/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)/src/extras/gudev/*.h
-CFILE_GLOB=$(top_srcdir)/src/extras/gudev/*.c
+HFILE_GLOB=$(top_srcdir)/src/gudev/*.h
+CFILE_GLOB=$(top_srcdir)/src/gudev/*.c
 
 # Extra header to include when scanning, which are not under DOC_SOURCE_DIR
 # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
@@ -80,12 +80,12 @@ expand_content_files=
 GTKDOC_CFLAGS = \
         $(DBUS_GLIB_CFLAGS) \
         $(GLIB_CFLAGS) \
-        -I$(top_srcdir)/src/extras/gudev \
-        -I$(top_builddir)/src/extras/gudev
+        -I$(top_srcdir)/src/gudev \
+        -I$(top_builddir)/src/gudev
 
 GTKDOC_LIBS = \
         $(GLIB_LIBS) \
-        $(top_builddir)/src/extras/gudev/libgudev-1.0.la
+        $(top_builddir)/src/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/src/extras/gudev/docs/gudev-docs.xml b/src/gudev/docs/gudev-docs.xml
similarity index 100%
rename from src/extras/gudev/docs/gudev-docs.xml
rename to src/gudev/docs/gudev-docs.xml

diff --git a/src/extras/gudev/docs/gudev-sections.txt b/src/gudev/docs/gudev-sections.txt
similarity index 100%
rename from src/extras/gudev/docs/gudev-sections.txt
rename to src/gudev/docs/gudev-sections.txt

diff --git a/src/extras/gudev/docs/gudev.types b/src/gudev/docs/gudev.types
similarity index 100%
rename from src/extras/gudev/docs/gudev.types
rename to src/gudev/docs/gudev.types

diff --git a/src/extras/gudev/docs/version.xml.in b/src/gudev/docs/version.xml.in
similarity index 100%
rename from src/extras/gudev/docs/version.xml.in
rename to src/gudev/docs/version.xml.in

diff --git a/src/extras/gudev/gjs-example.js b/src/gudev/gjs-example.js
similarity index 100%
rename from src/extras/gudev/gjs-example.js
rename to src/gudev/gjs-example.js

diff --git a/src/extras/gudev/gudev-1.0.pc.in b/src/gudev/gudev-1.0.pc.in
similarity index 100%
rename from src/extras/gudev/gudev-1.0.pc.in
rename to src/gudev/gudev-1.0.pc.in

diff --git a/src/extras/gudev/gudev.h b/src/gudev/gudev.h
similarity index 100%
rename from src/extras/gudev/gudev.h
rename to src/gudev/gudev.h

diff --git a/src/extras/gudev/gudevclient.c b/src/gudev/gudevclient.c
similarity index 100%
rename from src/extras/gudev/gudevclient.c
rename to src/gudev/gudevclient.c

diff --git a/src/extras/gudev/gudevclient.h b/src/gudev/gudevclient.h
similarity index 100%
rename from src/extras/gudev/gudevclient.h
rename to src/gudev/gudevclient.h

diff --git a/src/extras/gudev/gudevdevice.c b/src/gudev/gudevdevice.c
similarity index 100%
rename from src/extras/gudev/gudevdevice.c
rename to src/gudev/gudevdevice.c

diff --git a/src/extras/gudev/gudevdevice.h b/src/gudev/gudevdevice.h
similarity index 100%
rename from src/extras/gudev/gudevdevice.h
rename to src/gudev/gudevdevice.h

diff --git a/src/extras/gudev/gudevenumerator.c b/src/gudev/gudevenumerator.c
similarity index 100%
rename from src/extras/gudev/gudevenumerator.c
rename to src/gudev/gudevenumerator.c

diff --git a/src/extras/gudev/gudevenumerator.h b/src/gudev/gudevenumerator.h
similarity index 100%
rename from src/extras/gudev/gudevenumerator.h
rename to src/gudev/gudevenumerator.h

diff --git a/src/extras/gudev/gudevenums.h b/src/gudev/gudevenums.h
similarity index 100%
rename from src/extras/gudev/gudevenums.h
rename to src/gudev/gudevenums.h

diff --git a/src/extras/gudev/gudevenumtypes.c.template b/src/gudev/gudevenumtypes.c.template
similarity index 100%
rename from src/extras/gudev/gudevenumtypes.c.template
rename to src/gudev/gudevenumtypes.c.template

diff --git a/src/extras/gudev/gudevenumtypes.h.template b/src/gudev/gudevenumtypes.h.template
similarity index 100%
rename from src/extras/gudev/gudevenumtypes.h.template
rename to src/gudev/gudevenumtypes.h.template

diff --git a/src/extras/gudev/gudevmarshal.list b/src/gudev/gudevmarshal.list
similarity index 100%
rename from src/extras/gudev/gudevmarshal.list
rename to src/gudev/gudevmarshal.list

diff --git a/src/extras/gudev/gudevprivate.h b/src/gudev/gudevprivate.h
similarity index 100%
rename from src/extras/gudev/gudevprivate.h
rename to src/gudev/gudevprivate.h

diff --git a/src/extras/gudev/gudevtypes.h b/src/gudev/gudevtypes.h
similarity index 100%
rename from src/extras/gudev/gudevtypes.h
rename to src/gudev/gudevtypes.h

diff --git a/src/extras/gudev/seed-example-enum.js b/src/gudev/seed-example-enum.js
similarity index 100%
rename from src/extras/gudev/seed-example-enum.js
rename to src/gudev/seed-example-enum.js

diff --git a/src/extras/gudev/seed-example.js b/src/gudev/seed-example.js
similarity index 100%
rename from src/extras/gudev/seed-example.js
rename to src/gudev/seed-example.js

diff --git a/src/extras/keymap/.gitignore b/src/keymap/.gitignore
similarity index 100%
rename from src/extras/keymap/.gitignore
rename to src/keymap/.gitignore

diff --git a/src/extras/keymap/95-keyboard-force-release.rules b/src/keymap/95-keyboard-force-release.rules
similarity index 100%
rename from src/extras/keymap/95-keyboard-force-release.rules
rename to src/keymap/95-keyboard-force-release.rules

diff --git a/src/extras/keymap/95-keymap.rules b/src/keymap/95-keymap.rules
similarity index 100%
rename from src/extras/keymap/95-keymap.rules
rename to src/keymap/95-keymap.rules

diff --git a/src/extras/keymap/README.keymap.txt b/src/keymap/README.keymap.txt
similarity index 100%
rename from src/extras/keymap/README.keymap.txt
rename to src/keymap/README.keymap.txt

diff --git a/src/extras/keymap/check-keymaps.sh b/src/keymap/check-keymaps.sh
similarity index 77%
rename from src/extras/keymap/check-keymaps.sh
rename to src/keymap/check-keymaps.sh
index 423699b5a8e7a073f04cb13504bbec2aeffbc8b0..405168c6675d5fdae7ad775268be1fa7bdbc8afe 100755 (executable)
--- a/src/extras/keymap/check-keymaps.sh
+++ b/src/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:-src/extras/keymap/keys.txt}
-KEYMAPS_DIR=$SRCDIR/src/extras/keymap/keymaps
-RULES=$SRCDIR/src/extras/keymap/95-keymap.rules
+KEYLIST=${2:-src/keymap/keys.txt}
+KEYMAPS_DIR=$SRCDIR/src/keymap/keymaps
+RULES=$SRCDIR/src/keymap/95-keymap.rules
 
 [ -e "$KEYLIST" ] || {
         echo "need $KEYLIST please build first" >&2
@@ -16,7 +16,7 @@ RULES=$SRCDIR/src/extras/keymap/95-keymap.rules
 missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) \
                     <(grep -hv '^#' ${KEYMAPS_DIR}/*| awk '{print $2}' | sort -u))
 [ -z "$missing" ] || {
-        echo "ERROR: unknown key names in src/extras/keymap/keymaps/*:" >&2
+        echo "ERROR: unknown key names in src/keymap/keymaps/*:" >&2
         echo "$missing" >&2
         exit 1
 }
@@ -31,7 +31,7 @@ for m in $maps; do
                 echo "ERROR: unknown map name in $RULES: $m" >&2
                 exit 1
         }
-        grep -q "src/extras/keymap/keymaps/$m\>" $SRCDIR/Makefile.am || {
+        grep -q "src/keymap/keymaps/$m\>" $SRCDIR/Makefile.am || {
                 echo "ERROR: map file $m is not added to Makefile.am" >&2
                 exit 1
         }

diff --git a/src/extras/keymap/findkeyboards b/src/keymap/findkeyboards
similarity index 100%
rename from src/extras/keymap/findkeyboards
rename to src/keymap/findkeyboards

diff --git a/src/extras/keymap/force-release-maps/common-volume-keys b/src/keymap/force-release-maps/common-volume-keys
similarity index 100%
rename from src/extras/keymap/force-release-maps/common-volume-keys
rename to src/keymap/force-release-maps/common-volume-keys

diff --git a/src/extras/keymap/force-release-maps/dell-touchpad b/src/keymap/force-release-maps/dell-touchpad
similarity index 100%
rename from src/extras/keymap/force-release-maps/dell-touchpad
rename to src/keymap/force-release-maps/dell-touchpad

diff --git a/src/extras/keymap/force-release-maps/hp-other b/src/keymap/force-release-maps/hp-other
similarity index 100%
rename from src/extras/keymap/force-release-maps/hp-other
rename to src/keymap/force-release-maps/hp-other

diff --git a/src/extras/keymap/force-release-maps/samsung-other b/src/keymap/force-release-maps/samsung-other
similarity index 100%
rename from src/extras/keymap/force-release-maps/samsung-other
rename to src/keymap/force-release-maps/samsung-other

diff --git a/src/extras/keymap/keyboard-force-release.sh.in b/src/keymap/keyboard-force-release.sh.in
similarity index 100%
rename from src/extras/keymap/keyboard-force-release.sh.in
rename to src/keymap/keyboard-force-release.sh.in

diff --git a/src/extras/keymap/keymap.c b/src/keymap/keymap.c
similarity index 100%
rename from src/extras/keymap/keymap.c
rename to src/keymap/keymap.c

diff --git a/src/extras/keymap/keymaps/acer b/src/keymap/keymaps/acer
similarity index 100%
rename from src/extras/keymap/keymaps/acer
rename to src/keymap/keymaps/acer

diff --git a/src/extras/keymap/keymaps/acer-aspire_5720 b/src/keymap/keymaps/acer-aspire_5720
similarity index 100%
rename from src/extras/keymap/keymaps/acer-aspire_5720
rename to src/keymap/keymaps/acer-aspire_5720

diff --git a/src/extras/keymap/keymaps/acer-aspire_5920g b/src/keymap/keymaps/acer-aspire_5920g
similarity index 100%
rename from src/extras/keymap/keymaps/acer-aspire_5920g
rename to src/keymap/keymaps/acer-aspire_5920g

diff --git a/src/extras/keymap/keymaps/acer-aspire_6920 b/src/keymap/keymaps/acer-aspire_6920
similarity index 100%
rename from src/extras/keymap/keymaps/acer-aspire_6920
rename to src/keymap/keymaps/acer-aspire_6920

diff --git a/src/extras/keymap/keymaps/acer-aspire_8930 b/src/keymap/keymaps/acer-aspire_8930
similarity index 100%
rename from src/extras/keymap/keymaps/acer-aspire_8930
rename to src/keymap/keymaps/acer-aspire_8930

diff --git a/src/extras/keymap/keymaps/acer-travelmate_c300 b/src/keymap/keymaps/acer-travelmate_c300
similarity index 100%
rename from src/extras/keymap/keymaps/acer-travelmate_c300
rename to src/keymap/keymaps/acer-travelmate_c300

diff --git a/src/extras/keymap/keymaps/asus b/src/keymap/keymaps/asus
similarity index 100%
rename from src/extras/keymap/keymaps/asus
rename to src/keymap/keymaps/asus

diff --git a/src/extras/keymap/keymaps/compaq-e_evo b/src/keymap/keymaps/compaq-e_evo
similarity index 100%
rename from src/extras/keymap/keymaps/compaq-e_evo
rename to src/keymap/keymaps/compaq-e_evo

diff --git a/src/extras/keymap/keymaps/dell b/src/keymap/keymaps/dell
similarity index 100%
rename from src/extras/keymap/keymaps/dell
rename to src/keymap/keymaps/dell

diff --git a/src/extras/keymap/keymaps/dell-latitude-xt2 b/src/keymap/keymaps/dell-latitude-xt2
similarity index 100%
rename from src/extras/keymap/keymaps/dell-latitude-xt2
rename to src/keymap/keymaps/dell-latitude-xt2

diff --git a/src/extras/keymap/keymaps/everex-xt5000 b/src/keymap/keymaps/everex-xt5000
similarity index 100%
rename from src/extras/keymap/keymaps/everex-xt5000
rename to src/keymap/keymaps/everex-xt5000

diff --git a/src/extras/keymap/keymaps/fujitsu-amilo_li_2732 b/src/keymap/keymaps/fujitsu-amilo_li_2732
similarity index 100%
rename from src/extras/keymap/keymaps/fujitsu-amilo_li_2732
rename to src/keymap/keymaps/fujitsu-amilo_li_2732

diff --git a/src/extras/keymap/keymaps/fujitsu-amilo_pa_2548 b/src/keymap/keymaps/fujitsu-amilo_pa_2548
similarity index 100%
rename from src/extras/keymap/keymaps/fujitsu-amilo_pa_2548
rename to src/keymap/keymaps/fujitsu-amilo_pa_2548

diff --git a/src/extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 b/src/keymap/keymaps/fujitsu-amilo_pro_edition_v3505
similarity index 100%
rename from src/extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505
rename to src/keymap/keymaps/fujitsu-amilo_pro_edition_v3505

diff --git a/src/extras/keymap/keymaps/fujitsu-amilo_pro_v3205 b/src/keymap/keymaps/fujitsu-amilo_pro_v3205
similarity index 100%
rename from src/extras/keymap/keymaps/fujitsu-amilo_pro_v3205
rename to src/keymap/keymaps/fujitsu-amilo_pro_v3205

diff --git a/src/extras/keymap/keymaps/fujitsu-amilo_si_1520 b/src/keymap/keymaps/fujitsu-amilo_si_1520
similarity index 100%
rename from src/extras/keymap/keymaps/fujitsu-amilo_si_1520
rename to src/keymap/keymaps/fujitsu-amilo_si_1520

diff --git a/src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 b/src/keymap/keymaps/fujitsu-esprimo_mobile_v5
similarity index 100%
rename from src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v5
rename to src/keymap/keymaps/fujitsu-esprimo_mobile_v5

diff --git a/src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 b/src/keymap/keymaps/fujitsu-esprimo_mobile_v6
similarity index 100%
rename from src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v6
rename to src/keymap/keymaps/fujitsu-esprimo_mobile_v6

diff --git a/src/extras/keymap/keymaps/genius-slimstar-320 b/src/keymap/keymaps/genius-slimstar-320
similarity index 100%
rename from src/extras/keymap/keymaps/genius-slimstar-320
rename to src/keymap/keymaps/genius-slimstar-320

diff --git a/src/extras/keymap/keymaps/hewlett-packard b/src/keymap/keymaps/hewlett-packard
similarity index 100%
rename from src/extras/keymap/keymaps/hewlett-packard
rename to src/keymap/keymaps/hewlett-packard

diff --git a/src/extras/keymap/keymaps/hewlett-packard-2510p_2530p b/src/keymap/keymaps/hewlett-packard-2510p_2530p
similarity index 100%
rename from src/extras/keymap/keymaps/hewlett-packard-2510p_2530p
rename to src/keymap/keymaps/hewlett-packard-2510p_2530p

diff --git a/src/extras/keymap/keymaps/hewlett-packard-compaq_elitebook b/src/keymap/keymaps/hewlett-packard-compaq_elitebook
similarity index 100%
rename from src/extras/keymap/keymaps/hewlett-packard-compaq_elitebook
rename to src/keymap/keymaps/hewlett-packard-compaq_elitebook

diff --git a/src/extras/keymap/keymaps/hewlett-packard-pavilion b/src/keymap/keymaps/hewlett-packard-pavilion
similarity index 100%
rename from src/extras/keymap/keymaps/hewlett-packard-pavilion
rename to src/keymap/keymaps/hewlett-packard-pavilion

diff --git a/src/extras/keymap/keymaps/hewlett-packard-presario-2100 b/src/keymap/keymaps/hewlett-packard-presario-2100
similarity index 100%
rename from src/extras/keymap/keymaps/hewlett-packard-presario-2100
rename to src/keymap/keymaps/hewlett-packard-presario-2100

diff --git a/src/extras/keymap/keymaps/hewlett-packard-tablet b/src/keymap/keymaps/hewlett-packard-tablet
similarity index 100%
rename from src/extras/keymap/keymaps/hewlett-packard-tablet
rename to src/keymap/keymaps/hewlett-packard-tablet

diff --git a/src/extras/keymap/keymaps/hewlett-packard-tx2 b/src/keymap/keymaps/hewlett-packard-tx2
similarity index 100%
rename from src/extras/keymap/keymaps/hewlett-packard-tx2
rename to src/keymap/keymaps/hewlett-packard-tx2

diff --git a/src/extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint b/src/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint
similarity index 100%
rename from src/extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint
rename to src/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint

diff --git a/src/extras/keymap/keymaps/inventec-symphony_6.0_7.0 b/src/keymap/keymaps/inventec-symphony_6.0_7.0
similarity index 100%
rename from src/extras/keymap/keymaps/inventec-symphony_6.0_7.0
rename to src/keymap/keymaps/inventec-symphony_6.0_7.0

diff --git a/src/extras/keymap/keymaps/lenovo-3000 b/src/keymap/keymaps/lenovo-3000
similarity index 100%
rename from src/extras/keymap/keymaps/lenovo-3000
rename to src/keymap/keymaps/lenovo-3000

diff --git a/src/extras/keymap/keymaps/lenovo-ideapad b/src/keymap/keymaps/lenovo-ideapad
similarity index 100%
rename from src/extras/keymap/keymaps/lenovo-ideapad
rename to src/keymap/keymaps/lenovo-ideapad

diff --git a/src/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint b/src/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
similarity index 100%
rename from src/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
rename to src/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint

diff --git a/src/extras/keymap/keymaps/lenovo-thinkpad_x200_tablet b/src/keymap/keymaps/lenovo-thinkpad_x200_tablet
similarity index 100%
rename from src/extras/keymap/keymaps/lenovo-thinkpad_x200_tablet
rename to src/keymap/keymaps/lenovo-thinkpad_x200_tablet

diff --git a/src/extras/keymap/keymaps/lenovo-thinkpad_x6_tablet b/src/keymap/keymaps/lenovo-thinkpad_x6_tablet
similarity index 100%
rename from src/extras/keymap/keymaps/lenovo-thinkpad_x6_tablet
rename to src/keymap/keymaps/lenovo-thinkpad_x6_tablet

diff --git a/src/extras/keymap/keymaps/lg-x110 b/src/keymap/keymaps/lg-x110
similarity index 100%
rename from src/extras/keymap/keymaps/lg-x110
rename to src/keymap/keymaps/lg-x110

diff --git a/src/extras/keymap/keymaps/logitech-wave b/src/keymap/keymaps/logitech-wave
similarity index 100%
rename from src/extras/keymap/keymaps/logitech-wave
rename to src/keymap/keymaps/logitech-wave

diff --git a/src/extras/keymap/keymaps/logitech-wave-cordless b/src/keymap/keymaps/logitech-wave-cordless
similarity index 100%
rename from src/extras/keymap/keymaps/logitech-wave-cordless
rename to src/keymap/keymaps/logitech-wave-cordless

diff --git a/src/extras/keymap/keymaps/logitech-wave-pro-cordless b/src/keymap/keymaps/logitech-wave-pro-cordless
similarity index 100%
rename from src/extras/keymap/keymaps/logitech-wave-pro-cordless
rename to src/keymap/keymaps/logitech-wave-pro-cordless

diff --git a/src/extras/keymap/keymaps/maxdata-pro_7000 b/src/keymap/keymaps/maxdata-pro_7000
similarity index 100%
rename from src/extras/keymap/keymaps/maxdata-pro_7000
rename to src/keymap/keymaps/maxdata-pro_7000

diff --git a/src/extras/keymap/keymaps/medion-fid2060 b/src/keymap/keymaps/medion-fid2060
similarity index 100%
rename from src/extras/keymap/keymaps/medion-fid2060
rename to src/keymap/keymaps/medion-fid2060

diff --git a/src/extras/keymap/keymaps/medionnb-a555 b/src/keymap/keymaps/medionnb-a555
similarity index 100%
rename from src/extras/keymap/keymaps/medionnb-a555
rename to src/keymap/keymaps/medionnb-a555

diff --git a/src/extras/keymap/keymaps/micro-star b/src/keymap/keymaps/micro-star
similarity index 100%
rename from src/extras/keymap/keymaps/micro-star
rename to src/keymap/keymaps/micro-star

diff --git a/src/extras/keymap/keymaps/module-asus-w3j b/src/keymap/keymaps/module-asus-w3j
similarity index 100%
rename from src/extras/keymap/keymaps/module-asus-w3j
rename to src/keymap/keymaps/module-asus-w3j

diff --git a/src/extras/keymap/keymaps/module-ibm b/src/keymap/keymaps/module-ibm
similarity index 100%
rename from src/extras/keymap/keymaps/module-ibm
rename to src/keymap/keymaps/module-ibm

diff --git a/src/extras/keymap/keymaps/module-lenovo b/src/keymap/keymaps/module-lenovo
similarity index 100%
rename from src/extras/keymap/keymaps/module-lenovo
rename to src/keymap/keymaps/module-lenovo

diff --git a/src/extras/keymap/keymaps/module-sony b/src/keymap/keymaps/module-sony
similarity index 100%
rename from src/extras/keymap/keymaps/module-sony
rename to src/keymap/keymaps/module-sony

diff --git a/src/extras/keymap/keymaps/module-sony-old b/src/keymap/keymaps/module-sony-old
similarity index 100%
rename from src/extras/keymap/keymaps/module-sony-old
rename to src/keymap/keymaps/module-sony-old

diff --git a/src/extras/keymap/keymaps/module-sony-vgn b/src/keymap/keymaps/module-sony-vgn
similarity index 100%
rename from src/extras/keymap/keymaps/module-sony-vgn
rename to src/keymap/keymaps/module-sony-vgn

diff --git a/src/extras/keymap/keymaps/olpc-xo b/src/keymap/keymaps/olpc-xo
similarity index 100%
rename from src/extras/keymap/keymaps/olpc-xo
rename to src/keymap/keymaps/olpc-xo

diff --git a/src/extras/keymap/keymaps/onkyo b/src/keymap/keymaps/onkyo
similarity index 100%
rename from src/extras/keymap/keymaps/onkyo
rename to src/keymap/keymaps/onkyo

diff --git a/src/extras/keymap/keymaps/oqo-model2 b/src/keymap/keymaps/oqo-model2
similarity index 100%
rename from src/extras/keymap/keymaps/oqo-model2
rename to src/keymap/keymaps/oqo-model2

diff --git a/src/extras/keymap/keymaps/samsung-other b/src/keymap/keymaps/samsung-other
similarity index 100%
rename from src/extras/keymap/keymaps/samsung-other
rename to src/keymap/keymaps/samsung-other

diff --git a/src/extras/keymap/keymaps/samsung-sq1us b/src/keymap/keymaps/samsung-sq1us
similarity index 100%
rename from src/extras/keymap/keymaps/samsung-sq1us
rename to src/keymap/keymaps/samsung-sq1us

diff --git a/src/extras/keymap/keymaps/samsung-sx20s b/src/keymap/keymaps/samsung-sx20s
similarity index 100%
rename from src/extras/keymap/keymaps/samsung-sx20s
rename to src/keymap/keymaps/samsung-sx20s

diff --git a/src/extras/keymap/keymaps/toshiba-satellite_a100 b/src/keymap/keymaps/toshiba-satellite_a100
similarity index 100%
rename from src/extras/keymap/keymaps/toshiba-satellite_a100
rename to src/keymap/keymaps/toshiba-satellite_a100

diff --git a/src/extras/keymap/keymaps/toshiba-satellite_a110 b/src/keymap/keymaps/toshiba-satellite_a110
similarity index 100%
rename from src/extras/keymap/keymaps/toshiba-satellite_a110
rename to src/keymap/keymaps/toshiba-satellite_a110

diff --git a/src/extras/keymap/keymaps/toshiba-satellite_m30x b/src/keymap/keymaps/toshiba-satellite_m30x
similarity index 100%
rename from src/extras/keymap/keymaps/toshiba-satellite_m30x
rename to src/keymap/keymaps/toshiba-satellite_m30x

diff --git a/src/extras/keymap/keymaps/zepto-znote b/src/keymap/keymaps/zepto-znote
similarity index 100%
rename from src/extras/keymap/keymaps/zepto-znote
rename to src/keymap/keymaps/zepto-znote

diff --git a/src/libudev-queue.c b/src/libudev-queue.c
index 7a4b563cfaa783e7092498f8ff7503a946fc2693..0e82cb6ae8855e267bf9c996f95942a329857d5e 100644 (file)
--- a/src/libudev-queue.c
+++ b/src/libudev-queue.c
@@ -322,7 +322,7 @@ UDEV_EXPORT int udev_queue_get_queue_is_empty(struct udev_queue *udev_queue)
         seqnum_kernel = udev_queue_get_kernel_seqnum(udev_queue);
         if (seqnum_udev < seqnum_kernel) {
                 dbg(udev_queue->udev, "queue is empty but kernel events still pending [%llu]<->[%llu]\n",
-                                        seqnum_kernel, seqnum_udev);
+                                      seqnum_kernel, seqnum_udev);
                 goto out;
         }
 

diff --git a/src/extras/mtd_probe/.gitignore b/src/mtd_probe/.gitignore
similarity index 100%
rename from src/extras/mtd_probe/.gitignore
rename to src/mtd_probe/.gitignore

diff --git a/src/extras/mtd_probe/75-probe_mtd.rules b/src/mtd_probe/75-probe_mtd.rules
similarity index 100%
rename from src/extras/mtd_probe/75-probe_mtd.rules
rename to src/mtd_probe/75-probe_mtd.rules

diff --git a/src/extras/mtd_probe/mtd_probe.c b/src/mtd_probe/mtd_probe.c
similarity index 100%
rename from src/extras/mtd_probe/mtd_probe.c
rename to src/mtd_probe/mtd_probe.c

diff --git a/src/extras/mtd_probe/mtd_probe.h b/src/mtd_probe/mtd_probe.h
similarity index 100%
rename from src/extras/mtd_probe/mtd_probe.h
rename to src/mtd_probe/mtd_probe.h

diff --git a/src/extras/mtd_probe/probe_smartmedia.c b/src/mtd_probe/probe_smartmedia.c
similarity index 100%
rename from src/extras/mtd_probe/probe_smartmedia.c
rename to src/mtd_probe/probe_smartmedia.c

diff --git a/src/extras/qemu/42-qemu-usb.rules b/src/qemu/42-qemu-usb.rules
similarity index 100%
rename from src/extras/qemu/42-qemu-usb.rules
rename to src/qemu/42-qemu-usb.rules

diff --git a/src/extras/rule_generator/75-cd-aliases-generator.rules b/src/rule_generator/75-cd-aliases-generator.rules
similarity index 100%
rename from src/extras/rule_generator/75-cd-aliases-generator.rules
rename to src/rule_generator/75-cd-aliases-generator.rules

diff --git a/src/extras/rule_generator/75-persistent-net-generator.rules b/src/rule_generator/75-persistent-net-generator.rules
similarity index 100%
rename from src/extras/rule_generator/75-persistent-net-generator.rules
rename to src/rule_generator/75-persistent-net-generator.rules

diff --git a/src/extras/rule_generator/rule_generator.functions b/src/rule_generator/rule_generator.functions
similarity index 100%
rename from src/extras/rule_generator/rule_generator.functions
rename to src/rule_generator/rule_generator.functions

diff --git a/src/extras/rule_generator/write_cd_rules b/src/rule_generator/write_cd_rules
similarity index 100%
rename from src/extras/rule_generator/write_cd_rules
rename to src/rule_generator/write_cd_rules

diff --git a/src/extras/rule_generator/write_net_rules b/src/rule_generator/write_net_rules
similarity index 100%
rename from src/extras/rule_generator/write_net_rules
rename to src/rule_generator/write_net_rules

diff --git a/src/extras/scsi_id/.gitignore b/src/scsi_id/.gitignore
similarity index 100%
rename from src/extras/scsi_id/.gitignore
rename to src/scsi_id/.gitignore

diff --git a/src/extras/scsi_id/README b/src/scsi_id/README
similarity index 100%
rename from src/extras/scsi_id/README
rename to src/scsi_id/README

diff --git a/src/extras/scsi_id/scsi.h b/src/scsi_id/scsi.h
similarity index 100%
rename from src/extras/scsi_id/scsi.h
rename to src/scsi_id/scsi.h

diff --git a/src/extras/scsi_id/scsi_id.8 b/src/scsi_id/scsi_id.8
similarity index 100%
rename from src/extras/scsi_id/scsi_id.8
rename to src/scsi_id/scsi_id.8

diff --git a/src/extras/scsi_id/scsi_id.c b/src/scsi_id/scsi_id.c
similarity index 100%
rename from src/extras/scsi_id/scsi_id.c
rename to src/scsi_id/scsi_id.c

diff --git a/src/extras/scsi_id/scsi_id.h b/src/scsi_id/scsi_id.h
similarity index 100%
rename from src/extras/scsi_id/scsi_id.h
rename to src/scsi_id/scsi_id.h

diff --git a/src/extras/scsi_id/scsi_serial.c b/src/scsi_id/scsi_serial.c
similarity index 100%
rename from src/extras/scsi_id/scsi_serial.c
rename to src/scsi_id/scsi_serial.c

diff --git a/src/extras/v4l_id/.gitignore b/src/v4l_id/.gitignore
similarity index 100%
rename from src/extras/v4l_id/.gitignore
rename to src/v4l_id/.gitignore

diff --git a/src/extras/v4l_id/60-persistent-v4l.rules b/src/v4l_id/60-persistent-v4l.rules
similarity index 100%
rename from src/extras/v4l_id/60-persistent-v4l.rules
rename to src/v4l_id/60-persistent-v4l.rules

diff --git a/src/extras/v4l_id/v4l_id.c b/src/v4l_id/v4l_id.c
similarity index 100%
rename from src/extras/v4l_id/v4l_id.c
rename to src/v4l_id/v4l_id.c