18 files changed, 46 insertions, 28 deletions
diff --git a/.gitignore b/.gitignore
index a635600f2..7ea0681da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+.deps
+.libs
+cairo-manual-*
 ChangeLog*
 Makefile
 Makefile.in
@@ -22,4 +25,6 @@ stamp-h
 stamp-h1
 stamp-h.in
 *~
+*.la
+*.lo
 *.orig
diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
new file mode 100644
index 000000000..7fa27d90e
--- /dev/null
+++ b/boilerplate/Makefile.am
@@ -0,0 +1,35 @@
+noinst_LTLIBRARIES = libcairotest.la
+
+libcairotest_la_SOURCES =\
+buffer-diff.c		\
+buffer-diff.h		\
+cairo-test.c		\
+cairo-test.h		\
+read-png.c		\
+read-png.h		\
+write-png.c		\
+write-png.h		\
+xmalloc.c		\
+xmalloc.h
+
+if CAIRO_HAS_BEOS_SURFACE
+libcairotest_la_SOURCES += cairo-test-beos.cpp cairo-test-beos.h
+# BeOS system headers trigger this warning
+libcairotest_la_CXXFLAGS = -Wno-multichar
+endif
+
+if CAIRO_HAS_DIRECTFB_SURFACE
+libcairotest_la_SOURCES += cairo-test-directfb.c cairo-test-directfb.h
+endif
+
+# We're using _GNU_SOURCE to get the prototype for asprintf. This may
+# not be the most portable approach, but it is pragmatic and I'm
+# willing to do something cleaner as soon as it causes someone a
+# problem.
+INCLUDES =					\
+	-D_GNU_SOURCE				\
+	-I$(srcdir)				\
+	-I$(top_srcdir)/pixman/src		\
+	-I$(top_builddir)/src			\
+	-I$(top_srcdir)/src			\
+	$(CAIRO_CFLAGS)
diff --git a/test/buffer-diff.c b/boilerplate/buffer-diff.c
index ade0cc800..ade0cc800 100644
--- a/test/buffer-diff.c
+++ b/boilerplate/buffer-diff.c
diff --git a/test/buffer-diff.h b/boilerplate/buffer-diff.h
index 2be2b3955..2be2b3955 100644
--- a/test/buffer-diff.h
+++ b/boilerplate/buffer-diff.h
diff --git a/test/cairo-test-beos.cpp b/boilerplate/cairo-test-beos.cpp
index 2e4ab2524..2e4ab2524 100644
--- a/test/cairo-test-beos.cpp
+++ b/boilerplate/cairo-test-beos.cpp
diff --git a/test/cairo-test-beos.h b/boilerplate/cairo-test-beos.h
index da58fff4a..da58fff4a 100644
--- a/test/cairo-test-beos.h
+++ b/boilerplate/cairo-test-beos.h
diff --git a/test/cairo-test-directfb.c b/boilerplate/cairo-test-directfb.c
index 2a1f3d15c..2a1f3d15c 100644
--- a/test/cairo-test-directfb.c
+++ b/boilerplate/cairo-test-directfb.c
diff --git a/test/cairo-test-directfb.h b/boilerplate/cairo-test-directfb.h
index 29f5d20e8..29f5d20e8 100644
--- a/test/cairo-test-directfb.h
+++ b/boilerplate/cairo-test-directfb.h
diff --git a/test/cairo-test.c b/boilerplate/cairo-test.c
index bf52f8af3..bf52f8af3 100644
--- a/test/cairo-test.c
+++ b/boilerplate/cairo-test.c
diff --git a/test/cairo-test.h b/boilerplate/cairo-test.h
index 8402d13a4..8402d13a4 100644
--- a/test/cairo-test.h
+++ b/boilerplate/cairo-test.h
diff --git a/test/read-png.c b/boilerplate/read-png.c
index bb02e50b9..bb02e50b9 100644
--- a/test/read-png.c
+++ b/boilerplate/read-png.c
diff --git a/test/read-png.h b/boilerplate/read-png.h
index 9c9ba433d..9c9ba433d 100644
--- a/test/read-png.h
+++ b/boilerplate/read-png.h
diff --git a/test/write-png.c b/boilerplate/write-png.c
index c906df5fa..c906df5fa 100644
--- a/test/write-png.c
+++ b/boilerplate/write-png.c
diff --git a/test/write-png.h b/boilerplate/write-png.h
index 8074666a3..8074666a3 100644
--- a/test/write-png.h
+++ b/boilerplate/write-png.h
diff --git a/test/xmalloc.c b/boilerplate/xmalloc.c
index e98541c8e..e98541c8e 100644
--- a/test/xmalloc.c
+++ b/boilerplate/xmalloc.c
diff --git a/test/xmalloc.h b/boilerplate/xmalloc.h
index bc1ab69eb..bc1ab69eb 100644
--- a/test/xmalloc.h
+++ b/boilerplate/xmalloc.h
diff --git a/configure.in b/configure.in
index 94328ae78..fbcf94536 100644
--- a/configure.in
+++ b/configure.in
@@ -779,6 +779,7 @@ _EOF
 ])
 AC_CONFIG_FILES([
 Makefile
+boilerplate/Makefile
 pixman/Makefile
 pixman/src/Makefile
 src/Makefile
diff --git a/test/Makefile.am b/test/Makefile.am
index 5bbcf9e4b..54834c9cb 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS=../boilerplate
+
 # Here are all the tests that are run unconditionally
 TESTS = 			\
 a8-mask				\
@@ -373,37 +375,12 @@ SUPPORT_PROGS =
 # problem.
 INCLUDES =					\
 	-D_GNU_SOURCE				\
-	-I$(srcdir)				\
+	-I$(top_srcdir)/boilerplate		\
 	-I$(top_srcdir)/pixman/src		\
-	-I$(top_builddir)/src			\
 	-I$(top_srcdir)/src			\
 	$(CAIRO_CFLAGS)
 
-EXTRA_LTLIBRARIES = libcairotest.la
-
-libcairotest_la_SOURCES =\
-buffer-diff.c		\
-buffer-diff.h		\
-cairo-test.c		\
-cairo-test.h		\
-read-png.c		\
-read-png.h		\
-write-png.c		\
-write-png.h		\
-xmalloc.c		\
-xmalloc.h
-
-if CAIRO_HAS_BEOS_SURFACE
-libcairotest_la_SOURCES += cairo-test-beos.cpp cairo-test-beos.h
-# BeOS system headers trigger this warning
-libcairotest_la_CXXFLAGS = -Wno-multichar
-endif
-
-if CAIRO_HAS_DIRECTFB_SURFACE
-libcairotest_la_SOURCES += cairo-test-directfb.c cairo-test-directfb.h
-endif
-
-LDADD = libcairotest.la $(top_builddir)/src/libcairo.la
+LDADD = $(top_builddir)/boilerplate/libcairotest.la $(top_builddir)/src/libcairo.la
 
 if CAIRO_CAN_TEST_GLITZ_AGL_SURFACE
 LDADD += $(GLITZ_AGL_LIBS)
@@ -500,7 +477,7 @@ html:
 rehtml:
 	@$(MAKE) $(AM_MAKEFLAGS) TESTS="$(FAILED_TESTS)" html
 
-$(TESTS): $(SUPPORT_PROGS)
+$(TESTS): all $(SUPPORT_PROGS)
 
 %.log: %
 	-./$<