xf86-video-mach64: Branch 'master' - 2 commits

[Alan Coopersmith]

 Makefile.am     |    4 ++--
 configure.ac    |   16 +++++++++-------
 src/Makefile.am |    2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 99db87ed49d7eca8de2ff1f7d53b580637ebb916
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Apr 29 17:32:47 2009 -0700

    Version 6.8.1
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>

diff --git a/configure.ac b/configure.ac
index 7b19be0..e22b987 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-mach64],
-        6.8.0,
+        6.8.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-mach64)
 
commit 193744b015e8f2b8c25d90094b7f0b502bc1287b
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Wed Apr 29 17:21:53 2009 -0700

    Convert to XORG_CWARNFLAGS & XORG_CHANGELOG
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>

diff --git a/Makefile.am b/Makefile.am
index 56f5cb2..7fd7bae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,11 +27,11 @@ README.ati: README.ati.sgml
 endif
 
 EXTRA_DIST = README.ati README.ati.sgml ChangeLog
-CLEANFILES = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
 
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 5e8be38..7b19be0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,14 +34,15 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
 # Checks for programs.
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_PROG_CC
-
-if test "x$GCC" = "xyes"; then
-	CPPFLAGS="$CPPFLAGS -Wall"
-fi
+XORG_CWARNFLAGS
 
 AH_TOP([#include "xorg-server.h"])
 
@@ -220,10 +221,11 @@ AC_SUBST([DRIVER_NAME])
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 XORG_CHECK_LINUXDOC
+XORG_CHANGELOG
 
 AC_MSG_NOTICE(
-[Please change the Driver line in xorg.conf from "ati" to "mach64" or install]
-[the ati wrapper as well:]
+[Please change the Driver line in xorg.conf from "ati" to "mach64"]
+[ or install the ati wrapper as well:]
 [    git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati]
 )
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 4bc1006..7331cb1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,7 @@ if USE_EXA
 ATIMISC_EXA_SOURCES = atimach64exa.c
 endif
 
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
+AM_CFLAGS = $(CWARNFLAGS) @XORG_CFLAGS@ @DRI_CFLAGS@
 
 mach64_drv_la_LTLIBRARIES = mach64_drv.la
 mach64_drv_la_LDFLAGS = -module -avoid-version