Get rid of all Makefile.am in the MSVC dirs

* MSVC_Net2005/**/.cvsignore:
* MSVC_Net2008/**/.cvsignore: Remove obsolete .cvsignore files.
* MSVC_Net2005/**/Makefile.am:
* MSVC_Net2008/**/Makefile.am: Remove recursive build files.
* MSVC_Net2005/filelist.am:
* MSVC_Net2008/filelist.am: Recursively list all files that should go
into the distribution.
* configure.ac (AC_CONFIG_FILES): Remove all Makefile outputs to the
MSVC subdirectories.
 (AC_CONFIG_COMMANDS): Copy the configuration header files into the
MSVC subdirectories by making config.status execute custom
configuration commands. This is easier than doing it at the Makefile
level, where it was previously implemented.
* Makefile.am: Include the filelist.am files from the MSVC
subdirectories.
 (SUBDIRS): Remove MSVC_Net200[58] directories from the list.
 (dist_noinst_DATA): Distribute the MSVC project files.
 (DISTCLEANFILES): Include the copied configuration header files in a
 distclean.

46 files changed, 74 insertions, 154 deletions

diff --git a/ChangeLog b/ChangeLog
index b4881cf..29ac754 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
 2009-08-12  David King  <davidk@openismus.com>
 
+	* MSVC_Net2005/**/Makefile.am:
+	* MSVC_Net2008/**/Makefile.am: Remove recursive build files.
+	* MSVC_Net2005/filelist.am:
+	* MSVC_Net2008/filelist.am: Recursively list all files that should go
+	into the distribution.
+	* configure.ac (AC_CONFIG_FILES): Remove all Makefile outputs to the
+	MSVC subdirectories.
+	 (AC_CONFIG_COMMANDS): Copy the configuration header files into the
+	MSVC subdirectories by making config.status execute custom
+	configuration commands. This is easier than doing it at the Makefile
+	level, where it was previously implemented.
+	* Makefile.am: Include the filelist.am files from the MSVC
+	subdirectories.
+	 (SUBDIRS): Remove MSVC_Net200[58] directories from the list.
+	 (dist_noinst_DATA): Distribute the MSVC project files.
+	 (DISTCLEANFILES): Include the copied configuration header files in a
+	 distclean.
+
+2009-08-12  David King  <davidk@openismus.com>
+
 	* .gitignore: Add new generated documentation files.
 	* Makefile.am: Remove old documentation generation build.
 	* configure.ac:
