[pangomm] Further reduce pointless make recursion

[Daniel Elstner <daniel src gnome org>]

commit fc15ff1aaf23a5ea672c17a3705e9f9fcee20788
Author: Daniel Elstner <danielk openismus com>
Date:   Tue Aug 11 16:58:00 2009 +0200

    Further reduce pointless make recursion
    
    * scripts/Makefile.am: Delete file.
    * MSVC_Net200[58]/**/Makefile.am: Delete files.
    * MSVC_Net200[58]/filelist.am: New files, defining the files to
    distribute from the MSVC subdirectories.
    * Makefile.am: Include MSVC_Net200[58]/filelist.am and distribute
    the files listed there.
    (SUBDIRS): Remove scripts/ and MSVC_Net200[58]/.  Temporarily
    remove docs/ subdirectory.
    * configure.ac: Use mm-common Autoconf macros for setting up the
    documentation build.
    (AC_CONFIG_FILES): Remove deleted Makefiles from the list.
    (AC_CONFIG_COMMANDS): Append commands to config.status to copy the
    pangommconfig.h configuration header into the MSVC subdirectories.

 ChangeLog                        |   18 +++++++++++++
 MSVC_Net2005/Makefile.am         |    3 --
 MSVC_Net2005/filelist.am         |   10 +++++++
 MSVC_Net2005/gendef/Makefile.am  |    2 -
 MSVC_Net2005/pangomm/Makefile.am |   12 --------
 MSVC_Net2008/Makefile.am         |    3 --
 MSVC_Net2008/filelist.am         |   10 +++++++
 MSVC_Net2008/gendef/Makefile.am  |    2 -
 MSVC_Net2008/pangomm/Makefile.am |   12 --------
 Makefile.am                      |   16 ++++++++++-
 configure.ac                     |   53 +++++++++++++++++--------------------
 scripts/Makefile.am              |    4 ---
 12 files changed, 76 insertions(+), 69 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4c691c2..75d2dd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2009-08-11  Daniel Elstner  <danielk openismus com>
 
+	Further reduce pointless make recursion
+
+	* scripts/Makefile.am: Delete file.
+	* MSVC_Net200[58]/**/Makefile.am: Delete files.
+	* MSVC_Net200[58]/filelist.am: New files, defining the files to
+	distribute from the MSVC subdirectories.
+	* Makefile.am: Include MSVC_Net200[58]/filelist.am and distribute
+	the files listed there.
+	(SUBDIRS): Remove scripts/ and MSVC_Net200[58]/.  Temporarily
+	remove docs/ subdirectory.
+	* configure.ac: Use mm-common Autoconf macros for setting up the
+	documentation build.
+	(AC_CONFIG_FILES): Remove deleted Makefiles from the list.
+	(AC_CONFIG_COMMANDS): Append commands to config.status to copy the
+	pangommconfig.h configuration header into the MSVC subdirectories.
+
+2009-08-11  Daniel Elstner  <danielk openismus com>
+
 	Convert tools/ and pango/ to new infrastructure
 
 	* Makefile.am (SUBDIRS): Skip the pango/ subdirectory and recurse
diff --git a/MSVC_Net2005/filelist.am b/MSVC_Net2005/filelist.am
new file mode 100644
index 0000000..38d7e33
--- /dev/null
+++ b/MSVC_Net2005/filelist.am
@@ -0,0 +1,10 @@
+## This file is part of pangomm.
+
+msvc_net2005_data =				\
+	blank.cpp				\
+	pangomm.sln				\
+	gendef/gendef.vcproj			\
+	gendef/gendef.cc			\
+	pangomm/pangomm.rc			\
+	pangomm/pangomm.vcproj			\
+	pangomm/pangommconfig.h
diff --git a/MSVC_Net2008/filelist.am b/MSVC_Net2008/filelist.am
new file mode 100644
index 0000000..088db46
--- /dev/null
+++ b/MSVC_Net2008/filelist.am
@@ -0,0 +1,10 @@
+## This file is part of pangomm.
+
+msvc_net2008_data =				\
+	blank.cpp				\
+	pangomm.sln				\
+	gendef/gendef.vcproj			\
+	gendef/gendef.cc			\
+	pangomm/pangomm.rc			\
+	pangomm/pangomm.vcproj			\
+	pangomm/pangommconfig.h
diff --git a/Makefile.am b/Makefile.am
index 6b47673..d09d00a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,8 +23,20 @@ src_subdirs = tools pango/src
 else
 src_subdirs =
 endif
