Move some top-level build files into build/

.gitignore

@@ -7,21 +7,13 @@ Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache
-compile
 config.cache
-config.guess
 config.h
 config.h.in
 config.log
 config.status
-config.sub
 configure
-depcomp
-install-sh
 libtool
-ltmain.sh
-mkinstalldirs
-missing
 releases
 stamp-h
 stamp-h1

Makefile.am

@@ -42,22 +42,22 @@ DISTCLEANFILES = config.cache
 MAINTAINERCLEANFILES = \
 	$(srcdir)/aclocal.m4 \
 	$(srcdir)/autoscan.log \
-	$(srcdir)/compile \
-	$(srcdir)/config.guess \
+	$(srcdir)/build/compile \
+	$(srcdir)/build/config.guess \
+	$(srcdir)/build/config.sub \
+	$(srcdir)/build/depcomp \
+	$(srcdir)/build/install-sh \
+	$(srcdir)/build/ltmain.sh \
+	$(srcdir)/build/missing \
+	$(srcdir)/build/mkinstalldirs \
 	$(srcdir)/config.h.in \
-	$(srcdir)/config.sub \
 	$(srcdir)/configure.scan \
-	$(srcdir)/depcomp \
-	$(srcdir)/install-sh \
-	$(srcdir)/ltmain.sh \
-	$(srcdir)/missing \
-	$(srcdir)/mkinstalldirs \
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-gtk-doc \
 	--enable-test-surfaces
 
-include $(srcdir)/ChangeLog.mk
-include $(srcdir)/Releasing.mk
-include $(srcdir)/Analysis.mk
+include $(srcdir)/build/ChangeLog.mk
+include $(srcdir)/build/Releasing.mk
+include $(srcdir)/build/Analysis.mk

build/.gitignore

@@ -0,0 +1,8 @@
+compile
+config.guess
+config.sub
+depcomp
+install-sh
+ltmain.sh
+missing
+mkinstalldirs

build/ChangeLog.mk

@@ -71,7 +71,7 @@ $(srcdir)/ChangeLog.cache-% $(srcdir)/ChangeLog.pre-%:
 		test "x$$from" = xinitial || from=$$from.0; \
 		spec=$$from..$$to; \
 	  fi; \
-	  ./missing --run git-log --stat "$$spec") > $@.tmp \
+	  $(srcdir)/build/missing --run git-log --stat "$$spec") > $@.tmp \
 	  && mv -f $@.tmp $@ \
 	  || ($(RM) $@.tmp; \
 	      echo Failed to generate $@, your $@ may be outdated >&2); \

configure.in

@@ -14,7 +14,7 @@ AC_INIT([cairo],
       [http://bugs.freedesktop.org/enter_bug.cgi?product=cairo])
 AC_CONFIG_SRCDIR(src/cairo.h)
 AC_CONFIG_HEADERS(config.h)
-dnl AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR(build)
 
 dnl automake 1.8 requires autoconf 2.58
 dnl automake 1.7 requires autoconf 2.54