diff options
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | Makefile.am | 22 | ||||
| -rw-r--r-- | build/.gitignore | 8 | ||||
| -rw-r--r-- | build/Analysis.mk (renamed from Analysis.mk) | 0 | ||||
| -rw-r--r-- | build/ChangeLog.mk (renamed from ChangeLog.mk) | 2 | ||||
| -rw-r--r-- | build/Releasing.mk (renamed from Releasing.mk) | 0 | ||||
| -rw-r--r-- | configure.in | 2 |
7 files changed, 21 insertions, 21 deletions
diff --git a/.gitignore b/.gitignore index dc908aa45..b24ce5e43 100644 --- a/.gitignore +++ b/.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 diff --git a/Makefile.am b/Makefile.am index e8d5bf97a..b5fc67457 100644 --- a/Makefile.am +++ b/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 diff --git a/build/.gitignore b/build/.gitignore new file mode 100644 index 000000000..e11f30fcd --- /dev/null +++ b/build/.gitignore @@ -0,0 +1,8 @@ +compile +config.guess +config.sub +depcomp +install-sh +ltmain.sh +missing +mkinstalldirs diff --git a/Analysis.mk b/build/Analysis.mk index d0e00ca49..d0e00ca49 100644 --- a/Analysis.mk +++ b/build/Analysis.mk diff --git a/ChangeLog.mk b/build/ChangeLog.mk index d93cd894a..b9fbdcf3b 100644 --- a/ChangeLog.mk +++ b/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); \ diff --git a/Releasing.mk b/build/Releasing.mk index 2f7103886..2f7103886 100644 --- a/Releasing.mk +++ b/build/Releasing.mk diff --git a/configure.in b/configure.in index 0c61d8ac7..474027e15 100644 --- a/configure.in +++ b/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 |