diff --git a/MSVC_Net2005/.cvsignore b/MSVC_Net2005/.cvsignore
deleted file mode 100644
index 77fd409..0000000
--- a/MSVC_Net2005/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-cairomm.ncb
-cairomm.suo
diff --git a/MSVC_Net2005/Makefile.am b/MSVC_Net2005/Makefile.am
deleted file mode 100644
index 976d5a5..0000000
--- a/MSVC_Net2005/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = gendef cairomm examples
-
-EXTRA_DIST = blank.cpp cairomm.sln README
diff --git a/MSVC_Net2005/cairomm/.cvsignore b/MSVC_Net2005/cairomm/.cvsignore
deleted file mode 100644
index 2858914..0000000
--- a/MSVC_Net2005/cairomm/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile
-Makefile.in
-Debug
-Release
-cairomm.def
-cairomm_d.def
-cairomm.rc
-cairomm.aps
diff --git a/MSVC_Net2005/cairomm/Makefile.am b/MSVC_Net2005/cairomm/Makefile.am
deleted file mode 100644
index 5fc9b3e..0000000
--- a/MSVC_Net2005/cairomm/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-BUILT_SOURCES = cairommconfig.h cairomm.rc
-
-MAINTAINERCLEANFILES = $(built_sources)
-
-EXTRA_DIST = cairommconfig.h cairomm.vcproj cairomm.rc
-
-# Copy config file generated by the configure script. Dependency is
-# wht respect to the .h.in file, to prevent an error with 'make distcheck'.
-# See http://sources.redhat.com/automake/automake.html#distcleancheck
-
-cairommconfig.h: $(top_srcdir)/cairomm/cairommconfig.h.in $(top_srcdir)/configure.ac
-	cp -f $(top_builddir)/cairomm/cairommconfig.h $@
diff --git a/MSVC_Net2005/examples/.cvsignore b/MSVC_Net2005/examples/.cvsignore
deleted file mode 100644
index 22a4e72..0000000
--- a/MSVC_Net2005/examples/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-
diff --git a/MSVC_Net2005/examples/Makefile.am b/MSVC_Net2005/examples/Makefile.am
deleted file mode 100644
index 952ab83..0000000
--- a/MSVC_Net2005/examples/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = pdf-surface ps-surface svg-surface image-surface text-rotate \
-          toy-text user-font
diff --git a/MSVC_Net2005/examples/image-surface/Makefile.am b/MSVC_Net2005/examples/image-surface/Makefile.am
deleted file mode 100644
index 55dd33c..0000000
--- a/MSVC_Net2005/examples/image-surface/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = image-surface.vcproj
diff --git a/MSVC_Net2005/examples/pdf-surface/.cvsignore b/MSVC_Net2005/examples/pdf-surface/.cvsignore
deleted file mode 100644
index a973b4d..0000000
--- a/MSVC_Net2005/examples/pdf-surface/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-Debug
-Release
diff --git a/MSVC_Net2005/examples/pdf-surface/Makefile.am b/MSVC_Net2005/examples/pdf-surface/Makefile.am
deleted file mode 100644
index e94dba1..0000000
--- a/MSVC_Net2005/examples/pdf-surface/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = pdf-surface.vcproj
diff --git a/MSVC_Net2005/examples/png_file/.cvsignore b/MSVC_Net2005/examples/png_file/.cvsignore
deleted file mode 100644
index a973b4d..0000000
--- a/MSVC_Net2005/examples/png_file/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-Debug
-Release
diff --git a/MSVC_Net2005/examples/png_file/Makefile.am b/MSVC_Net2005/examples/png_file/Makefile.am
deleted file mode 100644
index 41f7722..0000000
--- a/MSVC_Net2005/examples/png_file/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = png_file.vcproj
diff --git a/MSVC_Net2005/examples/ps-surface/.cvsignore b/MSVC_Net2005/examples/ps-surface/.cvsignore
deleted file mode 100644
index a973b4d..0000000
--- a/MSVC_Net2005/examples/ps-surface/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-Debug
-Release
diff --git a/MSVC_Net2005/examples/ps-surface/Makefile.am b/MSVC_Net2005/examples/ps-surface/Makefile.am
deleted file mode 100644
index d827e57..0000000
--- a/MSVC_Net2005/examples/ps-surface/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = ps-surface.vcproj
diff --git a/MSVC_Net2005/examples/svg-surface/.cvsignore b/MSVC_Net2005/examples/svg-surface/.cvsignore
deleted file mode 100644
index a973b4d..0000000
--- a/MSVC_Net2005/examples/svg-surface/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-Debug
-Release
diff --git a/MSVC_Net2005/examples/svg-surface/Makefile.am b/MSVC_Net2005/examples/svg-surface/Makefile.am
deleted file mode 100644
index 4ce523e..0000000
--- a/MSVC_Net2005/examples/svg-surface/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = svg-surface.vcproj
diff --git a/MSVC_Net2005/examples/text-rotate/.cvsignore b/MSVC_Net2005/examples/text-rotate/.cvsignore
deleted file mode 100644
index a973b4d..0000000
--- a/MSVC_Net2005/examples/text-rotate/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-Debug
-Release
diff --git a/MSVC_Net2005/examples/text-rotate/Makefile.am b/MSVC_Net2005/examples/text-rotate/Makefile.am
deleted file mode 100644
index 6eb15e4..0000000
--- a/MSVC_Net2005/examples/text-rotate/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = text-rotate.vcproj
diff --git a/MSVC_Net2005/examples/toy-text/Makefile.am b/MSVC_Net2005/examples/toy-text/Makefile.am
deleted file mode 100644
index 4d1cf43..0000000
--- a/MSVC_Net2005/examples/toy-text/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = toy-text.vcproj
diff --git a/MSVC_Net2005/examples/user-font/Makefile.am b/MSVC_Net2005/examples/user-font/Makefile.am
deleted file mode 100644
index f40df84..0000000
--- a/MSVC_Net2005/examples/user-font/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = user-font.vcproj
diff --git a/MSVC_Net2005/filelist.am b/MSVC_Net2005/filelist.am
new file mode 100644
index 0000000..20aa61c
--- /dev/null
+++ b/MSVC_Net2005/filelist.am
@@ -0,0 +1,18 @@
+## This file is part of cairomm
+
+msvc_net2005_data = README \
+                    blank.cpp \
+                    cairomm.sln \
+                    gendef/gendef.vcproj \
+                    gendef/gendef.cc \
+                    cairomm/cairommconfig.h \
+                    cairomm/cairomm.rc \
+                    cairomm/cairomm.vcproj \
+                    examples/image-surface/image-surface.vcproj \
+                    examples/pdf-surface/pdf-surface.vcproj \
+                    examples/png_file/png_file.vcproj \
+                    examples/ps-surface/ps-surface.vcproj \
+                    examples/svg-surface/svg-surface.vcproj \
+                    examples/text-rotate/text-rotate.vcproj \
+                    examples/toy-text/toy-text.vcproj \
+                    examples/user-font/user-font.vcproj
diff --git a/MSVC_Net2005/gendef/.cvsignore b/MSVC_Net2005/gendef/.cvsignore
deleted file mode 100644
index a973b4d..0000000
--- a/MSVC_Net2005/gendef/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-Debug
-Release
diff --git a/MSVC_Net2005/gendef/Makefile.am b/MSVC_Net2005/gendef/Makefile.am
deleted file mode 100644
index 3a435c3..0000000
--- a/MSVC_Net2005/gendef/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = gendef.vcproj gendef.cc
-
diff --git a/MSVC_Net2008/Makefile.am b/MSVC_Net2008/Makefile.am
deleted file mode 100644
index 976d5a5..0000000
--- a/MSVC_Net2008/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = gendef cairomm examples
-
-EXTRA_DIST = blank.cpp cairomm.sln README
diff --git a/MSVC_Net2008/cairomm/.cvsignore b/MSVC_Net2008/cairomm/.cvsignore
deleted file mode 100644
index 2858914..0000000
--- a/MSVC_Net2008/cairomm/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile
-Makefile.in
-Debug
-Release
-cairomm.def
-cairomm_d.def
-cairomm.rc
-cairomm.aps
diff --git a/MSVC_Net2008/cairomm/Makefile.am b/MSVC_Net2008/cairomm/Makefile.am
deleted file mode 100644
index 5fc9b3e..0000000
--- a/MSVC_Net2008/cairomm/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-BUILT_SOURCES = cairommconfig.h cairomm.rc
-
-MAINTAINERCLEANFILES = $(built_sources)
-
-EXTRA_DIST = cairommconfig.h cairomm.vcproj cairomm.rc
-
-# Copy config file generated by the configure script. Dependency is
-# wht respect to the .h.in file, to prevent an error with 'make distcheck'.
-# See http://sources.redhat.com/automake/automake.html#distcleancheck
-
-cairommconfig.h: $(top_srcdir)/cairomm/cairommconfig.h.in $(top_srcdir)/configure.ac
-	cp -f $(top_builddir)/cairomm/cairommconfig.h $@
diff --git a/MSVC_Net2008/examples/.cvsignore b/MSVC_Net2008/examples/.cvsignore
deleted file mode 100644
index 22a4e72..0000000
--- a/MSVC_Net2008/examples/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-
diff --git a/MSVC_Net2008/examples/Makefile.am b/MSVC_Net2008/examples/Makefile.am
deleted file mode 100644
index 952ab83..0000000
--- a/MSVC_Net2008/examples/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = pdf-surface ps-surface svg-surface image-surface text-rotate \
-          toy-text user-font
diff --git a/MSVC_Net2008/examples/image-surface/Makefile.am b/MSVC_Net2008/examples/image-surface/Makefile.am
deleted file mode 100644
index 55dd33c..0000000
--- a/MSVC_Net2008/examples/image-surface/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = image-surface.vcproj
diff --git a/MSVC_Net2008/examples/pdf-surface/.cvsignore b/MSVC_Net2008/examples/pdf-surface/.cvsignore
deleted file mode 100644
index a973b4d..0000000
--- a/MSVC_Net2008/examples/pdf-surface/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-Debug
-Release
diff --git a/MSVC_Net2008/examples/pdf-surface/Makefile.am b/MSVC_Net2008/examples/pdf-surface/Makefile.am
deleted file mode 100644
index e94dba1..0000000
--- a/MSVC_Net2008/examples/pdf-surface/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = pdf-surface.vcproj
diff --git a/MSVC_Net2008/examples/png_file/.cvsignore b/MSVC_Net2008/examples/png_file/.cvsignore
deleted file mode 100644
index a973b4d..0000000
--- a/MSVC_Net2008/examples/png_file/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-Debug
-Release
diff --git a/MSVC_Net2008/examples/png_file/Makefile.am b/MSVC_Net2008/examples/png_file/Makefile.am
deleted file mode 100644
index 41f7722..0000000
--- a/MSVC_Net2008/examples/png_file/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = png_file.vcproj
diff --git a/MSVC_Net2008/examples/ps-surface/.cvsignore b/MSVC_Net2008/examples/ps-surface/.cvsignore
deleted file mode 100644
index a973b4d..0000000
--- a/MSVC_Net2008/examples/ps-surface/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-Debug
-Release
diff --git a/MSVC_Net2008/examples/ps-surface/Makefile.am b/MSVC_Net2008/examples/ps-surface/Makefile.am
deleted file mode 100644
index d827e57..0000000
--- a/MSVC_Net2008/examples/ps-surface/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = ps-surface.vcproj
diff --git a/MSVC_Net2008/examples/svg-surface/.cvsignore b/MSVC_Net2008/examples/svg-surface/.cvsignore
deleted file mode 100644
index a973b4d..0000000
--- a/MSVC_Net2008/examples/svg-surface/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-Debug
-Release
diff --git a/MSVC_Net2008/examples/svg-surface/Makefile.am b/MSVC_Net2008/examples/svg-surface/Makefile.am
deleted file mode 100644
index 4ce523e..0000000
--- a/MSVC_Net2008/examples/svg-surface/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = svg-surface.vcproj
diff --git a/MSVC_Net2008/examples/text-rotate/.cvsignore b/MSVC_Net2008/examples/text-rotate/.cvsignore
deleted file mode 100644
index a973b4d..0000000
--- a/MSVC_Net2008/examples/text-rotate/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-Debug
-Release
diff --git a/MSVC_Net2008/examples/text-rotate/Makefile.am b/MSVC_Net2008/examples/text-rotate/Makefile.am
deleted file mode 100644
index 6eb15e4..0000000
--- a/MSVC_Net2008/examples/text-rotate/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = text-rotate.vcproj
diff --git a/MSVC_Net2008/examples/toy-text/Makefile.am b/MSVC_Net2008/examples/toy-text/Makefile.am
deleted file mode 100644
index 4d1cf43..0000000
--- a/MSVC_Net2008/examples/toy-text/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = toy-text.vcproj
diff --git a/MSVC_Net2008/examples/user-font/Makefile.am b/MSVC_Net2008/examples/user-font/Makefile.am
deleted file mode 100644
index f40df84..0000000
--- a/MSVC_Net2008/examples/user-font/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = user-font.vcproj
diff --git a/MSVC_Net2008/filelist.am b/MSVC_Net2008/filelist.am
new file mode 100644
index 0000000..1ff53c8
--- /dev/null
+++ b/MSVC_Net2008/filelist.am
@@ -0,0 +1,18 @@
+## This file is part of cairomm
+
+msvc_net2008_data = README \
+                    blank.cpp \
+                    cairomm.sln \
+                    gendef/gendef.vcproj \
+                    gendef/gendef.cc \
+                    cairomm/cairommconfig.h \
+                    cairomm/cairomm.rc \
+                    cairomm/cairomm.vcproj \
+                    examples/image-surface/image-surface.vcproj \
+                    examples/pdf-surface/pdf-surface.vcproj \
+                    examples/png_file/png_file.vcproj \
+                    examples/ps-surface/ps-surface.vcproj \
+                    examples/svg-surface/svg-surface.vcproj \
+                    examples/text-rotate/text-rotate.vcproj \
+                    examples/toy-text/toy-text.vcproj \
+                    examples/user-font/user-font.vcproj
diff --git a/MSVC_Net2008/gendef/.cvsignore b/MSVC_Net2008/gendef/.cvsignore
deleted file mode 100644
index a973b4d..0000000
--- a/MSVC_Net2008/gendef/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-Debug
-Release
diff --git a/MSVC_Net2008/gendef/Makefile.am b/MSVC_Net2008/gendef/Makefile.am
deleted file mode 100644
index 3a435c3..0000000
--- a/MSVC_Net2008/gendef/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = gendef.vcproj gendef.cc
-
diff --git a/Makefile.am b/Makefile.am
index 51fb380..161c9a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ doc_subdirs = docs
 else
 doc_subdirs =
 endif
