remove udev-acl

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 04db95fce6323bb9d538c4234d09148a05c5c9f2..95cb52cdda2d8b6ef3d8b2cccf228de6fc4fc283 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,11 @@ AM_LDFLAGS = \
        -Wl,--as-needed
 
 DISTCHECK_CONFIGURE_FLAGS = \
+       --enable-debug \
+       --enable-rule_generator \
+       --enable-floppy \
+       --enable-edd \
+       --with-selinux \
        --enable-gtk-doc \
        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
@@ -77,7 +82,7 @@ SED_PROCESS = \
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=13
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=13
 
 SUBDIRS += src/docs
@@ -260,25 +265,27 @@ src_udevadm_CFLAGS = $(udev_common_CFLAGS)
 src_udevadm_LDADD = $(udev_common_LDADD)
 src_udevadm_CPPFLAGS = $(udev_common_CPPFLAGS)
 
-if HAVE_XSLTPROC
 # ------------------------------------------------------------------------------
 # udev man pages
 # ------------------------------------------------------------------------------
+if ENABLE_MANPAGES
 dist_man_MANS += \
        src/udev.7 \
        src/udevadm.8 \
        src/udevd.8
-
-dist_noinst_DATA = \
-       src/udev.html \
-       src/udevadm.html \
-       src/udevd.html
+endif
 
 EXTRA_DIST += \
        src/udev.xml \
        src/udevadm.xml \
        src/udevd.xml
 
+if HAVE_XSLTPROC
+dist_noinst_DATA = \
+       src/udev.html \
+       src/udevadm.html \
+       src/udevd.html
+
 src/%.7 src/%.8 : src/%.xml
        $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
@@ -306,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
@@ -568,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 \
@@ -668,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, ...)
@@ -761,14 +751,12 @@ git-release:
 
 git-sync:
        git push
-       git push --tags $(VERSION)
-
-tar:
-       make distcheck
-       xz -d -c udev-$(VERSION).tar.xz | gpg --armor --detach-sign --output udev-$(VERSION).tar.asc
+       git push --tags
 
 tar-sync:
-       kup put udev-$(VERSION).tar.xz  udev-$(VERSION).tar.asc /pub/linux/utils/kernel/hotplug/udev-$(VERSION).tar.gz
+       rm -f udev-$(VERSION).tar.sign
+       xz -d -c udev-$(VERSION).tar.xz | gpg --armor --detach-sign --output udev-$(VERSION).tar.sign
+       kup put udev-$(VERSION).tar.xz  udev-$(VERSION).tar.sign /pub/linux/utils/kernel/hotplug/
 
 doc-sync:
        for i in src/*.html; do rm -f $$i.sign; gpg --armor --detach-sign --output=$$i.sign $$i; done