chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
libudev: list - use bit flags for 'sort' and 'unique'
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index fd13005f353bf9b3bed0549bc6a64666f0eacc3f..2aff45e2a912b937deb3f45341235f5b47bbd99a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,9 +34,9 @@ DISTCHECK_HOOKS =
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=9
-LIBUDEV_REVISION=2
-LIBUDEV_AGE=9
+LIBUDEV_CURRENT=11
+LIBUDEV_REVISION=3
+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
 # ------------------------------------------------------------------------------
@@ -274,14 +286,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 +313,11 @@ 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
 
+# ------------------------------------------------------------------------------
+# 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 +330,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 +343,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 +358,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 +430,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,12 +561,14 @@ 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 \
        extras/keymap/keymaps/asus \
        extras/keymap/keymaps/compaq-e_evo \
        extras/keymap/keymaps/dell \
+       extras/keymap/keymaps/dell-latitude-xt2 \
        extras/keymap/keymaps/everex-xt5000 \
        extras/keymap/keymaps/fujitsu-amilo_pa_2548 \
        extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
@@ -587,6 +603,7 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/module-lenovo \
        extras/keymap/keymaps/module-sony \
        extras/keymap/keymaps/module-sony-old \
+       extras/keymap/keymaps/module-sony-vgn \
        extras/keymap/keymaps/olpc-xo \
        extras/keymap/keymaps/onkyo \
        extras/keymap/keymaps/oqo-model2 \
@@ -600,6 +617,8 @@ dist_udevkeymap_DATA = \
 
 udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
+       extras/keymap/force-release-maps/dell-touchpad \
+       extras/keymap/force-release-maps/hp-other \
        extras/keymap/force-release-maps/samsung-other \
        extras/keymap/force-release-maps/common-volume-keys
 
@@ -677,5 +696,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/
Unnamed repository; edit this file 'description' to name the repository.