diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-10-26 12:54:21 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-11-19 11:28:32 -0500 |
| commit | 1dcda0c4d5d506e18a7989ff05f2ad8569a73f23 (patch) | |
| tree | a49280f9d1430199b78fed1cf91bec1deba8f4f3 | |
| parent | 5b517bcc353e7111d2365a213505f27cfae30924 (diff) | |
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
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 5 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index e76bf118..8b7c3c7d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,9 +21,6 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man -EXTRA_DIST = ChangeLog -CLEANFILES = ChangeLog - .PHONY: ChangeLog ChangeLog: diff --git a/configure.ac b/configure.ac index 162c8394..66bae7fd 100644 --- a/configure.ac +++ b/configure.ac @@ -29,9 +29,11 @@ AC_INIT([xf86-video-ati], AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) -# Require xorg-macros: XORG_RELEASE_VERSION 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) +# 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 AC_CONFIG_AUX_DIR(.) @@ -363,10 +365,7 @@ AC_SUBST([moduledir]) DRIVER_NAME=ati AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION XORG_CHECK_LINUXDOC -XORG_CHANGELOG AC_MSG_NOTICE( [The atimisc sub-driver has been split out to xf86-video-mach64:] |