Merge branch 'master' into multi-backend

.gitignore

@@ -9,3 +9,6 @@ config.h
 config.log
 config.status
 tests/mactest
+tests/check_mac
+tests/*.gcda
+tests/*.gcno

Makefile.am

@@ -14,25 +14,9 @@ DISTFILES=configure ${BASEFILES}
 
 SUBDIRS = src tests
 
-MAINTAINERCLEANFILES = Makefile.in configure aclocal.m4 config.guess config.h.in config.h.in~ \
-        config.sub depcomp install-sh ltmain.sh missing init/*/Makefil{e,e.in} compile m4/l*
+baseclean:  maintainer-clean
+	rm -f Makefile.in configure aclocal.m4 config.guess config.h.in~ config.h.in config.sub depcomp install-sh ltmain.sh missing compile m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 test-driver src/Makefile.in src/*.slo tests/Makefile.in src/*.gcda src/*.gcno tests/core.*
 
-maintainer-clean-local:
-	rm -rf autom4te.cache
-	rm -rf ${MAINTAINERCLEANFILES}
-
-clean:
-	cd src && $(MAKE) $@
-	cd tests && $(MAKE) $@
-	rm -rf ${DISTDIR} ${DISTBALL}
-
-distclean: clean
-	cd src && $(MAKE) $@
-	cd tests && $(MAKE) $@
-	rm -rf config.h config.h.in~ config.log config.status autom4te.cache Makefile stamp-h1
-
-baseclean: distclean
-	rm -rf configure
 
 dist: ${DISTBALL}
 
@@ -41,3 +25,6 @@ ${DISTBALL}:
 	mkdir -p ${DISTDIR}
 	cp --parents ${DISTFILES} ${DISTDIR}
 	tar -czvf ${DISTBALL} ${DISTDIR}
+
+pretty:
+	cd src && $(MAKE) $@