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

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 0175832..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,184 +0,0 @@
-2009-06-03  Y.C. Chen  <yc_chen@aspedtech.com>
-        * src/ast_driver.c, ast_vgatool.c
-        - Fixed the screen flashing issue while running x11perf
-        * src/ast.h, ast_driver.c, ast_vgatool.c/h
-        - Fixed Suspend can't resume issue
-        
-2009-04-13  Y.C. Chen  <yc_chen@aspedtech.com>
-        * src/ast.h, ast_cursor.c
-        - Fixed xorg bugzilla #20606
-        * src/ast_driver.c
-        - Fixed xorg bugzilla #20472
-        * src/ast_accel.c
-        - Fixed desktop display abnormal if video buffer is above than 16MB
- 
-2009-01-16  Y.C. Chen  <yc_chen@aspedtech.com>
-        * src/ast_driver.c
-        - Fixed Support Modes Incorrect Issues on Solaris 10 x86
-
-2009-01-08  Y.C. Chen  >yc_chen@aspedtech.com>
-        * src/ast.h
-        * src/ast_driver.c
-        * src/ast_2dtool.c, ast_2dtool.h
-        * src/ast_accel.c
-        * src/ast_cursor.c
-        * src/ast_mode.c
-        * src/ast_vgatool.c
-        - Support AST2200/2150
-        - Support ASPEED Graphics as Secondary
-        - Fixed AST1100 1280x1024x32bpp thershold issue
-        - Fixed Screen saver - celtic, DecayScreen abnormal issues
-        - Fixed Game - Potato Guys abnormal issue
-        
-2008-08-22  Y.C. Chen  <yc_chen@aspeedtech.com>
-        * src/ast.h
-        * src/ast_driver.c
-        * src/ast_vgatool.c, ast_vgatool.h
-        Support AST1100/2050/2100
-        
-        * src/ast_mode.c ast_mode.h
-        Modify the display timing of 1920x1200 to reduce blanking timing
-
-        * src/ast_driver.c
-        * src/ast_vgatool.c
-        Support Clone Display for Two VGA
-        
-2008-07-21  Y.C. Chen  <yc_chen@aspeedtech.com>
-        * src/ast_mode.c
-        Fixed Incorrect Settings for Graphices Registers 
-
-2008-03-18  Y.C. Chen  <yc_chen@aspeedtech.com>
-        * src/ast_2dtool.c
-        * src/ast_tool.c
-        Compiler Warning Fixed
-
-2008-03-01  Y.C. Chen  <yc_chen@aspeedtech.com>
-        * src/ast_driver.c:
-        Add _X_EXPORT for symbols public visibility
-
-2007-08-24  Y.C. Chen  <yc_chen@aspeedtech.com>
-         
-	* configure.ac:
-	* src/ast.h:
-	* src/ast_2dtool.c:
-	* src/ast_accel.c:
-	* src/ast_cursor.c:
-	* src/ast_driver.c:
-	* src/ast_mode.c:
-	* src/ast_tool.c:
-	* src/ast_vgatool.c:
-        * src/ast_2dtool.h
-        * src/ast_mode.h:
-        Support AST2100
-
-2006-04-17  Y.C. Chen  <yc_chen@aspeedtech.com>
-
-	* src/ast_vgatool.c: (GetMaxDCLK):
-        Fixed can't get correct MCLK in some platforms     
-
-2006-04-07  Adam Jackson  <ajax@freedesktop.org>
-
-	* configure.ac:
-	* src/ast.h:
-	* src/ast_2dtool.c:
-	* src/ast_accel.c:
-	* src/ast_cursor.c:
-	* src/ast_driver.c:
-	* src/ast_mode.c:
-	* src/ast_tool.c:
-	* src/ast_vgatool.c:
-	Unlibcwrap.  Bump server version requirement.  Bump to 0.81.0.
-
-2006-03-15  Alan Coopersmith  <alan.coopersmith@sun.com>
-
-	* src/ast.h: 
-	* src/ast_2dtool.c:
-	* src/ast_accel.c:
-	Update from ASPEED Technology Inc. to fix incorrect line drawing issue
-	and change driver name from "AST1000/2000" to "AST" to fix Xorg log
-	formatting issues with long driver names.
-	Bugzilla #4937 <https://bugs.freedesktop.org/show_bug.cgi?id=4937>
-	Attachment #4948 <https://bugs.freedesktop.org/attachment.cgi?id=4948>
-
-2006-03-14  Alan Coopersmith  <alan.coopersmith@sun.com>
-
-	* COPYING:
-	* autogen.sh:
-	* configure.ac:
-	* Makefile.am:
-	* src/Makefile.am:
-	* .cvsignore:
-	* src/.cvsignore:
-	Add the normal trappings of the Xorg modular build system.
-
-	* src/ast_2dtool.c:
-	* src/ast_accel.c:
-	* src/ast_cursor.c:
-	* src/ast_driver.c:
-	* src/ast_mode.c:
-	* src/ast_tool.c:
-	* src/ast_vgatool.c:
-	Replace "Xv.h" with <X11/extensions/Xv.h> and add 
-	#include "config.h" for modular build
-	Strip ^M out of ast_accel.c
-	
-2006-03-14  Alan Coopersmith  <alan.coopersmith@sun.com>
-	
-	* src/ast.h:
-	* src/ast_2dtool.c:
-	* src/ast_2dtool.h:
-	* src/ast_accel.c:
-	* src/ast_driver.c:
-	* src/ast_vgatool.c:
-	Version 0.80 from ASPEED Technology Inc.
-	(Fixed abnormal display if set 2D Acceleration Option as MMIO mode)
-	Bugzilla #4937 <https://bugs.freedesktop.org/show_bug.cgi?id=4937>
-	Attachment #4932 <https://bugs.freedesktop.org/attachment.cgi?id=4932>
-
-2006-03-14  Alan Coopersmith  <alan.coopersmith@sun.com>
-
-	* src/ast.h:
-	* src/ast_driver.c:
-	* src/ast_vgatool.c:
-	Version 0.62 from ASPEED Technology Inc.
-	(Fixed get video buffer size incorrect issue)
-	Bugzilla #4937 <https://bugs.freedesktop.org/show_bug.cgi?id=4937>
-	Attachment #4563 <https://bugs.freedesktop.org/attachment.cgi?id=4563>
-
-2006-03-14  Alan Coopersmith  <alan.coopersmith@sun.com>
-
-	* src/ast.h:
-	* src/ast_accel.c:
-	* src/ast_driver.c:
-	Version 0.61 from ASPEED Technology Inc.
-	(Update for Xorg 6.9.0 - Can't reference XAACOPYROP)
-	Bugzilla #4937 <https://bugs.freedesktop.org/show_bug.cgi?id=4937>
-	Attachment #4044 <https://bugs.freedesktop.org/attachment.cgi?id=4245>
-
-2006-03-14  Alan Coopersmith  <alan.coopersmith@sun.com>
-
-	* src/ast.h:
-	* src/ast_cursor.c:
-	* src/ast_cursor.h:
-	Version 0.60 from ASPEED Technology Inc.
-	(Modify H/W cursor parts for customer request)
-	Bugzilla #4937 <https://bugs.freedesktop.org/show_bug.cgi?id=4937>
-	Attachment #4044 <https://bugs.freedesktop.org/attachment.cgi?id=4044>
-
-2006-03-14  Alan Coopersmith  <alan.coopersmith@sun.com>	
-
-	* src/ast.h:
-	* src/ast_2dtool.c:
-	* src/ast_2dtool.h:
-	* src/ast_accel.c:
-	* src/ast_cursor.c:
-	* src/ast_cursor.h:
-	* src/ast_driver.c:
-	* src/ast_mode.c:
-	* src/ast_mode.h:
-	* src/ast_tool.c:
-	* src/ast_vgatool.c:
-	* src/ast_vgatool.h:
-	Initial code release from ASPEED Technology Inc. (Version 0.51)
-	Bugzilla #4937 <https://bugs.freedesktop.org/show_bug.cgi?id=4937>
-	Attachment #3686 <https://bugs.freedesktop.org/attachment.cgi?id=3686>
diff --git a/Makefile.am b/Makefile.am
index 018155e..9368161 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,4 +19,10 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = src
\ No newline at end of file
+SUBDIRS = src
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 8f43a5c..19fd86f 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=nv
 AC_SUBST([DRIVER_NAME])
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
 AC_OUTPUT([
 	Makefile
 	src/Makefile