keymap: Move reading of event in separate function

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4dbdfd97e3d6c89d8b1378fb7a3385f03df3c54b..2e3fe3942587a74072575c3d54a9ad69168ee000 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,9 +34,9 @@ DISTCHECK_HOOKS =
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=9
-LIBUDEV_REVISION=3
-LIBUDEV_AGE=9
+LIBUDEV_CURRENT=10
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=10
 
 SUBDIRS += libudev/docs
 
@@ -174,14 +174,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
 # ------------------------------------------------------------------------------
@@ -321,9 +329,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 +342,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 +357,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 +429,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 $@
@@ -587,6 +600,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 +614,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 +693,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/