release 174

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 563b09b97b362d1fbbdad677c0f08154bef99eb9..0cc45e6ff4f9211fee6ce367269620095cd90108 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ SUBDIRS = .
 
 EXTRA_DIST = autogen.sh
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 AM_MAKEFLAGS = --no-print-directory
 
@@ -41,9 +41,9 @@ dist_libexec_SCRIPTS =
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=12
-LIBUDEV_REVISION=1
-LIBUDEV_AGE=12
+LIBUDEV_CURRENT=13
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=13
 
 SUBDIRS += libudev/docs
 
@@ -151,9 +151,11 @@ INSTALL_DATA_HOOKS += systemd-install-hook
 endif
 
 sbin_PROGRAMS = \
-       udev/udevd \
        udev/udevadm
 
+libexec_PROGRAMS = \
+       udev/udevd
+
 udev_common_sources =\
        udev/udev.h \
        udev/udev-event.c \
@@ -233,7 +235,7 @@ extras_firmware_firmware_SOURCES = extras/firmware/firmware.c
 extras_firmware_firmware_LDADD = libudev/libudev-private.la
 extras_firmware_firmware_CPPFLAGS = $(AM_CPPFLAGS) -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
 dist_udevrules_DATA += extras/firmware/50-firmware.rules
-libexec_PROGRAMS = extras/firmware/firmware
+libexec_PROGRAMS += extras/firmware/firmware
 
 # ------------------------------------------------------------------------------
 # ata_id - ATA identify
@@ -496,6 +498,7 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/fujitsu-amilo_si_1520 \
        extras/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
        extras/keymap/keymaps/fujitsu-esprimo_mobile_v6 \
+       extras/keymap/keymaps/genius-slimstar-320 \
        extras/keymap/keymaps/hewlett-packard \
        extras/keymap/keymaps/hewlett-packard-2510p_2530p \
        extras/keymap/keymaps/hewlett-packard-compaq_elitebook \