Several driver modules do not have a ChangeLog target in Makefile.am #23814

The git generated ChangeLog replaces the hand written one.
Update configure.ac to xorg-macros level 1.3.
Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
Update Makefile.am to add ChangeLog target if missing
Remove ChangeLog from EXTRA_DIST or *CLEAN variables
This is a pre-req for the INSTALL_CMD

3 files changed, 13 insertions, 104 deletions

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 1b228b9..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,101 +0,0 @@
-2006-04-07  Adam Jackson  <ajax@freedesktop.org>
-
-	* configure.ac:
-	* src/glint.h:
-	Bump to 1.1.1 for Xv changes.
-
-2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
-
-	* src/pm2_video.c: (Permedia2PutVideo), (Permedia2PutStill),
-	(Permedia2GetVideo), (Permedia2GetStill), (Permedia2PutImage):
-	* src/pm3_video.c: (Permedia3PutImage):
-	Add a DrawablePtr argument to the XV functions to pave the way for
-	redirected video.
-
-2006-04-07  Adam Jackson  <ajax@freedesktop.org>
-
-	* configure.ac:
-	* src/IBMramdac.c:
-	* src/TIramdac.c:
-	* src/glint.h:
-	* src/glint_dga.c:
-	* src/glint_dri.c:
-	* src/glint_driver.c:
-	* src/glint_shadow.c:
-	* src/pm2_accel.c:
-	* src/pm2_dac.c:
-	* src/pm2_video.c:
-	* src/pm2ramdac.c:
-	* src/pm2v_dac.c:
-	* src/pm2vramdac.c:
-	* src/pm3_accel.c:
-	* src/pm3_dac.c:
-	* src/pm3_video.c:
-	* src/pm_accel.c:
-	* src/pm_dac.c:
-	* src/sx_accel.c:
-	* src/tx_accel.c:
-	* src/tx_dac.c:
-	Unlibcwrap.  Bump server version requirement.  Bump to 1.1.0.
-
-2006-02-02  Alan Hourihane  <alanh@fairlite.demon.co.uk>
-
-	* src/glint.h:
-	Allocate more space for the dac registers on pm2v hardware.
-
-2006-01-09  David Nusinow  <gravity-at-freedesktop-dot-org>
-
-	* man/glint.man:
-	Convert manpage to utf-8
-	Bugzilla #1925 <https://bugs.freedesktop.org/show_bug.cgi?id=1925>
-
-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-20  Adam Jackson  <ajax@freedesktop.org>
-
-	* configure.ac:
-	Bump libdrm dep to 2.0.
-
-2005-11-29  Adam Jackson  <ajax@freedesktop.org>
-
-	* configure.ac:
-	Only build dlloader modules by default.
-
-2005-11-15  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Add check for DGA extension to fix issues when building with
-	separate build roots.
-
-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 02ec5b8..44edda6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,3 +22,10 @@ AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src man
 
 EXTRA_DIST = DRI.txt README.pm3
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 2a3ca8c..2055514 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,12 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
 # Checks for programs.
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
@@ -121,9 +127,6 @@ AC_SUBST([moduledir])
 DRIVER_NAME=glint
 AC_SUBST([DRIVER_NAME])
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
 AC_OUTPUT([
 	Makefile
 	src/Makefile