diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-10-26 12:54:21 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-11-10 18:41:34 -0500 |
| commit | ee24fd1773268e0a593c7de760bafa282f3489a2 (patch) | |
| tree | 1eb36d268490d912d4c0b198fe8a76dedd1e1307 | |
| parent | 57c505852bcf38dc3a3e6a9d603e4a8fd9ed3b80 (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 | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 0891338..3c6c5e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,9 +21,8 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man compat -EXTRA_DIST = README.G80 ChangeLog +EXTRA_DIST = README.G80 -CLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: diff --git a/configure.ac b/configure.ac index ce0b884..6d53025 100644 --- a/configure.ac +++ b/configure.ac @@ -29,9 +29,11 @@ AC_INIT([xf86-video-nv], 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(.) @@ -136,10 +138,6 @@ AC_SUBST([moduledir]) DRIVER_NAME=nv AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([ Makefile src/Makefile |