diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-10-26 12:54:21 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-11-07 10:46:29 -0500 |
| commit | db9f696aecc5153e6266e9afb2d2520493c81d7b (patch) | |
| tree | e9dd74059bc2ad4889674b3c022049c6ca834d47 | |
| parent | 3a8fcd130e54099936a2641d4515adae3426a237 (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 | 2 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 5de2a4a..5b04139 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,8 +28,6 @@ endif EXTRA_DIST = README.sgml -CLEANFILES = ChangeLog - .PHONY: ChangeLog ChangeLog: diff --git a/configure.ac b/configure.ac index e209b16..2c42570 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 @@ -82,10 +88,6 @@ AC_SUBST([moduledir]) DRIVER_NAME=rendition AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - XORG_CHECK_LINUXDOC AC_OUTPUT([ |