[cairo-commit] build/configure.ac.enable src/Makefile.am src/Makefile.sources

[Behdad Esfahbod]

 build/configure.ac.enable |   26 ++++++++++++++++++--------
 src/Makefile.am           |    6 ------
 src/Makefile.sources      |    2 +-
 3 files changed, 19 insertions(+), 15 deletions(-)

New commits:
commit 93325a3f086914c6836d6ca81c777e738f0ae6a3
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Sep 11 19:12:31 2008 -0400

    [configure.ac.enable] Cleanup Makefile.*.config generation

diff --git a/build/configure.ac.enable b/build/configure.ac.enable
index aa5d71d..e44d10b 100644
--- a/build/configure.ac.enable
+++ b/build/configure.ac.enable
@@ -86,16 +86,19 @@ dnl	CAIRO_ACCUMULATE(FEATURES, cr_feature_tag)
 CAIRO_ACCUMULATORS_REGISTER(CONFIG_AMAKE,m4_newline,[# Generated by configure.  Do not edit.
 include $(top_srcdir)/src/Makefile.sources
 
-enabled_cairo_pkgconf = cairo.pc
-enabled_cairo_headers = $(cairo_headers)
-enabled_cairo_private = $(cairo_private)
-enabled_cairo_sources = $(cairo_sources)
-all_cairo_pkgconf =
+all_cairo_files = $(all_cairo_headers) $(all_cairo_private) $(all_cairo_sources)
+enabled_cairo_files = $(enabled_cairo_headers) $(enabled_cairo_private) $(enabled_cairo_sources)
+
 all_cairo_headers = $(cairo_headers)
 all_cairo_private = $(cairo_private)
 all_cairo_sources = $(cairo_sources)
+enabled_cairo_headers = $(cairo_headers)
+enabled_cairo_private = $(cairo_private)
+enabled_cairo_sources = $(cairo_sources)
+
 supported_cairo_headers = $(cairo_headers)
-unsupported_cairo_headers =])dnl
+unsupported_cairo_headers =
+])dnl
 
 CAIRO_ACCUMULATORS_REGISTER_UNQUOTED(CONFIG_WIN32,m4_newline,[$CAIRO_CONFIG_AMAKE])dnl
 
@@ -237,15 +240,22 @@ CAIRO_FEATURE_HOOK_REGISTER(yes,!always,!,
 	])dnl
 ])dnl
 
+
 dnl Collect list of .pc files for all/enabled non-builtin public features
+
+CAIRO_ACCUMULATE(CONFIG_AMAKE, [dnl
+all_cairo_pkgconf = cairo.pc
+enabled_cairo_pkgconf = cairo.pc
+])dnl
+
 CAIRO_FEATURE_HOOK_REGISTER(*,!always,!,
 [dnl
-	CAIRO_CONFIG_AMAKE=$CAIRO_CONFIG_AMAKE'
+	CAIRO_ACCUMULATE(CONFIG_AMAKE, [dnl
 all_cairo_pkgconf += cr_feature_pc
 if cr_feature_tag
 enabled_cairo_pkgconf += cr_feature_pc
 endif
-'
+])dnl
 ])dnl
 
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 4ea982f..5ef7ce0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,12 +14,6 @@ MAINTAINERCLEANFILES += cairo-supported-features.h $(srcdir)/cairo-features-win3
 $(top_builddir)/config.h: $(top_srcdir)/config.h.in
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) config.h
 
-all_cairo_files = \
-	$(cairo_all_headers) \
-	$(cairo_all_private) \
-	$(cairo_all_sources) \
-	$(NULL)
-
 cairoincludedir = $(includedir)/cairo
 cairoinclude_HEADERS = $(enabled_cairo_headers)
 
diff --git a/src/Makefile.sources b/src/Makefile.sources
index 4b916fa..2ce7746 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -1,4 +1,4 @@
-# Makefile.am.sources
+# Makefile.sources
 #
 # This file is the canonical location listing all the source files used
 # to build the cairo library.  Every source file is categorized as one of: