diff --git a/src/Makefile.am b/src/Makefile.am
index 6390d3290..bf1068aee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,19 @@
+font_subset_sources =				\
+	cairo-font-subset.c			\
+	cairo-font-subset-private.h		\
+	cairo-scaled-font-subsets.c		\
+	cairo-scaled-font-subsets-private.h
 
 if CAIRO_HAS_PS_SURFACE
 libcairo_ps_headers = cairo-ps.h
-libcairo_ps_sources = cairo-ps-surface.c cairo-scaled-font-subsets.c cairo-scaled-font-subsets-private.h
-libcairo_font_subset_sources = cairo-font-subset.c cairo-font-subset-private.h
+libcairo_ps_sources = cairo-ps-surface.c
+libcairo_font_subset_sources =	$(font_subset_sources)
 endif
 
 if CAIRO_HAS_PDF_SURFACE
 libcairo_pdf_headers = cairo-pdf.h
 libcairo_pdf_sources = cairo-pdf-surface.c
-libcairo_font_subset_sources = cairo-font-subset.c cairo-font-subset-private.h
+libcairo_font_subset_sources =	$(font_subset_sources)
 endif
 
 if CAIRO_HAS_PNG_FUNCTIONS
@@ -18,6 +23,7 @@ endif
 if CAIRO_HAS_SVG_SURFACE
 libcairo_svg_headers = cairo-svg.h
 libcairo_svg_sources = cairo-svg-surface.c
+libcairo_font_subset_sources =	$(font_subset_sources)
 endif
 
 if CAIRO_HAS_TEST_SURFACES