X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=0048f2b63dcdd29d07cd202bc8f9ae7bb71f8d43;hb=9c158222917e90363aa5d89084161b392941dc88;hp=06500b068b7f0387329fbc8abf0898022a983b8f;hpb=d914e44509abf8bf305d00ebc5c6282dd84e809b;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 06500b068..0048f2b63 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)
 
@@ -42,6 +48,7 @@ udevhomedir = $(libexecdir)/udev
 udevhome_SCRIPTS =
 dist_udevhome_SCRIPTS =
 dist_udevhome_DATA =
+dist_man_MANS =
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
@@ -76,7 +83,7 @@ SED_PROCESS = \
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=13
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=13
 
 SUBDIRS += src/docs
@@ -259,10 +266,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
@@ -282,6 +290,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
@@ -476,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 \
@@ -655,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 += \
+	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
@@ -752,18 +765,21 @@ 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:
+	make distcheck
+	xz -d -c udev-$(VERSION).tar.xz | gpg --armor --detach-sign --output udev-$(VERSION).tar.sign
 
 tar-sync:
-	scp udev-$(VERSION).tar.xz master.kernel.org:/pub/linux/utils/kernel/hotplug/
+	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