X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=1de4b27af0853706c1d66dff2e67c47c28fc68d4;hb=09db3f5b66266cb808acfa26d082528ca6e50e4e;hp=d034baf565e3b044a2fee94a47d40d62eeae9789;hpb=afa462dc182c0176a0c9f0afb5db1e0080c499f5;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index d034baf56..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)
 
@@ -77,7 +83,7 @@ SED_PROCESS = \
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=13
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=13
 
 SUBDIRS += src/docs
@@ -260,7 +266,6 @@ src_udevadm_CFLAGS = $(udev_common_CFLAGS)
 src_udevadm_LDADD = $(udev_common_LDADD)
 src_udevadm_CPPFLAGS = $(udev_common_CPPFLAGS)
 
-if HAVE_XSLTPROC
 # ------------------------------------------------------------------------------
 # udev man pages
 # ------------------------------------------------------------------------------
@@ -269,16 +274,17 @@ dist_man_MANS += \
 	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 $<
 
@@ -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 \
@@ -658,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
@@ -757,16 +767,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