X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=1916770a01fb05783ee05266b2393b5b46015637;hp=728076a452baabb6ea532721b56752ceb46efab9;hb=cbcb846a4c9c9b8215a3f484d70e3cefde5ba226;hpb=26420abf5400bf047e4f861b6dba01b8934705a6 diff --git a/Makefile.am b/Makefile.am index 728076a45..1916770a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,9 +28,9 @@ CLEANFILES = # ------------------------------------------------------------------------------ # libudev # ------------------------------------------------------------------------------ -LIBUDEV_CURRENT=6 -LIBUDEV_REVISION=1 -LIBUDEV_AGE=6 +LIBUDEV_CURRENT=8 +LIBUDEV_REVISION=3 +LIBUDEV_AGE=8 SUBDIRS += libudev/docs @@ -69,7 +69,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 \ @@ -91,12 +91,11 @@ UNINSTALL_EXEC_HOOKS = libudev-uninstall-move-hook # ------------------------------------------------------------------------------ install-data-local: -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d + -mkdir -p $(DESTDIR)$(libexecdir)/devices EXTRA_DIST += \ - rules/packages \ - rules/redhat \ - rules/suse \ - rules/gentoo + rules/arch \ + rules/misc udevrulesdir = $(libexecdir)/rules.d dist_udevrules_DATA = \ @@ -156,7 +155,7 @@ 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 @@ -194,6 +193,7 @@ dist_udevrules_DATA += \ # ------------------------------------------------------------------------------ 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 @@ -239,7 +239,7 @@ 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.la +extras_input_id_input_id_LDADD = libudev/libudev-private.la libexec_PROGRAMS += extras/input_id/input_id # ------------------------------------------------------------------------------ @@ -350,6 +350,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 @@ -448,24 +449,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/modem-modeswitch/modem-modeswitch +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 + # ------------------------------------------------------------------------------ # keymap - map custom hardware's multimedia keys @@ -518,6 +531,7 @@ dist_udevkeymap_DATA = \ 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 \ @@ -536,14 +550,16 @@ dist_udevkeymap_DATA = \ 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/samsung-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 - mkdir -p extras/keymap + $(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