Remove BeOS support

Nobody cares about BeOS in 2022, and it cannot be built with Meson anyway.

Removing the BeOS backend also allows us to drop the dependency on a C++
compiler and simplify the Autotools build considerably by removing all
the extra CXX targets.

4 files changed, 3 insertions, 395 deletions

diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am
index 29ad015ac..57fec733c 100644
--- a/boilerplate/Makefile.am
+++ b/boilerplate/Makefile.am
@@ -14,13 +14,7 @@ AM_CPPFLAGS = \
 	$(NULL)
 AM_LDFLAGS = $(CAIRO_LDFLAGS)
 
-if BUILD_CXX
-cxx_boilerplate_lib = libcairoboilerplate_cxx.la
-else
-cxx_boilerplate_lib =
-endif
-
-EXTRA_LTLIBRARIES += libcairoboilerplate.la $(cxx_boilerplate_lib)
+EXTRA_LTLIBRARIES += libcairoboilerplate.la
 
 
 libcairoboilerplate_la_SOURCES = \
@@ -29,37 +23,23 @@ libcairoboilerplate_la_SOURCES = \
 	$(enabled_cairo_boilerplate_sources) \
 	cairo-boilerplate-constructors.c \
 	$(NULL)
-libcairoboilerplate_cxx_la_SOURCES = \
-	$(enabled_cairo_boilerplate_cxx_sources) \
-	$(NULL)
 libcairoboilerplate_la_LIBADD = $(top_builddir)/src/libcairo.la \
-	$(cxx_boilerplate_lib) \
-	$(CAIRO_LIBS) \
-	$(CAIROBOILERPLATE_LIBS) \
-	$(NULL)
-libcairoboilerplate_cxx_la_LIBADD = $(top_builddir)/src/libcairo.la \
 	$(CAIRO_LIBS) \
 	$(CAIROBOILERPLATE_LIBS) \
 	$(NULL)
 libcairoboilerplate_la_DEPENDENCIES = \
-	$(cxx_boilerplate_lib) \
 	$(NULL)
 
 if CAIRO_HAS_DL
 libcairoboilerplate_la_LIBADD += -ldl
 endif
 
-if CAIRO_HAS_BEOS_SURFACE
-# BeOS system headers trigger this warning
-libcairoboilerplate_cxx_la_CXXFLAGS = -Wno-multichar
-endif
-
 if CAIRO_HAS_WIN32_SURFACE
 libcairoboilerplate_la_LIBADD += -lwinspool
 endif
 
-cairo-boilerplate-constructors.c: Makefile $(enabled_cairo_boilerplate_sources) $(enabled_cairo_boilerplate_cxx_sources) make-cairo-boilerplate-constructors.sh
-	(cd $(srcdir) && sh ./make-cairo-boilerplate-constructors.sh $(enabled_cairo_boilerplate_sources) $(enabled_cairo_boilerplate_cxx_sources)) > $@
+cairo-boilerplate-constructors.c: Makefile $(enabled_cairo_boilerplate_sources) make-cairo-boilerplate-constructors.sh
+	(cd $(srcdir) && sh ./make-cairo-boilerplate-constructors.sh $(enabled_cairo_boilerplate_sources)) > $@
 
 BUILT_SOURCES += cairo-boilerplate-constructors.c
 EXTRA_DIST += $(BUILT_SOURCES) make-cairo-boilerplate-constructors.sh
diff --git a/boilerplate/Makefile.sources b/boilerplate/Makefile.sources
index ada70ed6a..04c33bcce 100644
--- a/boilerplate/Makefile.sources
+++ b/boilerplate/Makefile.sources
@@ -19,7 +19,6 @@ cairo_boilerplate_private = \
 	cairo-boilerplate-private.h \
 	$(NULL)
 
-cairo_boilerplate_beos_cxx_sources = cairo-boilerplate-beos.cpp
 cairo_boilerplate_directfb_sources = cairo-boilerplate-directfb.c
 cairo_boilerplate_drm_sources = cairo-boilerplate-drm.c
 cairo_boilerplate_glx_sources = cairo-boilerplate-glx.c
diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features
index 40f5d48cd..4dff05f21 100644
--- a/boilerplate/Makefile.win32.features
+++ b/boilerplate/Makefile.win32.features
@@ -10,502 +10,404 @@ supported_cairo_boilerplate_headers = $(cairo_boilerplate_headers)
 unsupported_cairo_boilerplate_headers =
 all_cairo_boilerplate_headers = $(cairo_boilerplate_headers)
 all_cairo_boilerplate_private = $(cairo_boilerplate_private)
-all_cairo_boilerplate_cxx_sources = $(cairo_boilerplate_cxx_sources)
 all_cairo_boilerplate_sources = $(cairo_boilerplate_sources)
 
 enabled_cairo_boilerplate_headers = $(cairo_boilerplate_headers)
 enabled_cairo_boilerplate_private = $(cairo_boilerplate_private)
-enabled_cairo_boilerplate_cxx_sources = $(cairo_boilerplate_cxx_sources)
 enabled_cairo_boilerplate_sources = $(cairo_boilerplate_sources)
 
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_xlib_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xlib_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_sources)
 ifeq ($(CAIRO_HAS_XLIB_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_xlib_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xlib_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_xrender_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_xrender_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_xlib_xrender_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xlib_xrender_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_xrender_sources)
 ifeq ($(CAIRO_HAS_XLIB_XRENDER_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_xrender_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_xlib_xrender_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xlib_xrender_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_xrender_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_xcb_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xcb_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_xcb_sources)
 ifeq ($(CAIRO_HAS_XCB_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_xcb_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xcb_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xcb_sources)
 endif
 
 unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_xcb_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_xcb_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_xlib_xcb_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xlib_xcb_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_xcb_sources)
 ifeq ($(CAIRO_HAS_XLIB_XCB_FUNCTIONS),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xlib_xcb_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_xlib_xcb_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xlib_xcb_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xlib_xcb_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_shm_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_shm_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_xcb_shm_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xcb_shm_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_xcb_shm_sources)
 ifeq ($(CAIRO_HAS_XCB_SHM_FUNCTIONS),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xcb_shm_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_xcb_shm_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xcb_shm_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xcb_shm_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_quartz_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_quartz_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_sources)
 ifeq ($(CAIRO_HAS_QUARTZ_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_quartz_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_quartz_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_font_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_font_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_quartz_font_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_quartz_font_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_font_sources)
 ifeq ($(CAIRO_HAS_QUARTZ_FONT),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_font_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_quartz_font_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_quartz_font_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_font_sources)
 endif
 
 unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_image_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_image_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_quartz_image_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_quartz_image_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_image_sources)
 ifeq ($(CAIRO_HAS_QUARTZ_IMAGE_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_quartz_image_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_quartz_image_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_quartz_image_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_quartz_image_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_win32_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_win32_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_win32_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_win32_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_win32_sources)
 ifeq ($(CAIRO_HAS_WIN32_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_win32_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_win32_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_win32_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_win32_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_win32_font_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_win32_font_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_win32_font_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_win32_font_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_win32_font_sources)
 ifeq ($(CAIRO_HAS_WIN32_FONT),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_win32_font_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_win32_font_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_win32_font_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_win32_font_sources)
 endif
 
 unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_os2_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_os2_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_os2_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_os2_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_os2_sources)
 ifeq ($(CAIRO_HAS_OS2_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_os2_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_os2_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_os2_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_os2_sources)
 endif
 
-unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_beos_headers)
-all_cairo_boilerplate_headers += $(cairo_boilerplate_beos_headers)
-all_cairo_boilerplate_private += $(cairo_boilerplate_beos_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_beos_cxx_sources)
-all_cairo_boilerplate_sources += $(cairo_boilerplate_beos_sources)
-ifeq ($(CAIRO_HAS_BEOS_SURFACE),1)
-enabled_cairo_boilerplate_headers += $(cairo_boilerplate_beos_headers)
-enabled_cairo_boilerplate_private += $(cairo_boilerplate_beos_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_beos_cxx_sources)
-enabled_cairo_boilerplate_sources += $(cairo_boilerplate_beos_sources)
-endif
-
 unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_drm_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_drm_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_drm_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_drm_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_drm_sources)
 ifeq ($(CAIRO_HAS_DRM_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_drm_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_drm_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_drm_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_drm_sources)
 endif
 
 unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_gallium_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_gallium_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_gallium_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gallium_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_gallium_sources)
 ifeq ($(CAIRO_HAS_GALLIUM_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_gallium_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_gallium_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gallium_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_gallium_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_png_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_png_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_png_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_png_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_png_sources)
 ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_png_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_png_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_png_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_png_sources)
 endif
 
 unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_gl_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_gl_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_gl_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gl_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_gl_sources)
 ifeq ($(CAIRO_HAS_GL_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_gl_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_gl_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gl_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_gl_sources)
 endif
 
 unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_glesv2_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_glesv2_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_glesv2_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_glesv2_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_glesv2_sources)
 ifeq ($(CAIRO_HAS_GLESV2_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_glesv2_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_glesv2_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_glesv2_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_glesv2_sources)
 endif
 
 unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_glesv3_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_glesv3_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_glesv3_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_glesv3_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_glesv3_sources)
 ifeq ($(CAIRO_HAS_GLESV3_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_glesv3_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_glesv3_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_glesv3_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_glesv3_sources)
 endif
 
 unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_cogl_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_cogl_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_cogl_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_cogl_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_cogl_sources)
 ifeq ($(CAIRO_HAS_COGL_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_cogl_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_cogl_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_cogl_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_cogl_sources)
 endif
 
 unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_directfb_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_directfb_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_directfb_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_directfb_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_directfb_sources)
 ifeq ($(CAIRO_HAS_DIRECTFB_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_directfb_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_directfb_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_directfb_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_directfb_sources)
 endif
 
 unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_vg_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_vg_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_vg_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_vg_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_vg_sources)
 ifeq ($(CAIRO_HAS_VG_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_vg_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_vg_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_vg_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_vg_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_egl_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_egl_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_egl_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_egl_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_egl_sources)
 ifeq ($(CAIRO_HAS_EGL_FUNCTIONS),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_egl_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_egl_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_egl_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_egl_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_glx_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_glx_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_glx_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_glx_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_glx_sources)
 ifeq ($(CAIRO_HAS_GLX_FUNCTIONS),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_glx_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_glx_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_glx_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_glx_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_wgl_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_wgl_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_wgl_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_wgl_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_wgl_sources)
 ifeq ($(CAIRO_HAS_WGL_FUNCTIONS),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_wgl_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_wgl_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_wgl_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_wgl_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_script_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_script_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_script_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_script_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_script_sources)
 ifeq ($(CAIRO_HAS_SCRIPT_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_script_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_script_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_script_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_script_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_ft_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_ft_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_ft_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_ft_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_ft_sources)
 ifeq ($(CAIRO_HAS_FT_FONT),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_ft_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_ft_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_ft_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_ft_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_fc_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_fc_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_fc_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_fc_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_fc_sources)
 ifeq ($(CAIRO_HAS_FC_FONT),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_fc_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_fc_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_fc_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_fc_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_ps_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_ps_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_ps_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_ps_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_ps_sources)
 ifeq ($(CAIRO_HAS_PS_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_ps_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_ps_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_ps_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_ps_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_pdf_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_pdf_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_pdf_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_pdf_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_pdf_sources)
 ifeq ($(CAIRO_HAS_PDF_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_pdf_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_pdf_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_pdf_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_pdf_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_svg_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_svg_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_svg_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_svg_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_svg_sources)
 ifeq ($(CAIRO_HAS_SVG_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_svg_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_svg_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_svg_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_svg_sources)
 endif
 
 all_cairo_boilerplate_private += $(cairo_boilerplate_test_surfaces_private) $(cairo_boilerplate_test_surfaces_headers)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_test_surfaces_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_test_surfaces_sources)
 ifeq ($(CAIRO_HAS_TEST_SURFACES),1)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_test_surfaces_private) $(cairo_boilerplate_test_surfaces_headers)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_test_surfaces_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_test_surfaces_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_image_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_image_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_image_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_image_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_image_sources)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_image_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_image_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_image_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_image_sources)
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_mime_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_mime_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_mime_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_mime_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_mime_sources)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_mime_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_mime_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_mime_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_mime_sources)
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_recording_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_recording_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_recording_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_recording_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_recording_sources)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_recording_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_recording_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_recording_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_recording_sources)
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_observer_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_observer_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_observer_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_observer_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_observer_sources)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_observer_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_observer_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_observer_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_observer_sources)
 
 unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_tee_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_tee_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_tee_sources)
 ifeq ($(CAIRO_HAS_TEE_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_tee_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_tee_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_tee_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_tee_sources)
 endif
 
 unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_xml_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_xml_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_xml_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xml_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_xml_sources)
 ifeq ($(CAIRO_HAS_XML_SURFACE),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_xml_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_xml_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_xml_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_xml_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_user_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_user_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_user_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_user_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_user_sources)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_user_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_user_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_user_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_user_sources)
 
 all_cairo_boilerplate_private += $(cairo_boilerplate_pthread_private) $(cairo_boilerplate_pthread_headers)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_pthread_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_pthread_sources)
 ifeq ($(CAIRO_HAS_PTHREAD),1)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_pthread_private) $(cairo_boilerplate_pthread_headers)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_pthread_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_pthread_sources)
 endif
 
 supported_cairo_boilerplate_headers += $(cairo_boilerplate_gobject_headers)
 all_cairo_boilerplate_headers += $(cairo_boilerplate_gobject_headers)
 all_cairo_boilerplate_private += $(cairo_boilerplate_gobject_private)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gobject_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_gobject_sources)
 ifeq ($(CAIRO_HAS_GOBJECT_FUNCTIONS),1)
 enabled_cairo_boilerplate_headers += $(cairo_boilerplate_gobject_headers)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_gobject_private)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_gobject_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_gobject_sources)
 endif
 
 all_cairo_boilerplate_private += $(cairo_boilerplate_trace_private) $(cairo_boilerplate_trace_headers)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_trace_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_trace_sources)
 ifeq ($(CAIRO_HAS_TRACE),1)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_trace_private) $(cairo_boilerplate_trace_headers)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_trace_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_trace_sources)
 endif
 
 all_cairo_boilerplate_private += $(cairo_boilerplate_interpreter_private) $(cairo_boilerplate_interpreter_headers)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_interpreter_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_interpreter_sources)
 ifeq ($(CAIRO_HAS_INTERPRETER),1)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_interpreter_private) $(cairo_boilerplate_interpreter_headers)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_interpreter_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_interpreter_sources)
 endif
 
 all_cairo_boilerplate_private += $(cairo_boilerplate_symbol_lookup_private) $(cairo_boilerplate_symbol_lookup_headers)
