# ------------------------------------------------------------------------------
# libudev
# ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=5
-LIBUDEV_REVISION=2
-LIBUDEV_AGE=5
+LIBUDEV_CURRENT=7
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=7
SUBDIRS += libudev/docs
udev_udevadm_LDADD = libudev/libudev-private.la
# ------------------------------------------------------------------------------
-# udev docs and man pages
+# udev man pages
# ------------------------------------------------------------------------------
-writing_udev_rulesdir = $(docdir)/writing_udev_rules
-dist_writing_udev_rules_DATA = \
- docs/writing_udev_rules/index.html
-
dist_man_MANS = \
udev/udev.7 \
udev/udevadm.8 \
udev/test-udev.c
udev_test_udev_LDADD = libudev/libudev-private.la
-# ------------------------------------------------------------------------------
-# firmware.sh - firmware loading
-# ------------------------------------------------------------------------------
-dist_libexec_SCRIPTS = extras/firmware/firmware.sh
-dist_udevrules_DATA += extras/firmware/50-firmware.rules
-
# ------------------------------------------------------------------------------
# rule_generator - persistent network and optical device rule generator
# ------------------------------------------------------------------------------
-dist_libexec_SCRIPTS += \
+dist_libexec_SCRIPTS = \
extras/rule_generator/write_cd_rules \
extras/rule_generator/write_net_rules
extras/rule_generator/75-cd-aliases-generator.rules \
extras/rule_generator/75-persistent-net-generator.rules
+# ------------------------------------------------------------------------------
+# firmware - firmware loading
+# ------------------------------------------------------------------------------
+extras_firmware_firmware_SOURCES = extras/firmware/firmware.c
+extras_firmware_firmware_LDADD = libudev/libudev-private.la
+dist_udevrules_DATA += extras/firmware/50-firmware.rules
+libexec_PROGRAMS = extras/firmware/firmware
+
# ------------------------------------------------------------------------------
# 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
-libexec_PROGRAMS = extras/ata_id/ata_id
+libexec_PROGRAMS += extras/ata_id/ata_id
# ------------------------------------------------------------------------------
# cdrom_id - optical drive/media capability
# input_id - import input device class
# ------------------------------------------------------------------------------
extras_input_id_input_id_SOURCES = extras/input_id/input_id.c
-extras_input_id_input_id_LDADD = libudev/libudev.la
+extras_input_id_input_id_LDADD = libudev/libudev-private.la
libexec_PROGRAMS += extras/input_id/input_id
# ------------------------------------------------------------------------------
libexec_PROGRAMS += extras/usb-db/pci-db
# ------------------------------------------------------------------------------
-# modem-modeswitch - magic config switch for 3G modems
+# mobile-action-modeswitch - switch Mobile Action cables into serial mode
# ------------------------------------------------------------------------------
-extras_modem_modeswitch_modem_modeswitch_SOURCES =\
- extras/modem-modeswitch/modem-modeswitch.c \
- extras/modem-modeswitch/utils.c \
- extras/modem-modeswitch/utils.h \
- extras/modem-modeswitch/ma8280p_us.c \
- extras/modem-modeswitch/ma8280p_us.h \
- extras/modem-modeswitch/option.c \
- extras/modem-modeswitch/option.h
-extras_modem_modeswitch_modem_modeswitch_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB_CFLAGS)
-extras_modem_modeswitch_modem_modeswitch_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS)
+extras_mobile_action_modeswitch_mobile_action_modeswitch_SOURCES =\
+ extras/mobile-action-modeswitch/mobile-action-modeswitch.c \
+ extras/mobile-action-modeswitch/utils.c \
+ extras/mobile-action-modeswitch/utils.h \
+ extras/mobile-action-modeswitch/ma8280p_us.c \
+ extras/mobile-action-modeswitch/ma8280p_us.h
+extras_mobile_action_modeswitch_mobile_action_modeswitch_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB_CFLAGS)
+extras_mobile_action_modeswitch_mobile_action_modeswitch_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS)
dist_udevrules_DATA += \
- extras/modem-modeswitch/61-option-modem-modeswitch.rules \
- extras/modem-modeswitch/61-mobile-action.rules
+ extras/mobile-action-modeswitch/61-mobile-action.rules
-libexec_PROGRAMS += extras/modem-modeswitch/modem-modeswitch
+libexec_PROGRAMS += extras/mobile-action-modeswitch/mobile-action-modeswitch
# ------------------------------------------------------------------------------
# keymap - map custom hardware's multimedia keys
extras/keymap/keymaps/hewlett-packard-tx2 \
extras/keymap/keymaps/inventec-symphony_6.0_7.0 \
extras/keymap/keymaps/lenovo-3000 \
+ 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/maxdata-pro_7000 \
extras/keymap/keymaps/module-lenovo \
extras/keymap/keymaps/module-sony \
extras/keymap/keymaps/module-sony-old \
+ extras/keymap/keymaps/olpc-xo \
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
udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
dist_udevkeymapforcerel_DATA = \
- extras/keymap/keymaps/force-release/samsung-other
+ extras/keymap/force-release-maps/samsung-other \
+ extras/keymap/force-release-maps/common-volume-keys
-extras/keymap/keys.txt: /usr/include/linux/input.h
+extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
+ mkdir -p 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