X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=df70bf73be35bb5b592f0816e3e743f256d47371;hp=891440cf73dee05afa7097c693e801ad3455ce15;hb=ce440d1c1bcd9ac05a34bd987bc68744270214d7;hpb=a2f8d214310b5b8d76169ce5a517afb3f74072c0 diff --git a/Makefile.am b/Makefile.am index 891440cf7..df70bf73b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,9 +34,9 @@ DISTCHECK_HOOKS = # ------------------------------------------------------------------------------ # libudev # ------------------------------------------------------------------------------ -LIBUDEV_CURRENT=9 -LIBUDEV_REVISION=3 -LIBUDEV_AGE=9 +LIBUDEV_CURRENT=11 +LIBUDEV_REVISION=1 +LIBUDEV_AGE=11 SUBDIRS += libudev/docs @@ -124,15 +124,19 @@ sharepkgconfig_DATA = udev/udev.pc if WITH_SYSTEMD systemdsystemunit_DATA = \ + init/udev.socket \ init/udev.service \ - init/udev-settle.service \ - init/udev-retry.service + init/udev-trigger.service \ + init/udev-settle.service + +EXTRA_DIST += init/udev.socket systemd-install-hook: + mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants + ln -sf ../udev.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/udev.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 @@ -174,14 +178,22 @@ dist_man_MANS = \ udev/udevadm.8 \ udev/udevd.8 +dist_noinst_DATA = \ + udev/udev.html \ + udev/udevadm.html \ + udev/udevd.html + EXTRA_DIST += \ udev/udev.xml \ udev/udevadm.xml \ udev/udevd.xml -%.7 %.8 : %.xml +udev/%.7 udev/%.8 : udev/%.xml $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< +udev/%.html : udev/%.xml + $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< + # ------------------------------------------------------------------------------ # udev tests # ------------------------------------------------------------------------------ @@ -213,6 +225,7 @@ dist_udevrules_DATA += \ extras/rule_generator/75-cd-aliases-generator.rules \ extras/rule_generator/75-persistent-net-generator.rules +if ENABLE_EXTRAS # ------------------------------------------------------------------------------ # firmware - firmware loading # ------------------------------------------------------------------------------ @@ -274,14 +287,6 @@ 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 - # ------------------------------------------------------------------------------ # scsi_id - SCSI inquiry to get various serial numbers # ------------------------------------------------------------------------------ @@ -309,6 +314,13 @@ 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 +endif # ENABLE_EXTRAS + +# ------------------------------------------------------------------------------ +# qemu -- qemu/kvm guest tweaks +# ------------------------------------------------------------------------------ +dist_udevrules_DATA += extras/qemu/42-qemu-usb.rules + if ENABLE_EXTRAS # ------------------------------------------------------------------------------ # conditional extras (need glib, libusb, libacl, ...) @@ -321,9 +333,9 @@ dist_udevrules_DATA += \ # ------------------------------------------------------------------------------ # GUdev - libudev gobject interface # ------------------------------------------------------------------------------ -LIBGUDEV_CURRENT=0 -LIBGUDEV_REVISION=1 -LIBGUDEV_AGE=0 +LIBGUDEV_CURRENT=1 +LIBGUDEV_REVISION=0 +LIBGUDEV_AGE=1 SUBDIRS += extras/gudev/docs @@ -334,7 +346,8 @@ libgudev_include_HEADERS = \ extras/gudev/gudevenumtypes.h \ extras/gudev/gudevtypes.h \ extras/gudev/gudevclient.h \ - extras/gudev/gudevdevice.h + extras/gudev/gudevdevice.h \ + extras/gudev/gudevenumerator.h lib_LTLIBRARIES += extras/gudev/libgudev-1.0.la pkgconfig_DATA += extras/gudev/gudev-1.0.pc @@ -348,6 +361,8 @@ extras_gudev_libgudev_1_0_la_SOURCES = \ extras/gudev/gudevclient.c \ extras/gudev/gudevdevice.h \ extras/gudev/gudevdevice.c \ + extras/gudev/gudevenumerator.h \ + extras/gudev/gudevenumerator.c \ extras/gudev/gudevprivate.h dist_extras_gudev_libgudev_1_0_la_SOURCES = \ @@ -418,8 +433,10 @@ extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefil $(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/gudevenumerator.h \ $(top_srcdir)/extras/gudev/gudevclient.c \ - $(top_srcdir)/extras/gudev/gudevdevice.c + $(top_srcdir)/extras/gudev/gudevdevice.c \ + $(top_srcdir)/extras/gudev/gudevenumerator.c extras/gudev/GUdev-1.0.typelib: extras/gudev/GUdev-1.0.gir $(G_IR_COMPILER) $(AM_V_GEN)g-ir-compiler $< -o $@ @@ -547,6 +564,7 @@ udevkeymapdir = $(libexecdir)/keymaps dist_udevkeymap_DATA = \ extras/keymap/keymaps/acer \ extras/keymap/keymaps/acer-aspire_5720 \ + extras/keymap/keymaps/acer-aspire_8930 \ extras/keymap/keymaps/acer-aspire_5920g \ extras/keymap/keymaps/acer-aspire_6920 \ extras/keymap/keymaps/acer-travelmate_c300 \ @@ -680,5 +698,6 @@ git-release: git prune doc-sync: + rsync -av udev/*.html master.kernel.org:/pub/linux/utils/kernel/hotplug/udev/ 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/