+if ENABLE_DOCUMENTATION
+doc_subdirs = docs
+else
+doc_subdirs =
+endif
 SUBDIRS = $(src_subdirs) pango/pangomm
-DIST_SUBDIRS = tools pango/src pango/pangomm docs scripts MSVC_Net2005 MSVC_Net2008
 
-dist_noinst_DATA = COPYING.tools README.SUN README.win32
+include $(srcdir)/MSVC_Net2005/filelist.am
+include $(srcdir)/MSVC_Net2008/filelist.am
+
+text_files = COPYING.tools README.SUN README.win32 scripts/README
+msvc_files = $(msvc_net2005_data:%=MSVC_Net2005/%) $(msvc_net2008_data:%=MSVC_Net2008/%)
+
+dist_noinst_DATA = $(text_files) $(msvc_files)
 dist_noinst_SCRIPTS = autogen.sh
+
+DISTCLEANFILES = MSVC_Net2005/pangomm/pangommconfig.h MSVC_Net2008/pangomm/pangommconfig.h
diff --git a/configure.ac b/configure.ac
index 313d9e3..de86770 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,12 +44,10 @@ PKG_CHECK_MODULES([PANGOMM], [$PANGOMM_MODULES])
 MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
 MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
 
-AC_LANG([C++])
-
-MM_ARG_ENABLE_WARNINGS([PANGOMM_WXXFLAGS],
-                       [-Wall],
-                       [-pedantic -Wall -Wextra],
-                       [G PANGO])
+MM_ARG_ENABLE_DOCUMENTATION
+MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
+MM_ARG_WITH_TAGFILE_DOC([libsigc++-2.0.tag], [sigc++-2.0])
+MM_ARG_WITH_TAGFILE_DOC([glibmm-2.4.tag], [glibmm-2.4])
 
 AC_ARG_ENABLE([deprecated-api],
               [AS_HELP_STRING([--disable-deprecated-api],
@@ -61,33 +59,30 @@ AS_IF([test "x$pangomm_deprecated_api" = xyes],
   AC_MSG_NOTICE([[Deprecated API will be built, for backwards-compatibility.]])
   DISABLE_DEPRECATED_API_CFLAGS=dnl
 ], [
-  AC_MSG_WARN([[Deprecated API will not be built, breaking backwards-compatibility.
+  AC_MSG_WARN([[Deprecated API will not be built, breaking compatibility.
 Do not use this option for distribution packages.]])
   DISABLE_DEPRECATED_API_CFLAGS='-DPANGOMM_DISABLE_DEPRECATED'dnl
 ])
 AC_SUBST([DISABLE_DEPRECATED_API_CFLAGS])
 
-AC_CONFIG_FILES([
-  Makefile
-
-  pango/pangomm-1.4.pc
-    pango/src/Makefile
-    pango/pangomm/Makefile
-
-  tools/Makefile
-
-  MSVC_Net2005/Makefile
-    MSVC_Net2005/gendef/Makefile
-    MSVC_Net2005/pangomm/Makefile
-    MSVC_Net2005/pangomm/pangomm.rc
-  MSVC_Net2008/Makefile
-    MSVC_Net2008/gendef/Makefile
-    MSVC_Net2008/pangomm/Makefile
-    MSVC_Net2008/pangomm/pangomm.rc
-])
-
-AC_CONFIG_FILES([
-  scripts/Makefile
-])
+AC_LANG([C++])
+MM_ARG_ENABLE_WARNINGS([PANGOMM_WXXFLAGS],
+                       [-Wall],
+                       [-pedantic -Wall -Wextra],
+                       [G PANGO])
 
+AC_CONFIG_FILES([Makefile
+                 tools/Makefile
+                 pango/pangomm-1.4.pc
+                 pango/src/Makefile
+                 pango/pangomm/Makefile
+                 docs/Makefile
+                 MSVC_Net2005/pangomm/pangomm.rc
+                 MSVC_Net2008/pangomm/pangomm.rc])
+
+# Copy the generated configuration headers into the MSVC project directories.
+AC_CONFIG_COMMANDS([MSVC_Net2005/pangomm/pangommconfig.h],
+                   [cp -f pango/pangommconfig.h MSVC_Net2005/pangomm/pangommconfig.h])
+AC_CONFIG_COMMANDS([MSVC_Net2008/pangomm/pangommconfig.h],
+                   [cp -f pango/pangommconfig.h MSVC_Net2008/pangomm/pangommconfig.h])
 AC_OUTPUT