X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=caca2555ff29e3da4ac27e83d5d6c10316b8a6b1;hb=d43099830bca103cb016dc6446ffb2074573fcf8;hp=7403949cf31948496943a9e9d6ce4450f0fa473e;hpb=4101ce14b3f6646f3468f6a489d87d057aab7163;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 7403949cf..caca2555f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,9 @@ CLEANFILES =
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=7
-LIBUDEV_REVISION=0
-LIBUDEV_AGE=7
+LIBUDEV_CURRENT=8
+LIBUDEV_REVISION=2
+LIBUDEV_AGE=8
 
 SUBDIRS += libudev/docs
 
@@ -69,7 +69,7 @@ endif
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libudev/libudev.pc
 
-EXTRA_DIST += libudev/exported_symbols
+EXTRA_DIST += libudev/exported_symbols libudev/COPYING
 # move lib from $(libdir) to $(rootlib_execdir) and update devel link, if needed
 libudev-install-move-hook:
 	if test "$(libdir)" != "$(rootlib_execdir)"; then \
@@ -91,11 +91,11 @@ UNINSTALL_EXEC_HOOKS = libudev-uninstall-move-hook
 # ------------------------------------------------------------------------------
 install-data-local:
 	-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
+	-mkdir -p $(DESTDIR)$(libexecdir)/devices
 
 EXTRA_DIST += \
-	rules/packages \
-	rules/redhat \
-	rules/suse \
+	rules/arch \
+	rules/misc \
 	rules/gentoo
 
 udevrulesdir = $(libexecdir)/rules.d
@@ -156,7 +156,7 @@ EXTRA_DIST += \
 	udev/udevd.xml
 
 %.7 %.8 : %.xml
-	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+	$(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 # ------------------------------------------------------------------------------
 # udev tests
@@ -351,6 +351,7 @@ extras_gudev_libgudev_1_0_la_LDFLAGS = \
 	-export-symbols-regex '^g_udev_.*'
 
 EXTRA_DIST += \
+	extras/gudev/COPYING \
 	extras/gudev/gudevmarshal.list \
 	extras/gudev/gudevenumtypes.h.template \
 	extras/gudev/gudevenumtypes.c.template
@@ -544,7 +545,7 @@ dist_udevkeymapforcerel_DATA = \
 	extras/keymap/force-release-maps/common-volume-keys
 
 extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
-	mkdir -p extras/keymap
+	$(AM_V_at)mkdir -p extras/keymap
 	$(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
 extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt