some small cleanups.

2004-05-26  James Henstridge  <james@daa.com.au>

    * macros2/gnome-compiler-warnings.m4: some small cleanups.

    * macros2/gnome-common.m4 (GNOME_COMMON_INIT): since caching is
    turned off in all recent Autoconfs, it doesn't make sense to use
    it.  Change implementation to instead make sure ${ACLOCAL_FLAGS}
    gets passed to aclocal when called from the makefile.

    * macros2/Makefile.am: alter installation so that it puts the
    macros directly into $(datadir)/aclocal instead of
    $(datadir)/aclocal/gnome2-macros

    * autogen.sh (REQUIRED_AUTOMAKE_VERSION): use a modern version of
    automake.

    * macros2/gnome-compiler-flags.m4: move from compiler-flags.m4 to
    reduce chance of collisions.

    * macros2/gnome-autogen.sh: move from autogen.sh

    * Makefile.am (SUBDIRS): don't build bin/ and macros/ directories.

    * configure.in: don't create makefiles for bin/ and macros/
    directories.
    Since we don't actually build the support/ directory (since 2001),
    remove the matching parts from the configure script.

svn path=/trunk/; revision=3443

1 files changed, 4 insertions, 2 deletions

diff --git a/autogen.sh b/autogen.sh
index fa8fee4..5fa4e8b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,9 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="Gnome Skeleton"
+REQUIRED_AUTOMAKE_VERSION=1.7
+
+PKG_NAME="Gnome Common Macros"
 
 (test -f $srcdir/configure.in \
 ## put other tests here
@@ -14,4 +16,4 @@ PKG_NAME="Gnome Skeleton"
     exit 1
 }
 
-. $srcdir/macros2/autogen.sh
+. $srcdir/macros2/gnome-autogen.sh