3 files changed, 23 insertions, 26 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 8bcb6ca..e0d3fbc 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,3 +1,24 @@
-SUBDIRS = surfaces text
+AUTOMAKE_OPTIONS = subdir-objects
 
-EXTRA_DIST = README Makefile.am_fragment
+check_PROGRAMS = surfaces/pdf-surface \
+                 surfaces/ps-surface \
+                 surfaces/svg-surface \
+                 surfaces/image-surface \
+                 text/text-rotate \
+                 text/toy-text \
+                 text/user-font
+
+AM_CPPFLAGS = -I$(top_builddir) $(if $(srcdir:.=),-I$(top_srcdir)) $(CAIROMM_CFLAGS)
+AM_CXXFLAGS = $(CAIROMM_WXXFLAGS)
+
+LDADD = $(top_builddir)/cairomm/libcairomm-$(CAIROMM_API_VERSION).la
+
+surfaces_pdf_surface_SOURCES = surfaces/pdf-surface.cc
+surfaces_ps_surface_SOURCES = surfaces/ps-surface.cc
+surfaces_svg_surface_SOURCES = surfaces/svg-surface.cc
+surfaces_image_surface_SOURCES = surfaces/image-surface.cc
+text_text_rotate_SOURCES = text/text-rotate.cc
+text_toy_text_SOURCES = text/toy-text.cc
+text_user_font_SOURCES = text/user-font.cc
+
+EXTRA_DIST = README
diff --git a/examples/surfaces/Makefile.am b/examples/surfaces/Makefile.am
deleted file mode 100644
index ea7c50c..0000000
--- a/examples/surfaces/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include $(top_srcdir)/examples/Makefile.am_fragment
-
-# build the executable but don't install it
-noinst_PROGRAMS = pdf-surface \
-									ps-surface \
-									svg-surface \
-									image-surface
-
-pdf_surface_SOURCES = pdf-surface.cc
-ps_surface_SOURCES = ps-surface.cc
-svg_surface_SOURCES = svg-surface.cc
-image_surface_SOURCES = image-surface.cc
-
-CLEANFILES = image.pdf image.ps image.svg example_png_file.png
diff --git a/examples/text/Makefile.am b/examples/text/Makefile.am
deleted file mode 100644
index 9369eec..0000000
--- a/examples/text/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-include $(top_srcdir)/examples/Makefile.am_fragment
-
-# build the executable but don't install it
-noinst_PROGRAMS = text-rotate toy-text user-font
-
-text_rotate_SOURCES = text-rotate.cc
-toy_text_SOURCES=toy-text.cc
-user_font_SOURCES=user-font.cc
-
-CLEANFILES = text-rotate.png toy-text.png user-font.png