Rename src/*.mk to src/Makefile.*

Namely:

	src/Sources.mk      -> src/Makefile.sources
	src/Config.mk       -> src/Makefile.am.config
	src/Config.mk.win32 -> src/Makefile.win32.config

autogen.sh

@@ -182,8 +182,8 @@ do_cmd $ACLOCAL $ACLOCAL_FLAGS
 
 do_cmd $AUTOHEADER
 
-# create dummy src/Config.mk, which will later be created by configure
-echo > src/Config.mk
+# create dummy src/Makefile.am.config, which will later be created by configure
+echo > src/Makefile.am.config
 
 do_cmd $AUTOMAKE $AUTOMAKE_FLAGS
 

build/enable.ac

@@ -344,14 +344,14 @@ AC_SUBST(CAIRO_LIBS)
 
 dnl ===========================================================================
 dnl
-dnl Generate {src,boilerplate}/Config.mk{,.win32}
+dnl Generate {src,boilerplate}/Makefile.{am,win32}.config
 dnl
 
 dnl Accumulators
 m4_pattern_allow(^CAIRO_CONFIG_AMAKE$)
 CAIRO_CONFIG_AMAKE='# Generated by configure.  Do not edit.
 
-include $(top_srcdir)/src/Sources.mk
+include $(top_srcdir)/src/Makefile.sources
 
 enabled_cairo_pkgconf = cairo.pc
 enabled_cairo_headers = $(cairo_headers)
@@ -368,10 +368,10 @@ m4_pattern_allow(^CAIRO_CONFIG_WIN32$)
 CAIRO_CONFIG_WIN32=$CAIRO_CONFIG_AMAKE
 
 dnl Generate
-CAIRO_CONFIG_COMMANDS([$srcdir/src/Config.mk],
+CAIRO_CONFIG_COMMANDS([$srcdir/src/Makefile.am.config],
 		      [echo "$CAIRO_CONFIG_AMAKE"],
 		      [CAIRO_CONFIG_AMAKE='$CAIRO_CONFIG_AMAKE'])
-CAIRO_CONFIG_COMMANDS([$srcdir/src/Config.mk.win32],
+CAIRO_CONFIG_COMMANDS([$srcdir/src/Makefile.win32.config],
 		      [echo "$CAIRO_CONFIG_WIN32"],
 		      [CAIRO_CONFIG_WIN32='$CAIRO_CONFIG_WIN32'])
 

doc/public/Makefile.am

@@ -16,7 +16,7 @@ DOC_SOURCE_DIR=../../src
 HFILE_GLOB=$(top_srcdir)/src/cairo-*.h
 CFILE_GLOB=$(top_srcdir)/src/cairo-*.c $(top_srcdir)/src/cairo-*.h
 
-include $(top_srcdir)/src/Config.mk
+include $(top_srcdir)/src/Makefile.am.config
 
 # Headers to ignore
 IGNORE_HFILES= \

src/.gitignore

@@ -2,14 +2,14 @@
 .libs
 Makefile
 Makefile.in
+Makefile.am.config
+Makefile.win32.config
 *.gcda
 *.gcno
 *.la
 *.lo
 *.loT
 *.pc
-Config.mk
-Config.mk.win32
 cairo-features.h
 cairo-supported-features.h
 cairo.def

src/Makefile.am

@@ -1,4 +1,4 @@
-include $(srcdir)/Config.mk
+include $(srcdir)/Makefile.am.config
 
 EXTRA_DIST =
 CLEANFILES =
@@ -13,8 +13,8 @@ export_symbols = -export-symbols cairo.def
 cairo_def_dependency = cairo.def
 endif
 
-EXTRA_DIST           += cairo-supported-features.h cairo-features-win32.h Config.mk.win32
-MAINTAINERCLEANFILES += cairo-supported-features.h $(srcdir)/cairo-features-win32.h $(srcdir)/Config.mk.win32
+EXTRA_DIST           += cairo-supported-features.h cairo-features-win32.h Makefile.win32.config
+MAINTAINERCLEANFILES += cairo-supported-features.h $(srcdir)/cairo-features-win32.h $(srcdir)/Makefile.win32.config
 
 $(top_builddir)/config.h: $(top_srcdir)/config.h.in
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) config.h

src/Makefile.sources

@@ -1,4 +1,4 @@
-# Sources.mk
+# Makefile.am.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:
@@ -8,14 +8,14 @@
 #   * source code file
 #
 # Every source file should be specified exactly once, grouped with the
-# backend/feature that uses the source file.  If more than one
-# backend/feature use the file (like pdf_operators or font_subset files),
-# the files should be appended to to the base cairo files, and the code
-# inside them enabled/disabled using C preprocessor macros defined in
-# cairoint.h.  See how pdf_operators or font_subset are handled.
+# feature that uses the source file.  If more than one feature use the
+# file (like pdf_operators or font_subset files), the files should be
+# appended to to the base cairo files, and the code inside them
+# enabled/disabled using C preprocessor macros defined in cairoint.h.
+# See how pdf_operators or font_subset are handled.
 #
-# The sources are picked up according to the configured backends/features
-# by the generated file Config.mk or Config.mk.win32.
+# The sources are picked up according to the configured features
+# by the generated file Makefile.am.config or Makefile.win32.config.
 #
 # These are a few special source files.  Those are not included in this
 # file to not confuse build systems.  Each build system must handle them
@@ -23,9 +23,9 @@
 #
 #   * cairo-features.h:
 #     This file is generated by configure and includes macros signifying
-#     which backends/features are enabled.  This file should be installed
-#     like other public headers, but should NOT be distributed in the
-#     cairo distribution.
+#     which features are enabled.  This file should be installed like
+#     other public headers, but should NOT be distributed in the cairo
+#     distribution.
 #
 #   * cairo-features-win32.h:
 #     This is a dummy file for use as cairo-featurs.h when building on
@@ -45,10 +45,10 @@
 #
 #   * cairo-supported-features.h:
 #     This file is generated by configure and includes macros signifying
-#     all supported supported backends/features.  This is used by gtk-doc
-#     to generate documentation for all those macros, enabled or not.
-#     This file is NOT used during the build of the library and should NOT
-#     be installed or distributed.
+#     all supported features.  This is used by gtk-doc to generate
+#     documentation for all those macros, enabled or not.
+#     This file is NOT used during the build of the library and should
+#     NOT be installed or distributed.
 #
 # Please follow the strict syntax of this file, including keeping file
 # lists sorted.

src/Makefile.win32

@@ -2,7 +2,7 @@ SUBMAKEFILE = 1
 
 include ../Makefile.win32
 
-include Config.mk.win32
+include Makefile.win32.config
 
 srcdir = `pwd`
 

src/README

@@ -22,7 +22,7 @@ To add new backends you need to basically:
 
   * Modify $(top_srcdir)/configure.in to add checks for your backend.
 
-  * Modify Sources.mk to add source files for your backend,
+  * Modify Makefile.sources to add source files for your backend,
 
   * Modify $(top_srcdir)/boilerplate/ to add boilerplate code for
     testing your new backend.