rules: Ubuntu merge - s/uucp/dialout/

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ae21bca16c3c329332d0864467a30ae762cfd22f..55df27e2c738800ea5ec27a12d779ca202679801 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.am.inc
+
 SUBDIRS = \
        udev \
        rules \
@@ -12,21 +14,24 @@ EXTRA_DIST = \
        docs \
        autogen.sh
 
+CLEANFILES = \
+       udev-$(VERSION).tar.gz udev-$(VERSION).tar.bz2
+
+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 +52,3 @@ git-release:
        cat .git/refs/heads/master > .git/refs/tags/$(VERSION)
        git gc
        git prune
-       git-update-server-info