X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=95cb52cdda2d8b6ef3d8b2cccf228de6fc4fc283;hb=b618e9957b2bd8a4484368620b71ca16fef0c9e6;hp=1de4b27af0853706c1d66dff2e67c47c28fc68d4;hpb=6528a3938fe8727b99b210cf504a335d07c94c37;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 1de4b27af..95cb52cdd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,6 @@ AM_LDFLAGS = \
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-debug \
 	--enable-rule_generator \
-	--enable-udev_acl \
 	--enable-floppy \
 	--enable-edd \
 	--with-selinux \
@@ -269,10 +268,12 @@ src_udevadm_CPPFLAGS = $(udev_common_CPPFLAGS)
 # ------------------------------------------------------------------------------
 # udev man pages
 # ------------------------------------------------------------------------------
+if ENABLE_MANPAGES
 dist_man_MANS += \
 	src/udev.7 \
 	src/udevadm.8 \
 	src/udevd.8
+endif
 
 EXTRA_DIST += \
 	src/udev.xml \
@@ -312,13 +313,12 @@ src_test_udev_SOURCES = \
 src_test_udev_CFLAGS = $(udev_common_CFLAGS)
 src_test_udev_LDADD = $(udev_common_LDADD)
 src_test_udev_CPPFLAGS = $(udev_common_CPPFLAGS)
+src_test_udev_DEPENDENCIES = test/sys
 
 # packed sysfs test tree
-test/sys/kernel/uevent_seqnum:
+test/sys:
 	$(AM_V_GEN)mkdir -p test && tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
 
-BUILT_SOURCES += test/sys/kernel/uevent_seqnum
-
 test-sys-distclean:
 	-rm -rf test/sys
 DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
@@ -574,6 +574,7 @@ dist_udevkeymap_DATA = \
 	src/extras/keymap/keymaps/dell \
 	src/extras/keymap/keymaps/dell-latitude-xt2 \
 	src/extras/keymap/keymaps/everex-xt5000 \
+	src/extras/keymap/keymaps/fujitsu-amilo_li_2732 \
 	src/extras/keymap/keymaps/fujitsu-amilo_pa_2548 \
 	src/extras/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
 	src/extras/keymap/keymaps/fujitsu-amilo_pro_v3205 \
@@ -674,23 +675,6 @@ dist_udevrules_DATA += \
 	src/extras/rule_generator/75-persistent-net-generator.rules
 endif
 
-if ENABLE_UDEV_ACL
-# ------------------------------------------------------------------------------
-# udev_acl - apply ACLs for users with local forground sessions
-# ------------------------------------------------------------------------------
-src_udev_acl_SOURCES = src/extras/udev-acl/udev-acl.c
-src_udev_acl_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
-src_udev_acl_LDADD = src/libudev-private.la -lacl $(GLIB_LIBS)
-dist_udevrules_DATA += src/extras/udev-acl/70-udev-acl.rules
-pkglibexec_PROGRAMS += src/udev-acl
-
-udevacl-install-hook:
-	mkdir -p $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d
-	ln -sf $(libexecdir)/udev/udev-acl $(DESTDIR)$(prefix)/lib/ConsoleKit/run-seat.d/udev-acl.ck
-
-INSTALL_EXEC_HOOKS += udevacl-install-hook
-endif
-
 if ENABLE_FLOPPY
 # ------------------------------------------------------------------------------
 # create_floppy_devices - historical floppy kernel device nodes (/dev/fd0h1440, ...)