X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=b0eeaf1224ad401874fedccef62567f083390648;hp=af321d8bdba088a5923d590507dfdf63b8485ff3;hb=e5e3f0ca642f3b2a1dcb7359fd2cf7fb6927a072;hpb=bded570432d7017c47882758b037e77f1ec8e79e diff --git a/Makefile.am b/Makefile.am index af321d8bd..b0eeaf122 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,17 +21,16 @@ AM_LDFLAGS = \ -Wl,--as-needed DISTCHECK_CONFIGURE_FLAGS = \ - --enable-gtk-doc \ - --enable-extras + --enable-gtk-doc CLEANFILES = # ------------------------------------------------------------------------------ # libudev # ------------------------------------------------------------------------------ -LIBUDEV_CURRENT=5 -LIBUDEV_REVISION=0 -LIBUDEV_AGE=5 +LIBUDEV_CURRENT=8 +LIBUDEV_REVISION=2 +LIBUDEV_AGE=8 SUBDIRS += libudev/docs @@ -70,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 \ @@ -95,7 +94,6 @@ install-data-local: EXTRA_DIST += \ rules/packages \ - rules/redhat \ rules/suse \ rules/gentoo @@ -144,12 +142,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 \ @@ -161,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 @@ -180,16 +174,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 @@ -200,12 +188,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 @@ -236,6 +233,14 @@ 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 + +# ------------------------------------------------------------------------------ +# 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 @@ -335,7 +340,6 @@ extras_gudev_libgudev_1_0_la_CPPFLAGS = \ -I$(top_srcdir)/extras/gudev \ -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ -D_GUDEV_COMPILATION \ - -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ -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) @@ -346,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 @@ -365,6 +370,7 @@ extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gud $(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 \ @@ -377,13 +383,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 \ - -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ + -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_srcdir)/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 \ @@ -392,14 +399,12 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefil extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER) $(AM_V_GEN)g-ir-compiler $< -o $@ -if ENABLE_INTROSPECTION girdir = $(GIRDIR) gir_DATA = extras/gudev/GUdev-1.0.gir typelibsdir = $(GIRTYPELIBDIR) typelibs_DATA = extras/gudev/GUdev-1.0.typelib -EXTRA_DIST += GUdev-1.0.gir CLEANFILES += $(gir_DATA) $(typelibs_DATA) endif # ENABLE_INTROSPECTION @@ -444,24 +449,21 @@ 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 # ------------------------------------------------------------------------------ # keymap - map custom hardware's multimedia keys @@ -475,8 +477,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 += \ @@ -486,6 +490,7 @@ CLEANFILES += \ 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 \ @@ -508,8 +513,12 @@ dist_udevkeymap_DATA = \ extras/keymap/keymaps/hewlett-packard-tx2 \ extras/keymap/keymaps/inventec-symphony_6.0_7.0 \ extras/keymap/keymaps/lenovo-3000 \ + extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \ extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \ + extras/keymap/keymaps/lg-x110 \ + extras/keymap/keymaps/logitech-wave \ + extras/keymap/keymaps/logitech-wave-cordless \ extras/keymap/keymaps/maxdata-pro_7000 \ extras/keymap/keymaps/medion-fid2060 \ extras/keymap/keymaps/medionnb-a555 \ @@ -519,16 +528,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/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 - $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[[:space:]]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ +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 $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@