build-sys: add --disable-manpages

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 83e5fa31d5fb9a82e06b2ac11efcf7eabc718268..1faa6fe411f83949303e60e3edcb3a692377a495 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,12 @@ AM_LDFLAGS = \
        -Wl,--as-needed
 
 DISTCHECK_CONFIGURE_FLAGS = \
+       --enable-debug \
+       --enable-rule_generator \
+       --enable-udev_acl \
+       --enable-floppy \
+       --enable-edd \
+       --with-selinux \
        --enable-gtk-doc \
        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
@@ -77,7 +83,7 @@ SED_PROCESS = \
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=13
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=13
 
 SUBDIRS += src/docs
@@ -260,25 +266,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 +314,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
@@ -479,6 +486,8 @@ src/extras/gudev/GUdev-1.0.gir: src/extras/gudev/libgudev-1.0.la $(G_IR_SCANNER)
                --output $@ \
                --pkg=glib-2.0 \
                --pkg=gobject-2.0 \
+               --pkg-export=gudev-1.0 \
+               --c-include=gudev/gudev.h \
                -I$(top_srcdir)/src/extras \
                -I$(top_builddir)/src/extras \
                -D_GUDEV_COMPILATION \
@@ -566,6 +575,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 \
@@ -759,16 +769,17 @@ 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:
-       rsync -av src/*.html master.kernel.org:/pub/linux/utils/kernel/hotplug/udev/
-       rsync -av --delete src/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/src/
-       rsync -av --delete src/extras/gudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/gudev/
+       for i in src/*.html; do rm -f $$i.sign; gpg --armor --detach-sign --output=$$i.sign $$i; done
+       for i in src/*.html; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/udev/; done
+       for i in src/docs/html/*.{html,css,png}; do rm -f $$i.sign; gpg --armor --detach-sign --output=$$i.sign $$i; done
+       for i in src/docs/html/*.{html,css,png}; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/libudev/; done
+       for i in src/extras/gudev/docs/html/*.{html,css,png}; do rm -f $$i.sign; gpg --armor --detach-sign --output=$$i.sign $$i; done
+       for i in src/extras/gudev/docs/html/*.{html,css,png}; do echo $$i; kup put $$i $$i.sign /pub/linux/utils/kernel/hotplug/gudev/; done