X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=95cb52cdda2d8b6ef3d8b2cccf228de6fc4fc283;hb=b618e9957b2bd8a4484368620b71ca16fef0c9e6;hp=46f923ea90f84b7b87d087e747b3e795d6930800;hpb=9e4e44e578ec8ba2c626abed4eb8529814557352;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 46f923ea9..95cb52cdd 100644 --- 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 @@ -479,6 +485,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 +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 \ @@ -658,29 +667,14 @@ dist_udevhome_SCRIPTS += \ src/extras/rule_generator/write_cd_rules \ src/extras/rule_generator/write_net_rules -udevhome_DATA = src/extras/rule_generator/rule_generator.functions dist_udevhome_DATA += \ + src/extras/rule_generator/rule_generator.functions + +dist_udevrules_DATA += \ src/extras/rule_generator/75-cd-aliases-generator.rules \ 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, ...) @@ -755,18 +749,19 @@ git-release: git tag -m "udev $(VERSION)" -s $(VERSION) git gc --prune=0 -tar: - make distcheck - gpg --armor --detach-sign udev-$(VERSION).tar.xz - git-sync: git push - git push --tags $(VERSION) + git push --tags tar-sync: - scp udev-$(VERSION).tar.xz master.kernel.org:/pub/linux/utils/kernel/hotplug/ + 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