X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=3d9773b658094eba2a321343fe99c587e20554a4;hp=994092775b8563b895e77ad11ed90052e2053053;hb=392ef7a28a7003a11f5e1e56617551ff5b9eabf9;hpb=326e15a8ed97a22f2fe52d203896763d75f93c2c diff --git a/Makefile.am b/Makefile.am index 994092775..3d9773b65 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,16 +21,22 @@ AM_LDFLAGS = \ -Wl,--as-needed DISTCHECK_CONFIGURE_FLAGS = \ - --enable-gtk-doc + --enable-gtk-doc \ + --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) CLEANFILES = +INSTALL_EXEC_HOOKS = +INSTALL_DATA_HOOKS = +UNINSTALL_EXEC_HOOKS = +DISTCHECK_HOOKS = + # ------------------------------------------------------------------------------ # libudev # ------------------------------------------------------------------------------ -LIBUDEV_CURRENT=5 +LIBUDEV_CURRENT=9 LIBUDEV_REVISION=1 -LIBUDEV_AGE=5 +LIBUDEV_AGE=9 SUBDIRS += libudev/docs @@ -69,7 +75,7 @@ endif pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libudev/libudev.pc -EXTRA_DIST += libudev/exported_symbols +EXTRA_DIST += libudev/exported_symbols 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 \ @@ -83,20 +89,21 @@ libudev-install-move-hook: 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/packages \ - rules/redhat \ - rules/suse \ - rules/gentoo + rules/arch \ + rules/misc udevrulesdir = $(libexecdir)/rules.d dist_udevrules_DATA = \ @@ -115,6 +122,21 @@ dist_udevconf_DATA = udev.conf sharepkgconfigdir = $(datadir)/pkgconfig sharepkgconfig_DATA = udev/udev.pc +if WITH_SYSTEMD +systemdsystemunit_DATA = \ + init/udev.service \ + init/udev-settle.service \ + init/udev-retry.service + +systemd-install-hook: + 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 + +INSTALL_DATA_HOOKS += systemd-install-hook +endif + sbin_PROGRAMS = \ udev/udevd \ udev/udevadm @@ -128,7 +150,9 @@ udev_common_sources =\ udev_udevd_SOURCES = \ $(udev_common_sources) \ - udev/udevd.c + udev/udevd.c \ + udev/sd-daemon.h \ + udev/sd-daemon.c udev_udevd_LDADD = libudev/libudev-private.la udev_udevadm_SOURCES = \ @@ -143,12 +167,8 @@ udev_udevadm_SOURCES = \ 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 \ @@ -160,12 +180,12 @@ EXTRA_DIST += \ udev/udevd.xml %.7 %.8 : %.xml - $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< + $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< # ------------------------------------------------------------------------------ # udev tests # ------------------------------------------------------------------------------ -TESTS = test/udev-test.pl +TESTS = test/udev-test.pl test/rules-test.sh check_PROGRAMS = \ libudev/test-libudev \ @@ -179,16 +199,10 @@ udev_test_udev_SOURCES = \ 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 @@ -199,12 +213,21 @@ dist_udevrules_DATA += \ 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 +extras_firmware_firmware_CPPFLAGS = $(AM_CPPFLAGS) -DFIRMWARE_PATH="$(FIRMWARE_PATH)" +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 @@ -235,11 +258,13 @@ dist_udevrules_DATA += extras/edd_id/61-persistent-storage-edd.rules 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 # ------------------------------------------------------------------------------ -# usb_id - USB device property import +# 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 # ------------------------------------------------------------------------------ @@ -350,6 +375,7 @@ extras_gudev_libgudev_1_0_la_LDFLAGS = \ -export-symbols-regex '^g_udev_.*' EXTRA_DIST += \ + extras/gudev/COPYING \ extras/gudev/gudevmarshal.list \ extras/gudev/gudevenumtypes.h.template \ extras/gudev/gudevenumtypes.c.template @@ -372,7 +398,7 @@ extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gud 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=$(top_builddir)/extras/gudev:$$LD_LIBRARY_PATH \ $(G_IR_SCANNER) -v \ --namespace GUdev \ --nsversion=1.0 \ @@ -382,13 +408,14 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefil --output $@ \ --pkg=glib-2.0 \ --pkg=gobject-2.0 \ + -I$(top_builddir)/extras \ -I$(top_srcdir)/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 \ - $(top_builddir)/extras/gudev/gudevenumtypes.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 \ @@ -447,24 +474,36 @@ extras_usb_db_pci_db_LDADD = libudev/libudev-private.la 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/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) -libexec_PROGRAMS += extras/modem-modeswitch/modem-modeswitch +dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules + +libexec_PROGRAMS += extras/mtd_probe/mtd_probe + # ------------------------------------------------------------------------------ # keymap - map custom hardware's multimedia keys @@ -478,8 +517,10 @@ 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 CLEANFILES += \ @@ -510,12 +551,17 @@ dist_udevkeymap_DATA = \ 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 \ @@ -525,15 +571,24 @@ dist_udevkeymap_DATA = \ extras/keymap/keymaps/module-lenovo \ extras/keymap/keymaps/module-sony \ extras/keymap/keymaps/module-sony-old \ + 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 -extras/keymap/keys.txt: /usr/include/linux/input.h +udevkeymapforcereldir = $(libexecdir)/keymaps/force-release +dist_udevkeymapforcerel_DATA = \ + 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/' > $@ extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt @@ -547,7 +602,7 @@ extras/keymap/keys-to-name.h: extras/keymap/keys.txt Makefile 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 # ENABLE_EXTRAS @@ -566,9 +621,12 @@ CLEANFILES += \ $(BUILT_SOURCES) EXTRA_DIST += $(TESTS) +EXTRA_DIST += test/rule-syntax-check.py install-exec-hook: $(INSTALL_EXEC_HOOKS) +install-data-hook: $(INSTALL_DATA_HOOKS) + uninstall-hook: $(UNINSTALL_EXEC_HOOKS) distcheck-hook: $(DISTCHECK_HOOKS)