Replace static ChangeLog with XORG_CHANGELOG, use XORG_CWARNFLAGS too

Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

4 files changed, 18 insertions, 69 deletions

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 92ba092..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,67 +0,0 @@
-2006-04-06  Adam Jackson  <ajax@freedesktop.org>
-
-	* configure.ac:
-	* src/CirrusClk.c:
-	* src/alp_driver.c:
-	* src/alp_hwcurs.c:
-	* src/alp_i2c.c:
-	* src/alp_xaa.c:
-	* src/alp_xaam.c:
-	* src/cir.h:
-	* src/cir_dga.c:
-	* src/cir_driver.c:
-	* src/cir_shadow.c:
-	* src/lg_driver.c:
-	* src/lg_hwcurs.c:
-	* src/lg_i2c.c:
-	* src/lg_xaa.c:
-	Unlibcwrap.  Bump server version requirement.  Bump to 1.1.0.
-
-	* src/cir_driver.c:
-	VERSION -> CIR_VERSION
-
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version for X11R7 release.
-
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
-
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* man/Makefile.am:
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
-
-2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Remove extraneous AC_MSG_RESULT.
-
-2005-11-29  Adam Jackson  <ajax@freedesktop.org>
-
-	* configure.ac:
-	Only build dlloader modules by default.
-
-2005-11-28  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* src/Makefile.am:
-	Separate cirrus driver into _drv, _alpine and _laguna components
-	as they are in the monolithic tree.
-
-2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for X11R7 RC2 release.
-
-2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index ceec308..aa89732 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,4 +21,14 @@
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src man
 
-EXTRA_DIST = README.multihead
+EXTRA_DIST = README.multihead ChangeLog
+
+MAINTAINERCLEANFILES=ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
+
diff --git a/configure.ac b/configure.ac
index a17ccab..700c727 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +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
+XORG_CWARNFLAGS
 
 AH_TOP([#include "xorg-server.h"])
 
@@ -84,6 +89,7 @@ AC_SUBST([DRIVER_NAME])
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([
 	Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 88f6fa1..f2cb24f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@ $(CWARNFLAGS)
 
 cirrus_drv_la_LTLIBRARIES = cirrus_drv.la
 cirrus_drv_la_LDFLAGS = -module -avoid-version