udevd: fix unref'ing of device in error path

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1916770a01fb05783ee05266b2393b5b46015637..e80d43abe559bf906abcf170e364bfe4fc4b56b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,16 +21,17 @@ AM_LDFLAGS = \
        -Wl,--as-needed
 
 DISTCHECK_CONFIGURE_FLAGS = \
-       --enable-gtk-doc
+       --enable-gtk-doc \
+       --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
 CLEANFILES =
 
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=8
-LIBUDEV_REVISION=3
-LIBUDEV_AGE=8
+LIBUDEV_CURRENT=9
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=9
 
 SUBDIRS += libudev/docs
 
@@ -114,6 +115,13 @@ dist_udevconf_DATA = udev.conf
 sharepkgconfigdir = $(datadir)/pkgconfig
 sharepkgconfig_DATA = udev/udev.pc
 
+if WITH_SYSTEMD
+systemdsystemunit_DATA = \
+       init/udev.service \
+       init/udev-settle.service \
+       init/udev-retry.service
+endif
+
 sbin_PROGRAMS = \
        udev/udevd \
        udev/udevadm
@@ -373,7 +381,7 @@ extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gud
 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 \
+       LD_LIBRARY_PATH=$(top_builddir)/extras/gudev:$$LD_LIBRARY_PATH \
        $(G_IR_SCANNER) -v \
                --namespace GUdev \
                --nsversion=1.0 \
@@ -526,6 +534,7 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/hewlett-packard-presario-2100 \
        extras/keymap/keymaps/hewlett-packard-tablet \
        extras/keymap/keymaps/hewlett-packard-tx2 \
+       extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
        extras/keymap/keymaps/inventec-symphony_6.0_7.0 \
        extras/keymap/keymaps/lenovo-3000 \
        extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
@@ -534,6 +543,7 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/lg-x110 \
        extras/keymap/keymaps/logitech-wave \
        extras/keymap/keymaps/logitech-wave-cordless \
+       extras/keymap/keymaps/logitech-wave-pro-cordless \
        extras/keymap/keymaps/maxdata-pro_7000 \
        extras/keymap/keymaps/medion-fid2060 \
        extras/keymap/keymaps/medionnb-a555 \