rule_generator: fix to install rules in rules.d/

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4329291243cf72242ae347ae2bd57123b8340ce6..230c4daadecafad50a18f8736385696fde9066cd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,11 +36,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) \
@@ -258,10 +260,11 @@ src_udevadm_CFLAGS = $(udev_common_CFLAGS)
 src_udevadm_LDADD = $(udev_common_LDADD)
 src_udevadm_CPPFLAGS = $(udev_common_CPPFLAGS)
 
+if HAVE_XSLTPROC
 # ------------------------------------------------------------------------------
 # udev man pages
 # ------------------------------------------------------------------------------
-dist_man_MANS = \
+dist_man_MANS += \
        src/udev.7 \
        src/udevadm.8 \
        src/udevd.8
@@ -281,6 +284,7 @@ src/%.7 src/%.8 : src/%.xml
 
 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 +293,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 +307,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
 # ------------------------------------------------------------------------------
@@ -517,14 +527,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 +641,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
@@ -649,7 +659,7 @@ dist_udevhome_SCRIPTS += \
        src/extras/rule_generator/write_net_rules
 
 udevhome_DATA = src/extras/rule_generator/rule_generator.functions
-dist_udevhome_DATA = \
+dist_udevrules_DATA += \
        src/extras/rule_generator/75-cd-aliases-generator.rules \
        src/extras/rule_generator/75-persistent-net-generator.rules
 endif
@@ -715,6 +725,8 @@ uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 
 distcheck-hook: $(DISTCHECK_HOOKS)
 
+distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
+
 # ------------------------------------------------------------------------------
 # custom release helpers
 # ------------------------------------------------------------------------------
@@ -743,16 +755,16 @@ 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)
 
+tar:
+       make distcheck
+       xz -d -c udev-$(VERSION).tar.xz | gpg --armor --detach-sign --output udev-$(VERSION).tar.asc
+
 tar-sync:
-       scp udev-$(VERSION).tar.xz master.kernel.org:/pub/linux/utils/kernel/hotplug/
+       kup put udev-$(VERSION).tar.xz  udev-$(VERSION).tar.asc /pub/linux/utils/kernel/hotplug/udev-$(VERSION).tar.gz
 
 doc-sync:
        rsync -av src/*.html master.kernel.org:/pub/linux/utils/kernel/hotplug/udev/