diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-10-26 12:54:21 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-10-26 12:54:21 -0400 |
| commit | 34b22945240af367dc1f874733a49cdeb7526bb0 (patch) | |
| tree | e53587257c1f26ea03f3d66ec483ac9707542add | |
| parent | 8aa9c81ec3fee4b1b943949d62ee90be1c2e320c (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, 6 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 1f4c3c4..8a6630e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,8 +27,7 @@ README.r128: README.r128.sgml endif -EXTRA_DIST = README.r128 README.r128.sgml ChangeLog -CLEANFILES = ChangeLog +EXTRA_DIST = README.r128 README.r128.sgml .PHONY: ChangeLog diff --git a/configure.ac b/configure.ac index 4e0f463..93ca16b 100644 --- a/configure.ac +++ b/configure.ac @@ -32,9 +32,11 @@ AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) -# 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) +# 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 AM_MAINTAINER_MODE @@ -133,10 +135,7 @@ AC_SUBST([moduledir]) DRIVER_NAME=r128 AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION XORG_CHECK_LINUXDOC -XORG_CHANGELOG AC_MSG_NOTICE( [Please change the Driver line in xorg.conf from "ati" to "r128" or install] |