X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=3271bdb54c5bbaebdb4b6fe7dab47f509207a32d;hp=9fe4a3ac51282b07942e07f41686f0002f0a43e3;hb=c23d8fb18f018d737fdc22abe3c7ef599561d37f;hpb=4281da1fa6fda10c15bee984825fc607a8385004 diff --git a/Makefile.am b/Makefile.am index 9fe4a3ac5..3271bdb54 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,81 +1,124 @@ # ------------------------------------------------------------------------------ -# Copyright (C) 2008-2009 Kay Sievers +# Copyright (C) 2008-2012 Kay Sievers # Copyright (C) 2009 Diego Elio 'Flameeyes' Pettenò # ------------------------------------------------------------------------------ SUBDIRS = . -EXTRA_DIST = autogen.sh - -ACLOCAL_AMFLAGS = -I m4 +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} AM_MAKEFLAGS = --no-print-directory AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ - -I$(top_srcdir)/libudev \ + -I$(top_srcdir)/src \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DLIBEXECDIR=\""$(libexecdir)"\" + -DPKGLIBEXECDIR=\""$(libexecdir)/udev"\" + +AM_CFLAGS = \ + ${my_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 = +DISTCLEAN_LOCAL_HOOKS = + +udevhomedir = $(libexecdir)/udev +udevhome_SCRIPTS = +dist_udevhome_SCRIPTS = +dist_udevhome_DATA = +dist_man_MANS = + +SED_PROCESS = \ + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ + -e 's,@VERSION\@,$(VERSION),g' \ + -e 's,@prefix\@,$(prefix),g' \ + -e 's,@rootprefix\@,$(rootprefix),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,@pkglibexecdir\@,$(libexecdir)/udev,g' \ + < $< > $@ || rm $@ + +%.pc: %.pc.in Makefile + $(SED_PROCESS) + +%.rules: %.rules.in Makefile + $(SED_PROCESS) + +%.service: %.service.in Makefile + $(SED_PROCESS) + +%.sh: %.sh.in Makefile + $(SED_PROCESS) + $(AM_V_GEN)chmod +x $@ + +%.pl: %.pl.in Makefile + $(SED_PROCESS) + $(AM_V_GEN)chmod +x $@ # ------------------------------------------------------------------------------ # libudev # ------------------------------------------------------------------------------ -LIBUDEV_CURRENT=9 -LIBUDEV_REVISION=4 -LIBUDEV_AGE=9 +LIBUDEV_CURRENT=13 +LIBUDEV_REVISION=0 +LIBUDEV_AGE=13 -SUBDIRS += libudev/docs +SUBDIRS += src/docs -include_HEADERS = libudev/libudev.h -lib_LTLIBRARIES = libudev/libudev.la +include_HEADERS = src/libudev.h +lib_LTLIBRARIES = src/libudev.la -libudev_libudev_la_SOURCES =\ - libudev/libudev-private.h \ - libudev/libudev.c \ - libudev/libudev-list.c \ - libudev/libudev-util.c \ - libudev/libudev-device.c \ - libudev/libudev-enumerate.c \ - libudev/libudev-monitor.c \ - libudev/libudev-queue.c +src_libudev_la_SOURCES =\ + src/libudev-private.h \ + src/libudev.c \ + src/libudev-list.c \ + src/libudev-util.c \ + src/libudev-device.c \ + src/libudev-enumerate.c \ + src/libudev-monitor.c \ + src/libudev-queue.c -libudev_libudev_la_LDFLAGS = \ - -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \ - -export-symbols $(top_srcdir)/libudev/exported_symbols +src_libudev_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) noinst_LTLIBRARIES = \ - libudev/libudev-private.la + src/libudev-private.la -libudev_libudev_private_la_SOURCES =\ - $(libudev_libudev_la_SOURCES) \ - libudev/libudev-ctrl.c \ - libudev/libudev-util-private.c \ - libudev/libudev-device-private.c \ - libudev/libudev-queue-private.c +src_libudev_private_la_SOURCES =\ + $(src_libudev_la_SOURCES) \ + src/libudev-util-private.c \ + src/libudev-device-private.c \ + src/libudev-queue-private.c if WITH_SELINUX -libudev_libudev_private_la_SOURCES += libudev/libudev-selinux-private.c -libudev_libudev_private_la_LIBADD = $(SELINUX_LIBS) +src_libudev_private_la_SOURCES += src/libudev-selinux-private.c +src_libudev_private_la_LIBADD = $(SELINUX_LIBS) endif pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libudev/libudev.pc +pkgconfig_DATA = src/libudev.pc +EXTRA_DIST += src/libudev.pc.in +CLEANFILES += src/libudev.pc -EXTRA_DIST += libudev/exported_symbols libudev/COPYING +EXTRA_DIST += src/COPYING # move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed libudev-install-move-hook: if test "$(libdir)" != "$(rootlib_execdir)"; then \ @@ -97,7 +140,7 @@ UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook # ------------------------------------------------------------------------------ udev-confdirs: -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d - -mkdir -p $(DESTDIR)$(libexecdir)/devices + -mkdir -p $(DESTDIR)$(libexecdir)/udev/devices INSTALL_DATA_HOOKS += udev-confdirs @@ -105,330 +148,362 @@ EXTRA_DIST += \ rules/arch \ rules/misc -udevrulesdir = $(libexecdir)/rules.d +udevrulesdir = $(libexecdir)/udev/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/75-net-description.rules \ + rules/rules.d/75-tty-description.rules \ + rules/rules.d/78-sound-card.rules \ rules/rules.d/80-drivers.rules \ rules/rules.d/95-udev-late.rules udevconfdir = $(sysconfdir)/udev -dist_udevconf_DATA = udev.conf +dist_udevconf_DATA = src/udev.conf sharepkgconfigdir = $(datadir)/pkgconfig -sharepkgconfig_DATA = udev/udev.pc +sharepkgconfig_DATA = src/udev.pc +EXTRA_DIST += src/udev.pc.in +CLEANFILES += src/udev.pc if WITH_SYSTEMD +dist_systemdsystemunit_DATA = \ + src/udev-control.socket \ + src/udev-kernel.socket + systemdsystemunit_DATA = \ - init/udev.service \ - init/udev-settle.service \ - init/udev-retry.service + src/udev.service \ + src/udev-trigger.service \ + src/udev-settle.service + +EXTRA_DIST += \ + src/udev.service.in \ + src/udev-trigger.service.in \ + src/udev-settle.service.in + +CLEANFILES += \ + src/udev.service \ + src/udev-trigger.service \ + src/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-settle.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-settle.service - ln -sf ../udev-retry.service $(DESTDIR)$(systemdsystemunitdir)/basic.target.wants/udev-retry.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 \ - udev/udevadm - -udev_common_sources =\ - udev/udev.h \ - udev/udev-event.c \ - udev/udev-watch.c \ - udev/udev-node.c \ - udev/udev-rules.c +bin_PROGRAMS = \ + src/udevadm + +pkglibexec_PROGRAMS = \ + src/udevd + +udev_common_sources = \ + src/udev.h \ + src/udev-event.c \ + src/udev-watch.c \ + src/udev-node.c \ + src/udev-rules.c \ + src/udev-ctrl.c \ + src/udev-builtin.c \ + src/udev-builtin-blkid.c \ + src/udev-builtin-firmware.c \ + src/udev-builtin-hwdb.c \ + src/udev-builtin-input_id.c \ + src/udev-builtin-kmod.c \ + src/udev-builtin-path_id.c \ + src/udev-builtin-usb_id.c + +udev_common_CFLAGS = \ + $(BLKID_CFLAGS) \ + $(KMOD_CFLAGS) + +udev_common_LDADD = \ + src/libudev-private.la \ + $(BLKID_LIBS) \ + $(KMOD_LIBS) + +udev_common_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DFIRMWARE_PATH="$(FIRMWARE_PATH)" \ + -DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\" -udev_udevd_SOURCES = \ +src_udevd_SOURCES = \ $(udev_common_sources) \ - udev/udevd.c \ - udev/sd-daemon.h \ - udev/sd-daemon.c -udev_udevd_LDADD = libudev/libudev-private.la - -udev_udevadm_SOURCES = \ + src/udevd.c \ + src/sd-daemon.h \ + src/sd-daemon.c +src_udevd_CFLAGS = $(udev_common_CFLAGS) +src_udevd_LDADD = $(udev_common_LDADD) +src_udevd_CPPFLAGS = $(udev_common_CPPFLAGS) + +src_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 - + src/udevadm.c \ + src/udevadm-info.c \ + src/udevadm-control.c \ + src/udevadm-monitor.c \ + src/udevadm-settle.c \ + src/udevadm-trigger.c \ + src/udevadm-test.c \ + src/udevadm-test-builtin.c +src_udevadm_CFLAGS = $(udev_common_CFLAGS) +src_udevadm_LDADD = $(udev_common_LDADD) +src_udevadm_CPPFLAGS = $(udev_common_CPPFLAGS) + +if HAVE_XSLTPROC # ------------------------------------------------------------------------------ # udev man pages # ------------------------------------------------------------------------------ -dist_man_MANS = \ - udev/udev.7 \ - udev/udevadm.8 \ - udev/udevd.8 +dist_man_MANS += \ + src/udev.7 \ + src/udevadm.8 \ + src/udevd.8 + +dist_noinst_DATA = \ + src/udev.html \ + src/udevadm.html \ + src/udevd.html EXTRA_DIST += \ - udev/udev.xml \ - udev/udevadm.xml \ - udev/udevd.xml + src/udev.xml \ + src/udevadm.xml \ + src/udevd.xml -%.7 %.8 : %.xml +src/%.7 src/%.8 : src/%.xml $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< +src/%.html : src/%.xml + $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< +endif + # ------------------------------------------------------------------------------ # udev tests # ------------------------------------------------------------------------------ -TESTS = test/udev-test.pl test/rules-test.sh +TESTS = \ + test/udev-test.pl \ + test/rules-test.sh check_PROGRAMS = \ - libudev/test-libudev \ - udev/test-udev + src/test-libudev \ + src/test-udev -libudev_test_libudev_SOURCES = libudev/test-libudev.c -libudev_test_libudev_LDADD = libudev/libudev.la +src_test_libudev_SOURCES = src/test-libudev.c +src_test_libudev_LDADD = src/libudev.la -udev_test_udev_SOURCES = \ +src_test_udev_SOURCES = \ $(udev_common_sources) \ - udev/test-udev.c -udev_test_udev_LDADD = libudev/libudev-private.la + src/test-udev.c +src_test_udev_CFLAGS = $(udev_common_CFLAGS) +src_test_udev_LDADD = $(udev_common_LDADD) +src_test_udev_CPPFLAGS = $(udev_common_CPPFLAGS) -# ------------------------------------------------------------------------------ -# rule_generator - persistent network and optical device rule generator -# ------------------------------------------------------------------------------ -dist_libexec_SCRIPTS = \ - extras/rule_generator/write_cd_rules \ - extras/rule_generator/write_net_rules +# packed sysfs test tree +test/sys/kernel/uevent_seqnum: + $(AM_V_GEN)mkdir -p test && tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz -udevhomedir = $(libexecdir) -dist_udevhome_DATA = extras/rule_generator/rule_generator.functions +BUILT_SOURCES += test/sys/kernel/uevent_seqnum -dist_udevrules_DATA += \ - extras/rule_generator/75-cd-aliases-generator.rules \ - extras/rule_generator/75-persistent-net-generator.rules +test-sys-distclean: + -rm -rf test/sys +DISTCLEAN_LOCAL_HOOKS += test-sys-distclean -# ------------------------------------------------------------------------------ -# firmware - firmware loading -# ------------------------------------------------------------------------------ -extras_firmware_firmware_SOURCES = extras/firmware/firmware.c -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 +EXTRA_DIST += test/sys.tar.xz # ------------------------------------------------------------------------------ # 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 +src_extras_ata_id_ata_id_SOURCES = src/extras/ata_id/ata_id.c +src_extras_ata_id_ata_id_LDADD = src/libudev-private.la +pkglibexec_PROGRAMS += src/extras/ata_id/ata_id # ------------------------------------------------------------------------------ # cdrom_id - optical drive/media capability # ------------------------------------------------------------------------------ -extras_cdrom_id_cdrom_id_SOURCES = extras/cdrom_id/cdrom_id.c -extras_cdrom_id_cdrom_id_LDADD = libudev/libudev-private.la -libexec_PROGRAMS += extras/cdrom_id/cdrom_id -dist_udevrules_DATA += extras/cdrom_id/60-cdrom_id.rules +src_extras_cdrom_id_cdrom_id_SOURCES = src/extras/cdrom_id/cdrom_id.c +src_extras_cdrom_id_cdrom_id_LDADD = src/libudev-private.la +pkglibexec_PROGRAMS += src/extras/cdrom_id/cdrom_id +dist_udevrules_DATA += src/extras/cdrom_id/60-cdrom_id.rules # ------------------------------------------------------------------------------ # collect - trigger action when a collection of devices appeared # ------------------------------------------------------------------------------ -extras_collect_collect_SOURCES = extras/collect/collect.c -extras_collect_collect_LDADD = libudev/libudev-private.la -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 +src_extras_collect_collect_SOURCES = src/extras/collect/collect.c +src_extras_collect_collect_LDADD = src/libudev-private.la +pkglibexec_PROGRAMS += src/extras/collect/collect # ------------------------------------------------------------------------------ # scsi_id - SCSI inquiry to get various serial numbers # ------------------------------------------------------------------------------ -extras_scsi_id_scsi_id_SOURCES =\ - extras/scsi_id/scsi_id.c \ - extras/scsi_id/scsi_serial.c \ - extras/scsi_id/scsi.h \ - extras/scsi_id/scsi_id.h -extras_scsi_id_scsi_id_LDADD = libudev/libudev-private.la -libexec_PROGRAMS += extras/scsi_id/scsi_id -dist_man_MANS += extras/scsi_id/scsi_id.8 +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 # ------------------------------------------------------------------------------ -# usb_id - USB device property import +# v4l_id - video4linux capabilities # ------------------------------------------------------------------------------ -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 +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 # ------------------------------------------------------------------------------ -# v4l_id - video4linux capabilities +# accelerometer - updates device orientation # ------------------------------------------------------------------------------ -extras_v4l_id_v4l_id_SOURCES = extras/v4l_id/v4l_id.c -extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la -libexec_PROGRAMS += extras/v4l_id/v4l_id -dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules +src_extras_accelerometer_accelerometer_SOURCES = src/extras/accelerometer/accelerometer.c +src_extras_accelerometer_accelerometer_LDADD = src/libudev-private.la -lm +pkglibexec_PROGRAMS += src/extras/accelerometer/accelerometer +dist_udevrules_DATA += src/extras/accelerometer/61-accelerometer.rules -if ENABLE_EXTRAS # ------------------------------------------------------------------------------ -# conditional extras (need glib, libusb, libacl, ...) +# qemu -- qemu/kvm guest tweaks # ------------------------------------------------------------------------------ -dist_udevrules_DATA += \ - rules/rules.d/75-net-description.rules \ - rules/rules.d/75-tty-description.rules \ - rules/rules.d/78-sound-card.rules +dist_udevrules_DATA += src/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 - -SUBDIRS += extras/gudev/docs - -libgudev_includedir=$(includedir)/gudev-1.0/gudev -libgudev_include_HEADERS = \ - extras/gudev/gudev.h \ - extras/gudev/gudevenums.h \ - extras/gudev/gudevenumtypes.h \ - extras/gudev/gudevtypes.h \ - extras/gudev/gudevclient.h \ - extras/gudev/gudevdevice.h - -lib_LTLIBRARIES += extras/gudev/libgudev-1.0.la -pkgconfig_DATA += extras/gudev/gudev-1.0.pc - -extras_gudev_libgudev_1_0_la_SOURCES = \ - extras/gudev/gudevenums.h \ - extras/gudev/gudevenumtypes.h \ - extras/gudev/gudevenumtypes.h\ - extras/gudev/gudevtypes.h \ - extras/gudev/gudevclient.h \ - extras/gudev/gudevclient.c \ - extras/gudev/gudevdevice.h \ - extras/gudev/gudevdevice.c \ - extras/gudev/gudevprivate.h - -dist_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) - -extras_gudev_libgudev_1_0_la_CPPFLAGS = \ +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 = \ $(AM_CPPFLAGS) \ - -I$(top_builddir)/extras \ - -I$(top_srcdir)/extras \ - -I$(top_builddir)/extras/gudev \ - -I$(top_srcdir)/extras/gudev \ + -I$(top_builddir)/src/extras \ + -I$(top_srcdir)/src/extras \ + -I$(top_builddir)/src/extras/gudev \ + -I$(top_srcdir)/src/extras/gudev \ -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ -D_GUDEV_COMPILATION \ -DG_LOG_DOMAIN=\"GUdev\" -extras_gudev_libgudev_1_0_la_CFLAGS = $(GLIB_CFLAGS) -extras_gudev_libgudev_1_0_la_LIBADD = libudev/libudev.la $(GLIB_LIBS) -extras_gudev_libgudev_1_0_la_LDFLAGS = \ +src_extras_gudev_libgudev_1_0_la_CFLAGS = \ + -fvisibility=default \ + $(GLIB_CFLAGS) + +src_extras_gudev_libgudev_1_0_la_LIBADD = src/libudev.la $(GLIB_LIBS) + +src_extras_gudev_libgudev_1_0_la_LDFLAGS = \ -version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \ -export-dynamic -no-undefined \ -export-symbols-regex '^g_udev_.*' EXTRA_DIST += \ - extras/gudev/COPYING \ - extras/gudev/gudevmarshal.list \ - extras/gudev/gudevenumtypes.h.template \ - extras/gudev/gudevenumtypes.c.template - -extras/gudev/gudevmarshal.h: extras/gudev/gudevmarshal.list + 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 $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@ -extras/gudev/gudevmarshal.c: extras/gudev/gudevmarshal.list +src/extras/gudev/gudevmarshal.c: src/extras/gudev/gudevmarshal.list $(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \ glib-genmarshal $< --prefix=g_udev_marshal --body >> $@ -extras/gudev/gudevenumtypes.h: extras/gudev/gudevenumtypes.h.template extras/gudev/gudevenums.h +src/extras/gudev/gudevenumtypes.h: src/extras/gudev/gudevenumtypes.h.template src/extras/gudev/gudevenums.h $(AM_V_GEN)glib-mkenums --template $^ > \ $@.tmp && mv $@.tmp $@ -extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gudev/gudevenums.h +src/extras/gudev/gudevenumtypes.c: src/extras/gudev/gudevenumtypes.c.template src/extras/gudev/gudevenums.h $(AM_V_GEN)glib-mkenums --template $^ > \ $@.tmp && mv $@.tmp $@ if ENABLE_INTROSPECTION -extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefile.am - $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \ - LD_LIBRARY_PATH=$(top_builddir)/extras/gudev:$$LD_LIBRARY_PATH \ - $(G_IR_SCANNER) -v \ +src/extras/gudev/GUdev-1.0.gir: src/extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) + $(AM_V_GEN)$(G_IR_SCANNER) -v \ + --warn-all \ --namespace GUdev \ --nsversion=1.0 \ --include=GObject-2.0 \ --library=gudev-1.0 \ - --library-path=extras/gudev \ + --library-path=$(top_builddir)/src \ + --library-path=$(top_builddir)/src/extras/gudev \ --output $@ \ --pkg=glib-2.0 \ --pkg=gobject-2.0 \ - -I$(top_builddir)/extras \ - -I$(top_srcdir)/extras \ + --pkg-export=gudev-1.0 \ + --c-include=gudev/gudev.h \ + -I$(top_srcdir)/src/extras \ + -I$(top_builddir)/src/extras \ -D_GUDEV_COMPILATION \ -D_GUDEV_WORK_AROUND_DEV_T_BUG \ - $(top_srcdir)/extras/gudev/gudev.h \ - $(top_srcdir)/extras/gudev/gudevtypes.h \ - $(top_srcdir)/extras/gudev/gudevenums.h \ - $(or $(wildcard $(top_builddir)/extras/gudev/gudevenumtypes.h),$(top_srcdir)/extras/gudev/gudevenumtypes.h) \ - $(top_srcdir)/extras/gudev/gudevclient.h \ - $(top_srcdir)/extras/gudev/gudevdevice.h \ - $(top_srcdir)/extras/gudev/gudevclient.c \ - $(top_srcdir)/extras/gudev/gudevdevice.c - -extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER) + $(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) $(AM_V_GEN)g-ir-compiler $< -o $@ girdir = $(GIRDIR) -gir_DATA = extras/gudev/GUdev-1.0.gir +gir_DATA = src/extras/gudev/GUdev-1.0.gir typelibsdir = $(GIRTYPELIBDIR) -typelibs_DATA = extras/gudev/GUdev-1.0.typelib +typelibs_DATA = src/extras/gudev/GUdev-1.0.typelib CLEANFILES += $(gir_DATA) $(typelibs_DATA) endif # ENABLE_INTROSPECTION @@ -448,182 +523,187 @@ libgudev-uninstall-move-hook: INSTALL_EXEC_HOOKS += libgudev-install-move-hook UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook +endif +if ENABLE_KEYMAP # ------------------------------------------------------------------------------ -# Bluetooth HID devices with special magic to switch the device +# keymap - map custom hardware's multimedia keys # ------------------------------------------------------------------------------ -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 +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) -# ------------------------------------------------------------------------------ -# 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 +pkglibexec_PROGRAMS += src/extras/keymap/keymap +dist_doc_DATA = src/extras/keymap/README.keymap.txt -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 +dist_udevrules_DATA += \ + src/extras/keymap/95-keymap.rules \ + src/extras/keymap/95-keyboard-force-release.rules -INSTALL_EXEC_HOOKS += udevacl-install-hook +dist_udevhome_SCRIPTS += src/extras/keymap/findkeyboards +udevhome_SCRIPTS += src/extras/keymap/keyboard-force-release.sh -# ------------------------------------------------------------------------------ -# usb-db - read USB 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 +EXTRA_DIST += \ + src/extras/keymap/check-keymaps.sh \ + src/extras/keymap/keyboard-force-release.sh.in -# ------------------------------------------------------------------------------ -# 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 +CLEANFILES += \ + src/extras/keymap/keys.txt \ + src/extras/keymap/keys-from-name.gperf \ + src/extras/keymap/keyboard-force-release.sh -# ------------------------------------------------------------------------------ -# 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) +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_pa_2548 \ + src/extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \ + src/extras/keymap/keymaps/fujitsu-amilo_pro_v3205 \ + src/extras/keymap/keymaps/fujitsu-amilo_si_1520 \ + src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 \ + src/extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 \ + src/extras/keymap/keymaps/genius-slimstar-320 \ + src/extras/keymap/keymaps/hewlett-packard \ + src/extras/keymap/keymaps/hewlett-packard-2510p_2530p \ + src/extras/keymap/keymaps/hewlett-packard-compaq_elitebook \ + src/extras/keymap/keymaps/hewlett-packard-pavilion \ + src/extras/keymap/keymaps/hewlett-packard-presario-2100 \ + src/extras/keymap/keymaps/hewlett-packard-tablet \ + src/extras/keymap/keymaps/hewlett-packard-tx2 \ + src/extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ + src/extras/keymap/keymaps/inventec-symphony_6.0_7.0 \ + src/extras/keymap/keymaps/lenovo-3000 \ + src/extras/keymap/keymaps/lenovo-ideapad \ + src/extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ + src/extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \ + src/extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \ + src/extras/keymap/keymaps/lg-x110 \ + src/extras/keymap/keymaps/logitech-wave \ + src/extras/keymap/keymaps/logitech-wave-cordless \ + src/extras/keymap/keymaps/logitech-wave-pro-cordless \ + src/extras/keymap/keymaps/maxdata-pro_7000 \ + src/extras/keymap/keymaps/medion-fid2060 \ + src/extras/keymap/keymaps/medionnb-a555 \ + src/extras/keymap/keymaps/micro-star \ + src/extras/keymap/keymaps/module-asus-w3j \ + src/extras/keymap/keymaps/module-ibm \ + src/extras/keymap/keymaps/module-lenovo \ + src/extras/keymap/keymaps/module-sony \ + src/extras/keymap/keymaps/module-sony-old \ + src/extras/keymap/keymaps/module-sony-vgn \ + src/extras/keymap/keymaps/olpc-xo \ + src/extras/keymap/keymaps/onkyo \ + src/extras/keymap/keymaps/oqo-model2 \ + src/extras/keymap/keymaps/samsung-other \ + src/extras/keymap/keymaps/samsung-sq1us \ + src/extras/keymap/keymaps/samsung-sx20s \ + src/extras/keymap/keymaps/toshiba-satellite_a100 \ + src/extras/keymap/keymaps/toshiba-satellite_a110 \ + src/extras/keymap/keymaps/toshiba-satellite_m30x \ + src/extras/keymap/keymaps/zepto-znote + +udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release +dist_udevkeymapforcerel_DATA = \ + 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 -dist_udevrules_DATA += \ - extras/mobile-action-modeswitch/61-mobile-action.rules +src/extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h + $(AM_V_at)mkdir -p src/extras/keymap + $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ -libexec_PROGRAMS += extras/mobile-action-modeswitch/mobile-action-modeswitch +src/extras/keymap/keys-from-name.gperf: src/extras/keymap/keys.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@ -# ------------------------------------------------------------------------------ -# 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 +src/extras/keymap/keys-from-name.h: src/extras/keymap/keys-from-name.gperf Makefile + $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@ -extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS) +src/extras/keymap/keys-to-name.h: src/extras/keymap/keys.txt Makefile + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@ -dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules +keymaps-distcheck-hook: src/extras/keymap/keys.txt + $(top_srcdir)/src/extras/keymap/check-keymaps.sh $(top_srcdir) $^ +DISTCHECK_HOOKS += keymaps-distcheck-hook +endif -libexec_PROGRAMS += extras/mtd_probe/mtd_probe - +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 +endif +if ENABLE_RULE_GENERATOR # ------------------------------------------------------------------------------ -# keymap - map custom hardware's multimedia keys +# rule_generator - persistent network and optical device rule generator # ------------------------------------------------------------------------------ -extras_keymap_keymap_SOURCES = extras/keymap/keymap.c -extras_keymap_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I extras/keymap -nodist_extras_keymap_keymap_SOURCES = \ - extras/keymap/keys-from-name.h \ - extras/keymap/keys-to-name.h -BUILT_SOURCES += $(nodist_extras_keymap_keymap_SOURCES) - -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_udevhome_SCRIPTS += \ + src/extras/rule_generator/write_cd_rules \ + src/extras/rule_generator/write_net_rules -CLEANFILES += \ - extras/keymap/keys.txt \ - extras/keymap/keys-from-name.gperf +dist_udevhome_DATA += \ + src/extras/rule_generator/rule_generator.functions -udevkeymapdir = $(libexecdir)/keymaps -dist_udevkeymap_DATA = \ - extras/keymap/keymaps/acer \ - extras/keymap/keymaps/acer-aspire_5720 \ - 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/everex-xt5000 \ - extras/keymap/keymaps/fujitsu-amilo_pa_2548 \ - extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \ - extras/keymap/keymaps/fujitsu-amilo_pro_v3205 \ - extras/keymap/keymaps/fujitsu-amilo_si_1520 \ - extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 \ - extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 \ - extras/keymap/keymaps/hewlett-packard \ - extras/keymap/keymaps/hewlett-packard-2510p_2530p \ - extras/keymap/keymaps/hewlett-packard-compaq_elitebook \ - extras/keymap/keymaps/hewlett-packard-pavilion \ - extras/keymap/keymaps/hewlett-packard-presario-2100 \ - extras/keymap/keymaps/hewlett-packard-tablet \ - extras/keymap/keymaps/hewlett-packard-tx2 \ - extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ - extras/keymap/keymaps/inventec-symphony_6.0_7.0 \ - extras/keymap/keymaps/lenovo-3000 \ - extras/keymap/keymaps/lenovo-ideapad \ - extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ - extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \ - extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \ - extras/keymap/keymaps/lg-x110 \ - extras/keymap/keymaps/logitech-wave \ - extras/keymap/keymaps/logitech-wave-cordless \ - extras/keymap/keymaps/logitech-wave-pro-cordless \ - extras/keymap/keymaps/maxdata-pro_7000 \ - extras/keymap/keymaps/medion-fid2060 \ - extras/keymap/keymaps/medionnb-a555 \ - extras/keymap/keymaps/micro-star \ - extras/keymap/keymaps/module-asus-w3j \ - extras/keymap/keymaps/module-ibm \ - extras/keymap/keymaps/module-lenovo \ - extras/keymap/keymaps/module-sony \ - extras/keymap/keymaps/module-sony-old \ - extras/keymap/keymaps/module-sony-vgn \ - extras/keymap/keymaps/olpc-xo \ - extras/keymap/keymaps/onkyo \ - extras/keymap/keymaps/oqo-model2 \ - extras/keymap/keymaps/samsung-other \ - extras/keymap/keymaps/samsung-sq1us \ - extras/keymap/keymaps/samsung-sx20s \ - extras/keymap/keymaps/toshiba-satellite_a100 \ - extras/keymap/keymaps/toshiba-satellite_a110 \ - extras/keymap/keymaps/toshiba-satellite_m30x \ - extras/keymap/keymaps/zepto-znote - -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 - -extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h - $(AM_V_at)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/' > $@ +dist_udevrules_DATA += \ + src/extras/rule_generator/75-cd-aliases-generator.rules \ + src/extras/rule_generator/75-persistent-net-generator.rules +endif -extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt - $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@ +if ENABLE_UDEV_ACL +# ------------------------------------------------------------------------------ +# udev_acl - apply ACLs for users with local forground sessions +# ------------------------------------------------------------------------------ +src_udev_acl_SOURCES = src/extras/udev-acl/udev-acl.c +src_udev_acl_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) +src_udev_acl_LDADD = src/libudev-private.la -lacl $(GLIB_LIBS) +dist_udevrules_DATA += src/extras/udev-acl/70-udev-acl.rules +pkglibexec_PROGRAMS += src/udev-acl -extras/keymap/keys-from-name.h: extras/keymap/keys-from-name.gperf Makefile - $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@ +udevacl-install-hook: + mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d + ln -sf $(libexecdir)/udev/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck -extras/keymap/keys-to-name.h: extras/keymap/keys.txt Makefile - $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@ +INSTALL_EXEC_HOOKS += udevacl-install-hook +endif -keymaps-distcheck-hook: extras/keymap/keys.txt - $(top_srcdir)/extras/keymap/check-keymaps.sh $(top_srcdir) $^ -DISTCHECK_HOOKS += keymaps-distcheck-hook +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_LDADD = src/libudev-private.la +pkglibexec_PROGRAMS += src/create_floppy_devices +dist_udevrules_DATA += src/extras/floppy/60-floppy.rules +endif -endif # ENABLE_EXTRAS +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 +endif # ------------------------------------------------------------------------------ # install, uninstall, clean hooks @@ -634,14 +714,13 @@ clean-local: 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) -EXTRA_DIST += test/rule-syntax-check.py - install-exec-hook: $(INSTALL_EXEC_HOOKS) install-data-hook: $(INSTALL_DATA_HOOKS) @@ -650,6 +729,8 @@ uninstall-hook: $(UNINSTALL_EXEC_HOOKS) distcheck-hook: $(DISTCHECK_HOOKS) +distclean-local: $(DISTCLEAN_LOCAL_HOOKS) + # ------------------------------------------------------------------------------ # custom release helpers # ------------------------------------------------------------------------------ @@ -675,10 +756,24 @@ git-release: 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 + +git-sync: + git push + git push --tags $(VERSION) + +tar: + make distcheck + xz -d -c udev-$(VERSION).tar.xz | gpg --armor --detach-sign --output udev-$(VERSION).tar.sign + +tar-sync: + kup put udev-$(VERSION).tar.xz udev-$(VERSION).tar.sign /pub/linux/utils/kernel/hotplug/ doc-sync: - 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/ + for i in src/*.html; do rm -f $$i.sign; gpg --armor --detach-sign --output=$$i.sign $$i; done + 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