X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=acad5eca185ef9b83cfb18daea46dce7bafd4d67;hb=1f7d0a68eae73f78c08b884a4440df6dfe96f252;hp=a67e2f34fabf739362b5f2d32f0ada7e80f323cf;hpb=af9cfc11909b3c33f86f495fc0a48e53fdabb32d;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index a67e2f34f..acad5eca1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
 
 SUBDIRS = .
 
-EXTRA_DIST = autogen.sh
+EXTRA_DIST =
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
@@ -61,6 +61,7 @@ libudev_libudev_la_SOURCES =\
 	libudev/libudev-queue.c
 
 libudev_libudev_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
 	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
 noinst_LTLIBRARIES = \
@@ -113,14 +114,16 @@ EXTRA_DIST += \
 udevrulesdir = $(libexecdir)/rules.d
 dist_udevrules_DATA = \
 	rules/rules.d/50-udev-default.rules \
-	rules/rules.d/60-persistent-storage.rules \
 	rules/rules.d/60-persistent-storage-tape.rules \
 	rules/rules.d/60-persistent-serial.rules \
 	rules/rules.d/60-persistent-input.rules \
 	rules/rules.d/60-persistent-alsa.rules \
-	rules/rules.d/80-drivers.rules \
 	rules/rules.d/95-udev-late.rules
 
+udevrules_DATA = \
+	rules/rules.d/60-persistent-storage.rules \
+	rules/rules.d/80-drivers.rules
+
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = udev.conf
 
@@ -129,15 +132,15 @@ sharepkgconfig_DATA = udev/udev.pc
 
 if WITH_SYSTEMD
 systemdsystemunit_DATA = \
-	init/udev-control.socket \
-	init/udev-kernel.socket \
-	init/udev.service \
-	init/udev-trigger.service \
-	init/udev-settle.service
+	systemd/udev-control.socket \
+	systemd/udev-kernel.socket \
+	systemd/udev.service \
+	systemd/udev-trigger.service \
+	systemd/udev-settle.service
 
 EXTRA_DIST += \
-	init/udev-control.socket \
-	init/udev-kernel.socket
+	systemd/udev-control.socket \
+	systemd/udev-kernel.socket
 
 systemd-install-hook:
 	mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
@@ -150,7 +153,7 @@ systemd-install-hook:
 INSTALL_DATA_HOOKS += systemd-install-hook
 endif
 
-sbin_PROGRAMS = \
+bin_PROGRAMS = \
 	udev/udevadm
 
 libexec_PROGRAMS = \
@@ -298,7 +301,7 @@ if ENABLE_GUDEV
 # GUdev - libudev gobject interface
 # ------------------------------------------------------------------------------
 LIBGUDEV_CURRENT=1
-LIBGUDEV_REVISION=0
+LIBGUDEV_REVISION=1
 LIBGUDEV_AGE=1
 
 SUBDIRS += extras/gudev/docs