SUBDIRS = .
-EXTRA_DIST = autogen.sh
-
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_MAKEFLAGS = --no-print-directory
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DLIBEXECDIR=\""$(libexecdir)"\"
+AM_CFLAGS = \
+ -fvisibility=hidden \
+ -ffunction-sections \
+ -fdata-sections
+
AM_LDFLAGS = \
+ -Wl,--gc-sections \
-Wl,--as-needed
DISTCHECK_CONFIGURE_FLAGS = \
--enable-gtk-doc \
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+BUILT_SOURCES =
+EXTRA_DIST =
CLEANFILES =
+INSTALL_EXEC_HOOKS =
+INSTALL_DATA_HOOKS =
+UNINSTALL_EXEC_HOOKS =
+DISTCHECK_HOOKS =
+libexec_SCRIPTS =
+dist_libexec_SCRIPTS =
+
+SED_PROCESS = \
+$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
+ -e 's,@VERSION\@,$(VERSION),g' \
+ -e 's,@prefix\@,$(prefix),g' \
+ -e 's,@exec_prefix\@,$(exec_prefix),g' \
+ -e 's,@libdir\@,$(libdir),g' \
+ -e 's,@includedir\@,$(includedir),g' \
+ -e 's,@bindir\@,$(bindir),g' \
+ -e 's,@sbindir\@,$(sbindir),g' \
+ -e 's,@libexecdir\@,$(libexecdir),g' \
+ < $< > $@ || rm $@
+
+%.pc: %.pc.in Makefile
+ $(SED_PROCESS)
+
+%.rules: %.rules.in Makefile
+ $(SED_PROCESS)
+
+%.service: %.service.in
+ $(SED_PROCESS)
+
+%.sh: %.sh.in
+ $(SED_PROCESS)
# ------------------------------------------------------------------------------
# libudev
# ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=8
-LIBUDEV_REVISION=3
-LIBUDEV_AGE=8
+LIBUDEV_CURRENT=13
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=13
SUBDIRS += libudev/docs
libudev/libudev-queue.c
libudev_libudev_la_LDFLAGS = \
- -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
- -export-symbols $(top_srcdir)/libudev/exported_symbols
+ $(AM_LDFLAGS) \
+ -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
noinst_LTLIBRARIES = \
libudev/libudev-private.la
libudev_libudev_private_la_SOURCES =\
$(libudev_libudev_la_SOURCES) \
- libudev/libudev-ctrl.c \
libudev/libudev-util-private.c \
libudev/libudev-device-private.c \
libudev/libudev-queue-private.c
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libudev/libudev.pc
+EXTRA_DIST += libudev/libudev.pc.in
+CLEANFILES += libudev/libudev.pc
-EXTRA_DIST += libudev/exported_symbols libudev/COPYING
+EXTRA_DIST += libudev/COPYING
# move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
libudev-install-move-hook:
if test "$(libdir)" != "$(rootlib_execdir)"; then \
libudev-uninstall-move-hook:
rm -f $(DESTDIR)$(rootlib_execdir)/libudev.so*
-INSTALL_EXEC_HOOKS = libudev-install-move-hook
-UNINSTALL_EXEC_HOOKS = libudev-uninstall-move-hook
+INSTALL_EXEC_HOOKS += libudev-install-move-hook
+UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook
# ------------------------------------------------------------------------------
# main udev
# ------------------------------------------------------------------------------
-install-data-local:
+udev-confdirs:
-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
-mkdir -p $(DESTDIR)$(libexecdir)/devices
+INSTALL_DATA_HOOKS += udev-confdirs
+
EXTRA_DIST += \
rules/arch \
rules/misc
udevrulesdir = $(libexecdir)/rules.d
dist_udevrules_DATA = \
rules/rules.d/50-udev-default.rules \
- rules/rules.d/60-persistent-storage.rules \
rules/rules.d/60-persistent-storage-tape.rules \
rules/rules.d/60-persistent-serial.rules \
rules/rules.d/60-persistent-input.rules \
rules/rules.d/60-persistent-alsa.rules \
+ rules/rules.d/60-persistent-storage.rules \
rules/rules.d/80-drivers.rules \
rules/rules.d/95-udev-late.rules
sharepkgconfigdir = $(datadir)/pkgconfig
sharepkgconfig_DATA = udev/udev.pc
+EXTRA_DIST += udev/udev.pc.in
+CLEANFILES += udev/udev.pc
if WITH_SYSTEMD
+dist_systemdsystemunit_DATA = \
+ systemd/udev-control.socket \
+ systemd/udev-kernel.socket
+
systemdsystemunit_DATA = \
- init/udev.service \
- init/udev-settle.service \
- init/udev-retry.service
+ systemd/udev.service \
+ systemd/udev-trigger.service \
+ systemd/udev-settle.service
+
+EXTRA_DIST += \
+ systemd/udev.service.in \
+ systemd/udev-trigger.service.in \
+ systemd/udev-settle.service.in
+
+CLEANFILES += \
+ systemd/udev.service \
+ systemd/udev-trigger.service \
+ systemd/udev-settle.service
+
+systemd-install-hook:
+ mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
+ ln -sf ../udev-control.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev-control.socket
+ ln -sf ../udev-kernel.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev-kernel.socket
+ mkdir -p $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants
+ ln -sf ../udev.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev.service
+ ln -sf ../udev-trigger.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-trigger.service
+
+INSTALL_DATA_HOOKS += systemd-install-hook
endif
-sbin_PROGRAMS = \
- udev/udevd \
+bin_PROGRAMS = \
udev/udevadm
-udev_common_sources =\
+libexec_PROGRAMS = \
+ udev/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-rules.c \
+ udev/udev-ctrl.c \
+ udev/udev-builtin.c \
+ udev/udev-builtin-path_id.c \
+ udev/udev-builtin-usb_id.c \
+ udev/udev-builtin-input_id.c \
+ udev/udev-builtin-blkid.c \
+ udev/udev-builtin-kmod.c
+
+udev_common_CFLAGS = \
+ $(BLKID_CFLAGS)
+
+udev_common_LDADD = \
+ libudev/libudev-private.la \
+ $(BLKID_LIBS)
udev_udevd_SOURCES = \
$(udev_common_sources) \
- udev/udevd.c
-udev_udevd_LDADD = libudev/libudev-private.la
+ udev/udevd.c \
+ udev/sd-daemon.h \
+ udev/sd-daemon.c
+udev_udevd_CFLAGS = $(udev_common_CFLAGS)
+udev_udevd_LDADD = $(udev_common_LDADD)
udev_udevadm_SOURCES = \
$(udev_common_sources) \
udev/udevadm.c \
udev/udevadm-info.c \
udev/udevadm-control.c \
- udev/udevadm-test.c \
udev/udevadm-monitor.c \
udev/udevadm-settle.c \
- udev/udevadm-trigger.c
-udev_udevadm_LDADD = libudev/libudev-private.la
+ 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 man pages
udev/udevadm.8 \
udev/udevd.8
+dist_noinst_DATA = \
+ udev/udev.html \
+ udev/udevadm.html \
+ udev/udevd.html
+
EXTRA_DIST += \
udev/udev.xml \
udev/udevadm.xml \
udev/udevd.xml
-%.7 %.8 : %.xml
+udev/%.7 udev/%.8 : udev/%.xml
$(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+udev/%.html : udev/%.xml
+ $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
+
# ------------------------------------------------------------------------------
# udev tests
# ------------------------------------------------------------------------------
-TESTS = test/udev-test.pl
+TESTS = test/udev-test.pl test/rules-test.sh
check_PROGRAMS = \
libudev/test-libudev \
udev_test_udev_SOURCES = \
$(udev_common_sources) \
udev/test-udev.c
-udev_test_udev_LDADD = libudev/libudev-private.la
-
-# ------------------------------------------------------------------------------
-# rule_generator - persistent network and optical device rule generator
-# ------------------------------------------------------------------------------
-dist_libexec_SCRIPTS = \
- extras/rule_generator/write_cd_rules \
- extras/rule_generator/write_net_rules
-
-udevhomedir = $(libexecdir)
-dist_udevhome_DATA = extras/rule_generator/rule_generator.functions
-
-dist_udevrules_DATA += \
- extras/rule_generator/75-cd-aliases-generator.rules \
- extras/rule_generator/75-persistent-net-generator.rules
+udev_test_udev_CFLAGS = $(udev_common_CFLAGS)
+udev_test_udev_LDADD = $(udev_common_LDADD)
# ------------------------------------------------------------------------------
# firmware - firmware loading
extras_firmware_firmware_LDADD = libudev/libudev-private.la
extras_firmware_firmware_CPPFLAGS = $(AM_CPPFLAGS) -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
dist_udevrules_DATA += extras/firmware/50-firmware.rules
-libexec_PROGRAMS = extras/firmware/firmware
+libexec_PROGRAMS += extras/firmware/firmware
# ------------------------------------------------------------------------------
# ata_id - ATA identify
extras_collect_collect_LDADD = libudev/libudev-private.la
libexec_PROGRAMS += extras/collect/collect
-# ------------------------------------------------------------------------------
-# edd_id - BIOS EDD block device match
-# ------------------------------------------------------------------------------
-extras_edd_id_edd_id_SOURCES = extras/edd_id/edd_id.c
-extras_edd_id_edd_id_LDADD = libudev/libudev-private.la
-libexec_PROGRAMS += extras/edd_id/edd_id
-dist_udevrules_DATA += extras/edd_id/61-persistent-storage-edd.rules
-
-# ------------------------------------------------------------------------------
-# 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
-libexec_PROGRAMS += extras/floppy/create_floppy_devices
-dist_udevrules_DATA += extras/floppy/60-floppy.rules
-
-# ------------------------------------------------------------------------------
-# 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-private.la
-libexec_PROGRAMS += extras/input_id/input_id
-
-# ------------------------------------------------------------------------------
-# path_id - compose identifier of persistent elements of the parent buses
-# ------------------------------------------------------------------------------
-extras_path_id_path_id_SOURCES = extras/path_id/path_id.c
-extras_path_id_path_id_LDADD = libudev/libudev-private.la
-libexec_PROGRAMS += extras/path_id/path_id
-
-# ------------------------------------------------------------------------------
-# fstab_import - import /etc/fstab entry for block device
-# ------------------------------------------------------------------------------
-extras_fstab_import_fstab_import_SOURCES = extras/fstab_import/fstab_import.c
-extras_fstab_import_fstab_import_LDADD = libudev/libudev-private.la
-libexec_PROGRAMS += extras/fstab_import/fstab_import
-dist_udevrules_DATA += extras/fstab_import/79-fstab_import.rules
-
# ------------------------------------------------------------------------------
# scsi_id - SCSI inquiry to get various serial numbers
# ------------------------------------------------------------------------------
extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la
libexec_PROGRAMS += extras/scsi_id/scsi_id
dist_man_MANS += extras/scsi_id/scsi_id.8
-
-# ------------------------------------------------------------------------------
-# usb_id - USB device property import
-# ------------------------------------------------------------------------------
-extras_usb_id_usb_id_SOURCES = extras/usb_id/usb_id.c
-extras_usb_id_usb_id_LDADD = libudev/libudev-private.la
-libexec_PROGRAMS += extras/usb_id/usb_id
+EXTRA_DIST += extras/scsi_id/README
# ------------------------------------------------------------------------------
# v4l_id - video4linux capabilities
libexec_PROGRAMS += extras/v4l_id/v4l_id
dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules
-if ENABLE_EXTRAS
# ------------------------------------------------------------------------------
-# conditional extras (need glib, libusb, libacl, ...)
+# accelerometer - updates device orientation
# ------------------------------------------------------------------------------
-dist_udevrules_DATA += \
- rules/rules.d/75-net-description.rules \
- rules/rules.d/75-tty-description.rules \
- rules/rules.d/78-sound-card.rules
+extras_accelerometer_accelerometer_SOURCES = extras/accelerometer/accelerometer.c
+extras_accelerometer_accelerometer_LDADD = libudev/libudev-private.la -lm
+libexec_PROGRAMS += extras/accelerometer/accelerometer
+dist_udevrules_DATA += extras/accelerometer/61-accelerometer.rules
+
+# ------------------------------------------------------------------------------
+# qemu -- qemu/kvm guest tweaks
+# ------------------------------------------------------------------------------
+dist_udevrules_DATA += extras/qemu/42-qemu-usb.rules
+if ENABLE_GUDEV
# ------------------------------------------------------------------------------
# GUdev - libudev gobject interface
# ------------------------------------------------------------------------------
-LIBGUDEV_CURRENT=0
+LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=1
-LIBGUDEV_AGE=0
+LIBGUDEV_AGE=1
SUBDIRS += extras/gudev/docs
extras/gudev/gudevenumtypes.h \
extras/gudev/gudevtypes.h \
extras/gudev/gudevclient.h \
- extras/gudev/gudevdevice.h
+ extras/gudev/gudevdevice.h \
+ extras/gudev/gudevenumerator.h
lib_LTLIBRARIES += 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
extras_gudev_libgudev_1_0_la_SOURCES = \
extras/gudev/gudevenums.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
-dist_extras_gudev_libgudev_1_0_la_SOURCES = \
+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 = $(dist_extras_gudev_libgudev_1_0_la_SOURCES)
+BUILT_SOURCES += $(nodist_extras_gudev_libgudev_1_0_la_SOURCES)
extras_gudev_libgudev_1_0_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
-D_GUDEV_COMPILATION \
-DG_LOG_DOMAIN=\"GUdev\"
-extras_gudev_libgudev_1_0_la_CFLAGS = $(GLIB_CFLAGS)
+
+extras_gudev_libgudev_1_0_la_CFLAGS = \
+ -fvisibility=default \
+ $(GLIB_CFLAGS)
+
extras_gudev_libgudev_1_0_la_LIBADD = libudev/libudev.la $(GLIB_LIBS)
extras_gudev_libgudev_1_0_la_LDFLAGS = \
extras/gudev/COPYING \
extras/gudev/gudevmarshal.list \
extras/gudev/gudevenumtypes.h.template \
- extras/gudev/gudevenumtypes.c.template
+ extras/gudev/gudevenumtypes.c.template \
+ extras/gudev/gjs-example.js \
+ extras/gudev/seed-example-enum.js \
+ extras/gudev/seed-example.js
extras/gudev/gudevmarshal.h: extras/gudev/gudevmarshal.list
$(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
$@.tmp && mv $@.tmp $@
if ENABLE_INTROSPECTION
-extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefile.am
- $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
- LD_LIBRARY_PATH=$(top_builddir)/extras/gudev \
- $(G_IR_SCANNER) -v \
+extras/gudev/GUdev-1.0.gir: 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=extras/gudev \
+ --library-path=$(top_builddir)/libudev \
+ --library-path=$(top_builddir)/extras/gudev \
--output $@ \
--pkg=glib-2.0 \
--pkg=gobject-2.0 \
- -I$(top_builddir)/extras \
-I$(top_srcdir)/extras \
+ -I$(top_builddir)/extras \
-D_GUDEV_COMPILATION \
-D_GUDEV_WORK_AROUND_DEV_T_BUG \
$(top_srcdir)/extras/gudev/gudev.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/gudevdevice.c \
+ $(top_srcdir)/extras/gudev/gudevenumerator.c
extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER)
$(AM_V_GEN)g-ir-compiler $< -o $@
CLEANFILES += $(gir_DATA) $(typelibs_DATA)
endif # ENABLE_INTROSPECTION
-# ------------------------------------------------------------------------------
-# Bluetooth HID devices with special magic to switch the device
-# ------------------------------------------------------------------------------
-extras_hid2hci_hid2hci_SOURCES = extras/hid2hci/hid2hci.c
-extras_hid2hci_hid2hci_CPPFLAGS = $(AM_CPPFLAGS) $(LIBUSB_CFLAGS)
-extras_hid2hci_hid2hci_LDADD = libudev/libudev-private.la $(LIBUSB_LIBS)
-dist_udevrules_DATA += extras/hid2hci/70-hid2hci.rules
-libexec_PROGRAMS += extras/hid2hci/hid2hci
-
-# ------------------------------------------------------------------------------
-# 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-acl.rules
-libexec_PROGRAMS += extras/udev-acl/udev-acl
+# move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
+libgudev-install-move-hook:
+ if test "$(libdir)" != "$(rootlib_execdir)"; then \
+ mkdir -p $(DESTDIR)$(rootlib_execdir) && \
+ so_img_name=$$(readlink $(DESTDIR)$(libdir)/libgudev-1.0.so) && \
+ so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+ ln -sf $$so_img_rel_target_prefix$(rootlib_execdir)/$$so_img_name $(DESTDIR)$(libdir)/libgudev-1.0.so && \
+ mv $(DESTDIR)$(libdir)/libgudev-1.0.so.* $(DESTDIR)$(rootlib_execdir); \
+ fi
-udevacl-install-hook:
- mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
- ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
+libgudev-uninstall-move-hook:
+ rm -f $(DESTDIR)$(rootlib_execdir)/libgudev-1.0.so*
-INSTALL_EXEC_HOOKS += udevacl-install-hook
+INSTALL_EXEC_HOOKS += libgudev-install-move-hook
+UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
+endif
+if ENABLE_HWDB
# ------------------------------------------------------------------------------
-# usb-db - read USB vendor/device string database
+# usb/pci-db - read vendor/device string database
# ------------------------------------------------------------------------------
extras_usb_db_usb_db_SOURCES = extras/usb-db/usb-db.c
extras_usb_db_usb_db_CPPFLAGS = $(AM_CPPFLAGS) -DUSB_DATABASE=\"$(USB_DATABASE)\" -DBUILD_FOR_USB
extras_usb_db_usb_db_LDADD = libudev/libudev-private.la
libexec_PROGRAMS += extras/usb-db/usb-db
+dist_udevrules_DATA += \
+ rules/rules.d/75-net-description.rules \
+ rules/rules.d/75-tty-description.rules \
+ rules/rules.d/78-sound-card.rules
-# ------------------------------------------------------------------------------
-# pci-db - read PCI vendor/device string database
-# ------------------------------------------------------------------------------
extras_usb_db_pci_db_SOURCES = extras/usb-db/usb-db.c
extras_usb_db_pci_db_CPPFLAGS = $(AM_CPPFLAGS) -DPCI_DATABASE=\"$(PCI_DATABASE)\" -DBUILD_FOR_PCI
extras_usb_db_pci_db_LDADD = libudev/libudev-private.la
libexec_PROGRAMS += extras/usb-db/pci-db
+endif
-# ------------------------------------------------------------------------------
-# mobile-action-modeswitch - switch Mobile Action cables into serial mode
-# ------------------------------------------------------------------------------
-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/mobile-action-modeswitch/61-mobile-action.rules
-
-libexec_PROGRAMS += extras/mobile-action-modeswitch/mobile-action-modeswitch
-
-# ------------------------------------------------------------------------------
-# 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
-
-libexec_PROGRAMS += extras/mtd_probe/mtd_probe
-
-
+if ENABLE_KEYMAP
# ------------------------------------------------------------------------------
# keymap - map custom hardware's multimedia keys
# ------------------------------------------------------------------------------
extras/keymap/keys-to-name.h
BUILT_SOURCES += $(nodist_extras_keymap_keymap_SOURCES)
-EXTRA_DIST += extras/keymap/check-keymaps.sh
-dist_udevrules_DATA += extras/keymap/95-keymap.rules
-dist_udevrules_DATA += extras/keymap/95-keyboard-force-release.rules
libexec_PROGRAMS += extras/keymap/keymap
-dist_libexec_SCRIPTS += extras/keymap/findkeyboards
-dist_libexec_SCRIPTS += extras/keymap/keyboard-force-release.sh
dist_doc_DATA = extras/keymap/README.keymap.txt
+dist_udevrules_DATA += \
+ extras/keymap/95-keymap.rules \
+ extras/keymap/95-keyboard-force-release.rules
+
+dist_libexec_SCRIPTS += extras/keymap/findkeyboards
+libexec_SCRIPTS += extras/keymap/keyboard-force-release.sh
+
+EXTRA_DIST += \
+ extras/keymap/check-keymaps.sh \
+ extras/keymap/keyboard-force-release.sh.in
+
CLEANFILES += \
extras/keymap/keys.txt \
- extras/keymap/keys-from-name.gperf
+ extras/keymap/keys-from-name.gperf \
+ extras/keymap/keyboard-force-release.sh
udevkeymapdir = $(libexecdir)/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_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-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/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 \
udevkeymapforcereldir = $(libexecdir)/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
keymaps-distcheck-hook: extras/keymap/keys.txt
$(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^
-DISTCHECK_HOOKS = keymaps-distcheck-hook
+DISTCHECK_HOOKS += keymaps-distcheck-hook
+endif
+
+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
+libexec_PROGRAMS += extras/mtd_probe/mtd_probe
+endif
+
+if ENABLE_RULE_GENERATOR
+# ------------------------------------------------------------------------------
+# rule_generator - persistent network and optical device rule generator
+# ------------------------------------------------------------------------------
+dist_libexec_SCRIPTS += \
+ extras/rule_generator/write_cd_rules \
+ extras/rule_generator/write_net_rules
+
+udevhomedir = $(libexecdir)
+dist_udevhome_DATA = extras/rule_generator/rule_generator.functions
-endif # ENABLE_EXTRAS
+dist_udevrules_DATA += \
+ extras/rule_generator/75-cd-aliases-generator.rules \
+ 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
+libexec_PROGRAMS += extras/udev-acl/udev-acl
+
+udevacl-install-hook:
+ mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
+ ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
+
+INSTALL_EXEC_HOOKS += udevacl-install-hook
+endif
+
+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
+libexec_PROGRAMS += extras/floppy/create_floppy_devices
+dist_udevrules_DATA += 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
+libexec_PROGRAMS += extras/edd_id/edd_id
+dist_udevrules_DATA += extras/edd_id/61-persistent-storage-edd.rules
+endif
# ------------------------------------------------------------------------------
# install, uninstall, clean hooks
distclean-local:
rm -rf autom4te.cache
+EXTRA_DIST += \
+ $(TESTS) \
+ test/rule-syntax-check.py
+
CLEANFILES += \
- udev-$(VERSION).tar.gz \
- udev-$(VERSION).tar.bz2 \
$(BUILT_SOURCES)
-EXTRA_DIST += $(TESTS)
-
install-exec-hook: $(INSTALL_EXEC_HOOKS)
+install-data-hook: $(INSTALL_DATA_HOOKS)
+
uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
distcheck-hook: $(DISTCHECK_HOOKS)
head -1 ChangeLog | grep -q "to v$(VERSION)"
head -1 NEWS | grep -q "udev $(VERSION)"
git commit -a -m "release $(VERSION)"
- cat .git/refs/heads/master > .git/refs/tags/$(VERSION)
- git gc
- git prune
+ git tag -m "udev $(VERSION)" -s $(VERSION)
+ git gc --prune=0
+
+tar:
+ make distcheck
+ gpg --armor --detach-sign udev-$(VERSION).tar.xz
+
+git-sync:
+ git push
+ git push --tags $(VERSION)
+
+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/
~ianmdlvl / elogind.git / blobdiff