-all_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_symbol_lookup_cxx_sources)
 all_cairo_boilerplate_sources += $(cairo_boilerplate_symbol_lookup_sources)
 ifeq ($(CAIRO_HAS_SYMBOL_LOOKUP),1)
 enabled_cairo_boilerplate_private += $(cairo_boilerplate_symbol_lookup_private) $(cairo_boilerplate_symbol_lookup_headers)
-enabled_cairo_boilerplate_cxx_sources += $(cairo_boilerplate_symbol_lookup_cxx_sources)
 enabled_cairo_boilerplate_sources += $(cairo_boilerplate_symbol_lookup_sources)
 endif
diff --git a/boilerplate/cairo-boilerplate-beos.cpp b/boilerplate/cairo-boilerplate-beos.cpp
deleted file mode 100644
index 8a1b1afb5..000000000
--- a/boilerplate/cairo-boilerplate-beos.cpp
+++ /dev/null
@@ -1,273 +0,0 @@
-/* vim:set ts=8 sw=4 noet cin: */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Takashi Toyoshima <toyoshim@be-in.org>
- *   Fredrik Holmqvist <thesuckiestemail@yahoo.se>
- *   Christian Biesinger <cbiesinger@web.de>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "cairo-boilerplate.h"
-#include <cairo-beos.h>
-
-// Part of this code was originally part of
-// xpfe/bootstrap/nsNativeAppSupportBeOS.cpp in the Mozilla source code.
-
-#include <Application.h>
-#include <Window.h>
-#include <View.h>
-#include <Bitmap.h>
-
-class CairoTestWindow : public BWindow
-{
-public:
-    CairoTestWindow(BRect frame, const char* title);
-    virtual ~CairoTestWindow();
-    BView* View() const { return mView; }
-private:
-    BView* mView;
-};
-
-CairoTestWindow::CairoTestWindow(BRect frame, const char* title)
-    : BWindow(frame, title, B_TITLED_WINDOW,
-	      B_NOT_RESIZABLE|B_NOT_ZOOMABLE)
-{
-    mView = new BView(frame, "CairoWindowTestView", B_FOLLOW_ALL_SIDES, 0);
-    AddChild(mView);
-    Show();
-
-    // Make sure the window is actually on screen
-    Lock();
-    Sync();
-    mView->SetViewColor(B_TRANSPARENT_COLOR);
-    mView->Sync();
-    Unlock();
-}
-
-CairoTestWindow::~CairoTestWindow()
-{
-    RemoveChild(mView);
-    delete mView;
-}
-
-
-class nsBeOSApp : public BApplication
-{
-public:
-    nsBeOSApp(sem_id sem) : BApplication(GetAppSig()), init(sem)
-    {}
-
-    void ReadyToRun()
-    {
-	release_sem(init);
-    }
-
-    static int32 Main(void *args)
-    {
-	nsBeOSApp *app = new nsBeOSApp( (sem_id)args );
-	if(app == NULL)
-	    return B_ERROR;
-	return app->Run();
-    }
-
-private:
-
-    const char *GetAppSig()
-    {
-	return "application/x-vnd.cairo-test-app";
-    }
-
-    sem_id init;
-}; //class nsBeOSApp
-
-class AppRunner
-{
-    public:
-	AppRunner();
-	~AppRunner();
-};
-
-AppRunner::AppRunner()
-{
-    if (be_app)
-	return;
-
-    sem_id initsem = create_sem(0, "Cairo BApplication init");
-    if (initsem < B_OK) {
-	fprintf (stderr, "Error creating BeOS initialization semaphore\n");
-	return;
-    }
-
-    thread_id tid = spawn_thread(nsBeOSApp::Main, "Cairo/BeOS test", B_NORMAL_PRIORITY, (void *)initsem);
-    if (tid < B_OK || B_OK != resume_thread(tid)) {
-	fprintf (stderr, "Error spawning thread\n");
-	return;
-    }
-
-    if (B_OK != acquire_sem(initsem)) {
-	fprintf (stderr, "Error acquiring semaphore\n");
-	return;
-    }
-
-    delete_sem(initsem);
-    return;
-}
-
-AppRunner::~AppRunner()
-{
-    if (be_app) {
-	if (be_app->Lock())
-	    be_app->Quit();
-	delete be_app;
-	be_app = NULL;
-    }
-}
-
-// Make sure that the BApplication is initialized
-static AppRunner sAppRunner;
-
-struct beos_boilerplate_closure {
-    BView* view;
-    BBitmap* bitmap;
-    BWindow* window;
-};
-
-// Test a real window
-static cairo_surface_t *
-_cairo_boilerplate_beos_create_surface (const char		  *name,
-					cairo_content_t 	   content,
-					double			   width,
-					double			   height,
-					cairo_boilerplate_mode_t   mode,
-					void			 **closure)
-{
-    float right = width ? width - 1 : 0;
-    float bottom = height ? height - 1 : 0;
-    BRect rect(0.0, 0.0, right, bottom);
-    CairoTestWindow* wnd = new CairoTestWindow(rect, name);
-
-    beos_boilerplate_closure* bclosure = new beos_boilerplate_closure;
-    bclosure->view = wnd->View();
-    bclosure->bitmap = NULL;
-    bclosure->window = wnd;
-
-    *closure = bclosure;
-
-    return cairo_beos_surface_create(wnd->View());
-}
-
-static void
-_cairo_boilerplate_beos_cleanup (void *closure)
-{
-    beos_boilerplate_closure* bclosure = reinterpret_cast<beos_boilerplate_closure*>(closure);
-
-    bclosure->window->Lock();
-    bclosure->window->Quit();
-
-    delete bclosure;
-}
-
-// Test a bitmap
-static cairo_surface_t *
-_cairo_boilerplate_beos_create_surface_for_bitmap (const char		     *name,
-						   cairo_content_t	      content,
-						   double		      width,
-						   double		      height,
-						   cairo_boilerplate_mode_t   mode,
-						   void 		    **closure)
-{
-    BRect rect(0.0, 0.0, width - 1, height - 1);
-    color_space beosformat = (content == CAIRO_CONTENT_COLOR_ALPHA) ? B_RGBA32
-								    : B_RGB32;
-    BBitmap* bmp = new BBitmap(rect, beosformat, true);
-    BView* view = new BView(rect, "Cairo test view", B_FOLLOW_ALL_SIDES, 0);
-    bmp->AddChild(view);
-
-    beos_boilerplate_closure* bclosure = new beos_boilerplate_closure;
-    bclosure->view = view;
-    bclosure->bitmap = bmp;
-    bclosure->window = NULL;
-    *closure = bclosure;
-
-    return cairo_beos_surface_create_for_bitmap(view, bmp);
-}
-
-static void
-_cairo_boilerplate_beos_cleanup_bitmap (void *closure)
-{
-    beos_boilerplate_closure* bclosure = reinterpret_cast<beos_boilerplate_closure*>(closure);
-
-    bclosure->bitmap->RemoveChild(bclosure->view);
-
-
-    delete bclosure->view;
-    delete bclosure->bitmap;
-
-    delete bclosure;
-}
-
-static const cairo_boilerplate_target_t targets[] = {
-    /* BeOS sometimes produces a slightly different image. Perhaps this
-     * is related to the fact that it doesn't use premultiplied alpha...
-     * Just ignore the small difference. */
-    {
-	"beos", "beos", NULL, NULL,
-	CAIRO_SURFACE_TYPE_BEOS, CAIRO_CONTENT_COLOR, 1,
-	_cairo_boilerplate_beos_create_surface,
-	NULL, NULL,
-	_cairo_boilerplate_get_image_surface,
-	cairo_surface_write_to_png,
-	_cairo_boilerplate_beos_cleanup
-    },
-    {
-	"beos-bitmap", "beos", NULL, NULL,
-	CAIRO_SURFACE_TYPE_BEOS, CAIRO_CONTENT_COLOR, 1,
-	_cairo_boilerplate_beos_create_surface_for_bitmap,
-	NULL, NULL,
-	_cairo_boilerplate_get_image_surface,
-	cairo_surface_write_to_png,
-	_cairo_boilerplate_beos_cleanup_bitmap
-    },
-    {
-	"beos-bitmap", "beos", NULL, NULL,
-	CAIRO_SURFACE_TYPE_BEOS, CAIRO_CONTENT_COLOR_ALPHA, 1,
-	_cairo_boilerplate_beos_create_surface_for_bitmap,
-	NULL, NULL,
-	_cairo_boilerplate_get_image_surface,
-	cairo_surface_write_to_png,
-	_cairo_boilerplate_beos_cleanup_bitmap
-    },
-};
-CAIRO_BOILERPLATE (beos, targets)
-