[gtkmm] Clean up remaining cruft in scripts/

[Daniel Elstner <daniel src gnome org>]

commit 736bf96289e57126b52a3f5392cf93b6e02c607f
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Thu Aug 13 02:42:29 2009 +0200

    Clean up remaining cruft in scripts/
    
    * Makefile.am (DIST_SUBDIRS): Remove the explicit assignment, and
    have Automake figure it out for itself.
    * configure.ac (AC_CONFIG_FILES): Remove scripts/Makefile output
    file.  Merge the remaining output files into one list, and clean
    up a bit.
    * scripts/Makefile.am: Delete now unused build file.
    * scripts/README: Delete unhelpful text file.
    * scripts/{cxx,cxx_std,dk-warn,docgen,macros}.m4: Delete outdated
    and no longer used Autoconf macro files.

 ChangeLog           |   14 +++++
 Makefile.am         |    2 -
 configure.ac        |   69 ++++++++---------------
 scripts/Makefile.am |    4 -
 scripts/README      |    2 -
 scripts/cxx.m4      |  140 ----------------------------------------------
 scripts/cxx_std.m4  |  153 ---------------------------------------------------
 scripts/dk-warn.m4  |  114 --------------------------------------
 scripts/docgen.m4   |   18 ------
 scripts/macros.m4   |   51 -----------------
 10 files changed, 37 insertions(+), 530 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index dc5aac2..a4806f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-08-13  Daniel Elstner  <daniel kitta gmail com>
+
+	Clean up remaining cruft in scripts/
+
+	* Makefile.am (DIST_SUBDIRS): Remove the explicit assignment, and
+	have Automake figure it out for itself.
+	* configure.ac (AC_CONFIG_FILES): Remove scripts/Makefile output
+	file.  Merge the remaining output files into one list, and clean
+	up a bit.
+	* scripts/Makefile.am: Delete now unused build file.
+	* scripts/README: Delete unhelpful text file.
+	* scripts/{cxx,cxx_std,dk-warn,docgen,macros}.m4: Delete outdated
+	and no longer used Autoconf macro files.
+
 2009-08-12  Daniel Elstner  <daniel kitta gmail com>
 
 	Convert tests/ to non-recursive build
diff --git a/Makefile.am b/Makefile.am
index f7d8e5d..fbba2b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,13 +38,11 @@ else
 doc_subdirs =
 endif
 SUBDIRS = $(src_subdirs) $(atk_built_subdir) gdk/gdkmm gtk/gtkmm tests demos $(doc_subdirs)
-DIST_SUBDIRS = tools atk/src gdk/src gtk/src atk/atkmm gdk/gdkmm gtk/gtkmm tests demos docs scripts
 
 if GTKMM_ATKMM_ENABLED
 atkmm_includedir = $(includedir)/$(ATKMM_MODULE_NAME)
 atkmm_include_HEADERS = atk/atkmm.h
 endif
-
 gdkmm_includedir = $(includedir)/$(GDKMM_MODULE_NAME)
 gdkmm_include_HEADERS = gdk/gdkmm.h
 gdkmm_libincludedir = $(libdir)/$(GDKMM_MODULE_NAME)/include
diff --git a/configure.ac b/configure.ac
index dff4b54..b65b7ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,7 +100,7 @@ GTKMM_ARG_ENABLE_API_ATKMM
 
 AS_IF([test "x$gtkmm_enable_api_atkmm" = xno],
       [GTKMM_PC_ATKMM_DEP=],
-      [GTKMM_PC_ATKMM_DEP=atkmm-1.6])
+      [GTKMM_PC_ATKMM_DEP=$ATKMM_MODULE_NAME])
 AC_SUBST([GTKMM_PC_ATKMM_DEP])
 AM_CONDITIONAL([GTKMM_ATKMM_ENABLED], [test "x$gtkmm_enable_api_atkmm" != xno])
 
@@ -115,51 +115,28 @@ MM_ARG_ENABLE_WARNINGS([GTKMM_WXXFLAGS],
                        [-pedantic -Wall -Wextra]
                        [G PANGO ATK GDK GDK_PIXBUF GTK])
 
-AC_CONFIG_FILES([
-      atk/atkmm-1.6.pc
-      atk/src/Makefile
-      atk/atkmm/Makefile
-])
-
-AC_CONFIG_FILES([
-  docs/Makefile
-  docs/reference/Doxyfile
-])
-
-AC_CONFIG_FILES([
-  Makefile
-
-  gdk/gdkmm-2.4.pc
-    gdk/src/Makefile
-    gdk/gdkmm/Makefile
-
-  gtk/gtkmm-2.4.pc
-    gtk/src/Makefile
-    gtk/gtkmm/Makefile
-
-  tools/Makefile
-])
-
-AC_CONFIG_FILES([
-  demos/Makefile
-  tests/Makefile
-])
-
-AC_CONFIG_FILES([
-  scripts/Makefile
-])
-
-AC_CONFIG_FILES([
-  MSVC_Net2005/atkmm/atkmm.rc
-  MSVC_Net2005/gdkmm/gdkmm.rc
-  MSVC_Net2005/gtkmm/gtkmm.rc
-
-  MSVC_Net2008/atkmm/atkmm.rc
-  MSVC_Net2008/gdkmm/gdkmm.rc
-  MSVC_Net2008/gtkmm/gtkmm.rc
-
-  win32_installer/gtkmm-installer.nsi
-])
+AC_CONFIG_FILES([Makefile
+                 tools/Makefile
+                 atk/atkmm-1.6.pc
+                 atk/src/Makefile
+                 atk/atkmm/Makefile
+                 gdk/gdkmm-2.4.pc
+                 gdk/src/Makefile
+                 gdk/gdkmm/Makefile
+                 gtk/gtkmm-2.4.pc
+                 gtk/src/Makefile
+                 gtk/gtkmm/Makefile
+                 tests/Makefile
+                 demos/Makefile
+                 docs/Makefile
+                 docs/reference/Doxyfile
+                 MSVC_Net2005/atkmm/atkmm.rc
+                 MSVC_Net2005/gdkmm/gdkmm.rc
+                 MSVC_Net2005/gtkmm/gtkmm.rc
+                 MSVC_Net2008/atkmm/atkmm.rc
+                 MSVC_Net2008/gdkmm/gdkmm.rc
+                 MSVC_Net2008/gtkmm/gtkmm.rc
+                 win32_installer/gtkmm-installer.nsi])
 
 # Copy the generated configuration headers into the MSVC project directories.
 AC_CONFIG_COMMANDS([MSVC_Net2005/gdkmm/gdkmmconfig.h],