Move test-specific stuff out of boilerplate/ and back into test/

This now gives us two separate libtool convenience libraries,
so they have to have separate names now:
libcairoboilerplate.la and libcairotest.la.

7 files changed, 20 insertions, 13 deletions

diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index 2cc48ce5..4bf07fad 100644
--- a/boilerplate/Makefile.am
+++ b/boilerplate/Makefile.am
@@ -1,23 +1,19 @@
-noinst_LTLIBRARIES = libcairotest.la
+noinst_LTLIBRARIES = libcairoboilerplate.la
 
-libcairotest_la_SOURCES =\
+libcairoboilerplate_la_SOURCES =\
 cairo-boilerplate.c	\
 cairo-bolierplate.h	\
-buffer-diff.c		\
-buffer-diff.h		\
-cairo-test.c		\
-cairo-test.h		\
 xmalloc.c		\
 xmalloc.h
 
 if CAIRO_HAS_BEOS_SURFACE
-libcairotest_la_SOURCES += cairo-test-beos.cpp cairo-test-beos.h
+libcairoboilerplate_la_SOURCES += cairo-test-beos.cpp cairo-test-beos.h
 # BeOS system headers trigger this warning
-libcairotest_la_CXXFLAGS = -Wno-multichar
+libcairoboilerplate_la_CXXFLAGS = -Wno-multichar
 endif
 
 if CAIRO_HAS_DIRECTFB_SURFACE
-libcairotest_la_SOURCES += cairo-test-directfb.c cairo-test-directfb.h
+libcairoboilerplate_la_SOURCES += cairo-test-directfb.c cairo-test-directfb.h
 endif
 
 # We're using _GNU_SOURCE to get the prototype for asprintf. This may
diff --git a/boilerplate/xmalloc.c b/boilerplate/xmalloc.c
index e98541c8..10d1cef4 100644
--- a/boilerplate/xmalloc.c
+++ b/boilerplate/xmalloc.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "cairo-test.h"
+#include "cairo-boilerplate.h"
 #include "xmalloc.h"
 
 void *
@@ -36,7 +36,7 @@ xmalloc (size_t size)
 
     buf = malloc (size);
     if (!buf) {
-	cairo_test_log ("Error: Out of memory. Exiting.\n");
+	CAIRO_BOILERPLATE_LOG ("Error: Out of memory. Exiting.\n");
 	exit (1);
     }
 
@@ -50,7 +50,7 @@ xcalloc (size_t nmemb, size_t size)
 
     buf = calloc (nmemb, size);
     if (!buf) {
-	cairo_test_log ("Error: Out of memory. Exiting\n");
+	CAIRO_BOILERPLATE_LOG ("Error: Out of memory. Exiting\n");
 	exit (1);
     }
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 54834c9c..f595dcd8 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -375,12 +375,23 @@ SUPPORT_PROGS =
 # problem.
 INCLUDES =					\
 	-D_GNU_SOURCE				\
+	-I$(srcdir)				\
 	-I$(top_srcdir)/boilerplate		\
 	-I$(top_srcdir)/pixman/src		\
 	-I$(top_srcdir)/src			\
 	$(CAIRO_CFLAGS)
 
-LDADD = $(top_builddir)/boilerplate/libcairotest.la $(top_builddir)/src/libcairo.la
+EXTRA_LTLIBRARIES = libcairotest.la
+
+libcairotest_la_SOURCES =\
+	buffer-diff.c	\
+	buffer-diff.h	\
+	cairo-test.c	\
+	cairo-test.h
+
+LDADD = libcairotest.la \
+        $(top_builddir)/boilerplate/libcairoboilerplate.la \
+	$(top_builddir)/src/libcairo.la
 
 if CAIRO_CAN_TEST_GLITZ_AGL_SURFACE
 LDADD += $(GLITZ_AGL_LIBS)
diff --git a/boilerplate/buffer-diff.c b/test/buffer-diff.c
index b59b5e89..b59b5e89 100644
--- a/boilerplate/buffer-diff.c
+++ b/test/buffer-diff.c
diff --git a/boilerplate/buffer-diff.h b/test/buffer-diff.h
index 2be2b395..2be2b395 100644
--- a/boilerplate/buffer-diff.h
+++ b/test/buffer-diff.h
diff --git a/boilerplate/cairo-test.c b/test/cairo-test.c
index 0d915a59..0d915a59 100644
--- a/boilerplate/cairo-test.c
+++ b/test/cairo-test.c
diff --git a/boilerplate/cairo-test.h b/test/cairo-test.h
index 75eadb45..75eadb45 100644
--- a/boilerplate/cairo-test.h
+++ b/test/cairo-test.h