-SUBDIRS = cairomm $(doc_subdirs) data examples MSVC_Net2005 MSVC_Net2008 tests
+SUBDIRS = cairomm $(doc_subdirs) data examples tests
 ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
 DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=fatal
 
@@ -15,6 +15,16 @@ nodist_cairomm_libinclude_HEADERS = cairomm/cairommconfig.h
 pkgconfigdir = $(libdir)/pkgconfig
 nodist_pkgconfig_DATA = data/$(CAIROMM_MODULE_NAME).pc
 
+include $(srcdir)/MSVC_Net2005/filelist.am
+include $(srcdir)/MSVC_Net2008/filelist.am
+
+msvc_files = $(msvc_net2005_data:%=MSVC_Net2005/%) $(msvc_net2008_data:%=MSVC_Net2008/%)
+
+dist_noinst_DATA = $(msvc_files)
+
+DISTCLEANFILES = MSVC_Net2005/cairomm/cairommconfig.h \
+                 MSVC_Net2008/cairomm/cairommconfig.h
+
 dist_noinst_SCRIPTS = autogen.sh
 
 ###
diff --git a/configure.ac b/configure.ac
index 18dcdde..8df9f06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,30 +212,12 @@ CAIROMM_ARG_ENABLE_API_EXCEPTIONS
 
 AC_CONFIG_FILES([
   $CONFIG_PC
-  MSVC_Net2005/Makefile
-    MSVC_Net2005/gendef/Makefile
-    MSVC_Net2005/cairomm/Makefile
-    MSVC_Net2005/cairomm/cairomm.rc
-    MSVC_Net2005/examples/Makefile
-      MSVC_Net2005/examples/pdf-surface/Makefile
-      MSVC_Net2005/examples/ps-surface/Makefile
-      MSVC_Net2005/examples/svg-surface/Makefile
-      MSVC_Net2005/examples/image-surface/Makefile
-      MSVC_Net2005/examples/text-rotate/Makefile
-      MSVC_Net2005/examples/toy-text/Makefile
-      MSVC_Net2005/examples/user-font/Makefile
-  MSVC_Net2008/Makefile
-    MSVC_Net2008/gendef/Makefile
-    MSVC_Net2008/cairomm/Makefile
-    MSVC_Net2008/cairomm/cairomm.rc
-    MSVC_Net2008/examples/Makefile
-      MSVC_Net2008/examples/pdf-surface/Makefile
-      MSVC_Net2008/examples/ps-surface/Makefile
-      MSVC_Net2008/examples/svg-surface/Makefile
-      MSVC_Net2008/examples/image-surface/Makefile
-      MSVC_Net2008/examples/text-rotate/Makefile
-      MSVC_Net2008/examples/toy-text/Makefile
-      MSVC_Net2008/examples/user-font/Makefile
-])
+  MSVC_Net2005/cairomm/cairomm.rc
+  MSVC_Net2008/cairomm/cairomm.rc])
+
+AC_CONFIG_COMMANDS([MSVC_Net2005/cairomm/cairommconfig.h],
+                   [cp -f cairomm/cairommconfig.h MSVC_Net2005/cairomm/cairommconfig.h])
+AC_CONFIG_COMMANDS([MSVC_Net2008/cairomm/cairommconfig.h],
+                   [cp -f cairomm/cairommconfig.h MSVC_Net2008/cairomm/cairommconfig.h])
 
 AC_OUTPUT