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, 136 deletions

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index ad0b227..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,133 +0,0 @@
-2009-06-25  Evgeny M. zubok <evgeny.zubok@tochka.ru>
-
-	* src/s3_driver.c:
-	Revert the old behaviour when the BIOS settings are used for
-	intialization of DRAM/VRAM timings, i. e. we don't touch the
-	timings during initialization phase until any memory option (like
-	slow_edodram) is specified.
-	
-	Add manual page.	
-
-2009-05-25  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
-	
-	* src/s3_driver.c:
-	* src/s3_video.c:
-	
-	Enable Xv extension for Trio64V+ (thanks to Egor Ivanov for 
-	testing on real hardware) and Trio64UV+ (Tested only on Trio64V2 by
-	overriding Chipset with "Trio64UV+" but not on real hardware).
-
-	S3 Trio64V+ now using NewMMIO. Trio64V+ chips have the same ChipId
-	as Trio32/64 but only with chip revision greater or eq 0x40. So if 
-	you have problems with NewMMIO, you may override ChipRev in "Device" 
- 	section of your xorg.conf: "ChipRev" 0x00. Note: disabling the NewMMIO 
-	also disables overlay video (Xv) because it isn't implemented for
-	Old MMIO yet.
-	
-2009-05-04  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
-
-	* src/s3_driver.c:
-	* src/s3_shadow.c:
-
-	Add shadowFB option. It can be used to speedup drawing when
-	hardware acceleration is undesirable or unavailable (for colour depth
-	24 with 24 bpp framebuffer, for example). shadowFB is disabled by
-	default. Enabling shadowFB option disables HW acceleration. Thanks
-	to Egor Ivanov for initial porting of shadowFB from s3virge.
-
-	Interlace mode support.
-
-	Close bug #14999.
-	
-2008-07-06  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
-
-	* src/s3_video.c: 
-
-	Streams Processor initialization.
-
-	XVideo support for 16, 24 and 32 bpp (only for TRIO64V2).
-
-	* src/s3_driver.c: 
-
-	Add XVideo option (enabled by default).
-
-	Replace "swcursor" by "hwcursor" option (HW cursor 
-	not implemented yet for all chipsets).
-
-	Close bug #5527: 24-bit colour depth support (24bpp and 
-	32bpp framebuffer) for TRIOs. Acceleration doesn't work
-	with packed colour mode (24 bpp FB) but works with 32bpp 
-	framebuffer mode (hardware limitation? -- need data).
-
-	Fix system hang-up when switching between console and X session.
-
-	Some minor changes of driver messages.
-
-2008-02-23  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
-
-	* src/s3_driver.c: Add DPMS support for S3 Trio64V2 and possibly
-	others (need testing): S3 Trio64UV+. S3 Aurora64V+ and S3 Trio32/64
-	* src/s3_Trio64DAC: Change clocks for S3 Trio64V2 to make
-	the 1024x768@16bpp mode work.
-	Thanks to Richard Driscoll for these patches.
-	
-2006-04-07  Adam Jackson  <ajax@freedesktop.org>
-
-	* configure.ac:
-	* src/s3.h:
-	Bump to 0.4.1 for Xv changes.
-
-2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
-
-	* src/s3_video.c: (S3PutImage):
-	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/s3.h:
-	* src/s3_IBMRGB.c:
-	* src/s3_Ti.c:
-	* src/s3_Trio64DAC.c:
-	* src/s3_bios.c:
-	* src/s3_cursor.c:
-	* src/s3_dga.c:
-	* src/s3_driver.c:
-	* src/s3_video.c:
-	Unlibcwrap.  Bump server version requirement.  Bump to 0.4.0.
-
-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-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-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 7052905..8b7c3c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,10 @@
 
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src man
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 0eecc87..912b282 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
@@ -80,9 +86,6 @@ AC_SUBST([moduledir])
 DRIVER_NAME=s3
 AC_SUBST([DRIVER_NAME])
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
 XORG_CHECK_LINUXDOC
 
 AC_OUTPUT([