X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=601246a9c99e1823adddc5aec08b156f83425c3e;hb=ab17a7ef55b2c3278839302cf3ba5d214d2b2b7d;hp=4dbdfd97e3d6c89d8b1378fb7a3385f03df3c54b;hpb=cdb1d7608a2e2ba708a890eeab6e5e99409a1953;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 4dbdfd97e..601246a9c 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=10
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=10
 
 SUBDIRS += libudev/docs
 
@@ -334,7 +334,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 +349,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 +421,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 +592,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 +606,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