X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=743c5b84cc5fd9adf987681a52f8061e93573bae;hp=d785f05611ce33e780cb212c38ff83d49a9d6f8e;hb=6714dc2015bc1aea08e3b5b8ae0557c7691191e6;hpb=5daaf29d7194970d102b866f674eff7c1ba514a9 diff --git a/Makefile.am b/Makefile.am index d785f0561..743c5b84c 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_CURRENT=6 LIBUDEV_REVISION=0 -LIBUDEV_AGE=5 +LIBUDEV_AGE=6 SUBDIRS += libudev/docs @@ -180,16 +179,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 +193,20 @@ 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 +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 +237,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.la +libexec_PROGRAMS += extras/input_id/input_id # ------------------------------------------------------------------------------ # path_id - compose identifier of persistent elements of the parent buses @@ -259,8 +268,7 @@ 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/bsg.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 @@ -336,7 +344,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) @@ -366,8 +373,10 @@ 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 \ $(G_IR_SCANNER) -v \ --namespace GUdev \ --nsversion=1.0 \ @@ -377,13 +386,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 +402,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 @@ -422,8 +430,8 @@ dist_udevrules_DATA += extras/udev-acl/70-acl.rules libexec_PROGRAMS += extras/udev-acl/udev-acl udevacl-install-hook: - mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d - ln -sf $(libexecdir)/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-session.d/udev-acl.ck + 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 @@ -439,7 +447,7 @@ libexec_PROGRAMS += extras/usb-db/usb-db # 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=\"$(USB_DATABASE)\" -DBUILD_FOR_PCI +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 @@ -475,8 +483,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 +496,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 +519,11 @@ 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/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,6 +533,7 @@ 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 \ @@ -527,8 +542,13 @@ dist_udevkeymap_DATA = \ extras/keymap/keymaps/toshiba-satellite_a110 \ extras/keymap/keymaps/zepto-znote +udevkeymapforcereldir = $(libexecdir)/keymaps/force-release +dist_udevkeymapforcerel_DATA = \ + extras/keymap/keymaps/force-release/samsung-other + extras/keymap/keys.txt: /usr/include/linux/input.h - $(AM_V_GEN)$(AWK) '/^#define.*KEY_/ { if ($$2 != "KEY_MAX" && $$2 != "KEY_CNT") { print $$2 } }' < $< > $@ + 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 }' < $< > $@