X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=0ebf232c80cd607281a9ad432bb3a2e15a5fadc7;hp=ae21bca16c3c329332d0864467a30ae762cfd22f;hb=2417dc20f5147556d0ed4f95a37b1547fb4b0f2b;hpb=58a63088871a0b51850351f0217d2f180a440b6c

diff --git a/Makefile.am b/Makefile.am
index ae21bca16..0ebf232c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,7 @@
+include $(top_srcdir)/Makefile.am.inc
+
 SUBDIRS = \
+	libudev \
 	udev \
 	rules \
 	extras
@@ -12,21 +15,30 @@ EXTRA_DIST = \
 	docs \
 	autogen.sh
 
+CLEANFILES = \
+	udev-$(VERSION).tar.gz udev-$(VERSION).tar.bz2
+
+ACLOCAL_AMFLAGS = -I m4
+
+DISTCHECK_CONFIGURE_FLAGS = \
+	--enable-gtk-doc \
+	--enable-extras
+
+clean-local:
+	rm -rf udev-test-install
+
 distclean-local:
-	rm -f *~
 	rm -rf autom4te.cache
-	rm -f depcomp aclocal.m4 config.h.in configure install-sh
-	rm -f Makefile.in missing config.guess config.sub ltmain.sh
-	rm -rf udev-test-install
-	rm -f udev-$(VERSION).tar.gz udev-$(VERSION).tar.bz2
+
+PREVIOUS_VERSION = `expr $(VERSION) - 1`
 
 changelog:
-	@ head -1 ChangeLog | grep -q "to v$(shell echo $$(($(VERSION) - 1)))"
+	@ head -1 ChangeLog | grep -q "to v$(PREVIOUS_VERSION)"
 	@ mv ChangeLog ChangeLog.tmp
-	@ echo "Summary of changes from v$(shell echo $$(($(VERSION) - 1))) to v$(VERSION)" >> ChangeLog
+	@ echo "Summary of changes from v$(PREVIOUS_VERSION) to v$(VERSION)" >> ChangeLog
 	@ echo "============================================" >> ChangeLog
 	@ echo >> ChangeLog
-	@ git log --pretty=short $(shell echo $$(($(VERSION) - 1)))..HEAD | git shortlog  >> ChangeLog
+	@ git log --pretty=short $(PREVIOUS_VERSION)..HEAD | git shortlog  >> ChangeLog
 	@ echo >> ChangeLog
 	@ cat ChangeLog
 	@ cat ChangeLog.tmp >> ChangeLog
@@ -47,4 +59,7 @@ git-release:
 	cat .git/refs/heads/master > .git/refs/tags/$(VERSION)
 	git gc
 	git prune
-	git-update-server-info
+
+doc-sync:
+	rsync -av --delete libudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/libudev/
+	rsync -av --delete extras/gudev/docs/html/ master.kernel.org:/pub/linux/utils/kernel/hotplug/libgudev/