X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=1de4b27af0853706c1d66dff2e67c47c28fc68d4;hp=4329291243cf72242ae347ae2bd57123b8340ce6;hb=f13289ffdf077f75c8710e977ffe538b66885762;hpb=ad29a9f14fa8b1932c0e418bfcf1c10ce6a35a33 diff --git a/Makefile.am b/Makefile.am index 432929124..1de4b27af 100644 --- 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) @@ -36,11 +42,13 @@ INSTALL_EXEC_HOOKS = INSTALL_DATA_HOOKS = UNINSTALL_EXEC_HOOKS = DISTCHECK_HOOKS = +DISTCLEAN_LOCAL_HOOKS = udevhomedir = $(libexecdir)/udev udevhome_SCRIPTS = dist_udevhome_SCRIPTS = dist_udevhome_DATA = +dist_man_MANS = SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ @@ -75,7 +83,7 @@ SED_PROCESS = \ # libudev # ------------------------------------------------------------------------------ LIBUDEV_CURRENT=13 -LIBUDEV_REVISION=0 +LIBUDEV_REVISION=1 LIBUDEV_AGE=13 SUBDIRS += src/docs @@ -261,26 +269,28 @@ src_udevadm_CPPFLAGS = $(udev_common_CPPFLAGS) # ------------------------------------------------------------------------------ # udev man pages # ------------------------------------------------------------------------------ -dist_man_MANS = \ +dist_man_MANS += \ src/udev.7 \ src/udevadm.8 \ src/udevd.8 -dist_noinst_DATA = \ - src/udev.html \ - src/udevadm.html \ - src/udevd.html - 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 $< src/%.html : src/%.xml $(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< +endif # ------------------------------------------------------------------------------ # udev tests @@ -289,12 +299,6 @@ TESTS = \ test/udev-test.pl \ test/rules-test.sh -EXTRA_DIST += \ - test/udev-test.pl.in - -CLEANFILES += \ - test/udev-test.pl - check_PROGRAMS = \ src/test-libudev \ src/test-udev @@ -309,6 +313,18 @@ src_test_udev_CFLAGS = $(udev_common_CFLAGS) src_test_udev_LDADD = $(udev_common_LDADD) src_test_udev_CPPFLAGS = $(udev_common_CPPFLAGS) +# packed sysfs test tree +test/sys/kernel/uevent_seqnum: + $(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 + +EXTRA_DIST += test/sys.tar.xz + # ------------------------------------------------------------------------------ # ata_id - ATA identify # ------------------------------------------------------------------------------ @@ -469,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 \ @@ -517,14 +535,14 @@ if ENABLE_KEYMAP # ------------------------------------------------------------------------------ # keymap - map custom hardware's multimedia keys # ------------------------------------------------------------------------------ -src_keymap_SOURCES = src/extras/keymap/keymap.c -src_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I src/extras/keymap -nodist_src_keymap_SOURCES = \ +src_extras_keymap_keymap_SOURCES = src/extras/keymap/keymap.c +src_extras_keymap_keymap_CPPFLAGS = $(AM_CPPFLAGS) -I src/extras/keymap +nodist_src_extras_keymap_keymap_SOURCES = \ src/extras/keymap/keys-from-name.h \ src/extras/keymap/keys-to-name.h -BUILT_SOURCES += $(nodist_src_keymap_SOURCES) +BUILT_SOURCES += $(nodist_src_extras_keymap_keymap_SOURCES) -pkglibexec_PROGRAMS += src/keymap +pkglibexec_PROGRAMS += src/extras/keymap/keymap dist_doc_DATA = src/extras/keymap/README.keymap.txt dist_udevrules_DATA += \ @@ -631,13 +649,13 @@ if ENABLE_MTD_PROBE # ------------------------------------------------------------------------------ # mtd_probe - autoloads FTL module for mtd devices # ------------------------------------------------------------------------------ -src_mtd_probe_SOURCES = \ +src_extras_mtd_probe_mtd_probe_SOURCES = \ src/extras/mtd_probe/mtd_probe.c \ src/extras/mtd_probe/mtd_probe.h \ src/extras/mtd_probe/probe_smartmedia.c -src_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS) +src_extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS) dist_udevrules_DATA += src/extras/mtd_probe/75-probe_mtd.rules -pkglibexec_PROGRAMS += src/mtd_probe +pkglibexec_PROGRAMS += src/extras/mtd_probe/mtd_probe endif if ENABLE_RULE_GENERATOR @@ -648,8 +666,10 @@ 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 = \ +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 @@ -715,6 +735,8 @@ uninstall-hook: $(UNINSTALL_EXEC_HOOKS) distcheck-hook: $(DISTCHECK_HOOKS) +distclean-local: $(DISTCLEAN_LOCAL_HOOKS) + # ------------------------------------------------------------------------------ # custom release helpers # ------------------------------------------------------------------------------ @@ -743,18 +765,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