Commit e58d52c0 authored by Emmanuele Bassi's avatar Emmanuele Bassi

Rename build directory to build-aux

Having a 'build' directory makes is a bit awkward for tools packaging
Clutter, and the rapidly coalescing consensus on the GNOME platform,
pushed by the port to Meson, is to call the directory for ancillary
build files 'build-aux'.
parent e900eb1d
......@@ -29,12 +29,12 @@ tags
/clutter/*.trs
/clutter-lcov.info
/clutter-lcov
!/build/autotools/introspection.m4
!/build/autotools/as-linguas.m4
!/build/autotools/as-compiler-flag.m4
!/build/autotools/glibtests.m4
/build/autotools/*.m4
/build/test-driver
!/build-aux/autotools/introspection.m4
!/build-aux/autotools/as-linguas.m4
!/build-aux/autotools/as-compiler-flag.m4
!/build-aux/autotools/glibtests.m4
/build-aux/autotools/*.m4
/build-aux/test-driver
*.gir
*.typelib
*.gcda
......
include $(top_srcdir)/build/autotools/Makefile.am.silent
include $(top_srcdir)/build-aux/autotools/Makefile.am.silent
NULL =
SUBDIRS = build clutter tests doc po
SUBDIRS = build-aux clutter tests doc po
if BUILD_EXAMPLES
SUBDIRS += examples
endif
DIST_SUBDIRS = clutter tests examples doc po build
DIST_SUBDIRS = clutter tests examples doc po build-aux
# XXX - this is a massive hack to make autoreconf honour the ACLOCAL_FLAGS
# that jhbuild sets while still retaining build/autotools as the authoritative
# source for m4 macros
ACLOCAL_AMFLAGS = -I build/autotools ${ACLOCAL_FLAGS}
ACLOCAL_AMFLAGS = -I build-aux/autotools ${ACLOCAL_FLAGS}
EXTRA_DIST = \
ChangeLog.pre-git-import \
......@@ -28,8 +28,8 @@ DISTCLEANFILES =
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-maintainer-flags --enable-docs
# .release requires .changelog rules
include $(top_srcdir)/build/autotools/Makefile.am.changelog
include $(top_srcdir)/build/autotools/Makefile.am.release
include $(top_srcdir)/build-aux/autotools/Makefile.am.changelog
include $(top_srcdir)/build-aux/autotools/Makefile.am.release
# proxy rules for tests
test-report full-report:
......
......@@ -66,7 +66,7 @@ $(srcdir)/ChangeLog.cache-% $(srcdir)/ChangeLog.pre-%:
test "x$$from" = xgit-import || from=$$from.0; \
spec=$$from..$$to; \
fi; \
$(top_srcdir)/build/missing --run git log --stat "$$spec") > $@.tmp \
$(top_srcdir)/build-aux/missing --run git log --stat "$$spec") > $@.tmp \
&& mv -f $@.tmp $@ \
|| ($(RM) $@.tmp; \
echo Failed to generate $@, your $@ may be outdated >&2); \
......
......@@ -34,7 +34,7 @@ release-tag:
else \
if test -d "$(top_srcdir)/.git"; then \
echo " TAG Tagging release $(CLUTTER_VERSION)..." ; \
$(top_srcdir)/build/missing --run git tag \
$(top_srcdir)/build-aux/missing --run git tag \
-s \
-m "Clutter $(CLUTTER_VERSION) ($(CLUTTER_RELEASE_STATUS))" \
$(CLUTTER_VERSION) ; \
......@@ -78,7 +78,7 @@ release-upload: $(sha256_file)
@echo "Done."
@echo -n " EXEC Running ftpadmin install... "
@ssh master.gnome.org ftpadmin install $(tar_file)
@mv -f $(sha256_file) $(top_builddir)/build/$(sha256_file)
@mv -f $(sha256_file) $(top_builddir)/build-aux/$(sha256_file)
@echo "Done."
release-message:
......@@ -97,7 +97,7 @@ release-message:
@echo ""
@echo "SHA256 Checksum:"
@echo ""
@cat $(top_builddir)/build/$(sha256_file)
@cat $(top_builddir)/build-aux/$(sha256_file)
@echo ""
@echo "Additionally, a git clone of the source tree:"
@echo " git clone git://git.gnome.org/clutter"
......
......@@ -6,8 +6,8 @@ TESTS_ENVIRONMENT= \
G_DEBUG=gc-friendly \
MALLOC_CHECK_=2 \
MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build/autotools/tap-driver.sh
LOG_COMPILER = $(top_srcdir)/build/autotools/tap-test
LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/autotools/tap-driver.sh
LOG_COMPILER = $(top_srcdir)/build-aux/autotools/tap-test
NULL =
......
......@@ -22,7 +22,7 @@
# Only rebuild modules that have changed
build_policy = 'updated'
moduleset = 'http://git.gnome.org/browse/clutter/plain/build/clutter.modules'
moduleset = 'https://git.gnome.org/browse/clutter/plain/build-aux/clutter.modules'
modules = [ 'meta-clutter' ]
......
......@@ -3,7 +3,7 @@ Note that all this is rather experimental.
A more detailed description on using Visual C++ to compile Clutter with
its dependencies can be found on the following GNOME Live! page:
https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
https://wiki.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
Please do not attempt to compile Clutter in a path that contains spaces
to avoid potential problems during compilation, linking or usage.
......@@ -23,10 +23,11 @@ in your include directories or in <root>\vs10\<PlatformName>\include\GL).
Please see the README file in the root directory of this Clutter source package
for the versions of the dependencies required. See also
build/win32/vs10/README.txt in the GLib source package for details
build-aux/win32/vs10/README.txt in the GLib source package for details
where to unpack them. It is recommended that at least the dependencies
from GNOME are also built with VS10 to avoid crashes caused by mixing different
CRTs-please see also the build/win32/vs10/README.txt in those respective packages.
CRTs-please see also the build-aux/win32/vs10/README.txt in those respective
packages.
The recommended build sequence of the dependencies are as follows (the non-GNOME
packages that are not downloaded as binaries from ftp://ftp.gnome.org have
......@@ -40,7 +41,7 @@ files in the next unstable release):
-zlib
-libpng
-(optional for GLib) PCRE (8.12 or later, building PCRE using CMake is
recommended-please see build/win32/vs10/README.txt in the GLib source package)
recommended-please see build-aux/win32/vs10/README.txt in the GLib source package)
-(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG
-(for gdk-pixbuf, if GDI+ is not to be used) jasper [JPEG-2000 library]
-(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG) libtiff
......
......@@ -3,7 +3,7 @@ Note that all this is rather experimental.
A more detailed description on using Visual C++ to compile Clutter with
its dependencies can be found on the following GNOME Live! page:
https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
https://wiki.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
Please do not attempt to compile Clutter in a path that contains spaces
to avoid potential problems during compilation, linking or usage.
......@@ -22,10 +22,11 @@ in your include directories or in <root>\vs9\<PlatformName>\include\GL).
Please see the README file in the root directory of this Clutter source package
for the versions of the dependencies required. See also
build/win32/vs9/README.txt in the GLib source package for details
build-aux/win32/vs9/README.txt in the GLib source package for details
where to unpack them. It is recommended that at least the dependencies
from GNOME are also built with VS9 to avoid crashes caused by mixing different
CRTs-please see also the build/win32/vs9/README.txt in those respective packages.
CRTs-please see also the build-aux/win32/vs9/README.txt in those respective
packages.
The recommended build sequence of the dependencies are as follows (the non-GNOME
packages that are not downloaded as binaries from ftp://ftp.gnome.org have
......@@ -39,7 +40,7 @@ project files in the next unstable release):
-zlib
-libpng
-(optional for GLib) PCRE (8.12 or later, building PCRE using CMake is
recommended-please see build/win32/vs9/README.txt in the GLib source package)
recommended-please see build-aux/win32/vs9/README.txt in the GLib source package)
-(for gdk-pixbuf, if GDI+ is not to be used) IJG JPEG
-(for gdk-pixbuf, if GDI+ is not to be used) jasper [JPEG-2000 library]
-(for gdk-pixbuf, if GDI+ is not to be used, requires zlib and IJG JPEG) libtiff
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment