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:25 -0500 |
| commit | 2dc2cca0da1d007ea4bc962f2a298df98560268a (patch) | |
| tree | 6fd4ac9d35ca7935155cba8ffd3f9e6d95181009 | |
| parent | 7315b5a5b377810b8e11daf6b16e619f47cbde40 (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 | 14 |
2 files changed, 6 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 4fd3261..c1d462d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,8 +21,7 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man util -CLEANFILES = ChangeLog -EXTRA_DIST = README_HALLIB mga_PInS.txt ChangeLog +EXTRA_DIST = README_HALLIB mga_PInS.txt .PHONY: ChangeLog diff --git a/configure.ac b/configure.ac index 3f5803f..6049ea2 100644 --- a/configure.ac +++ b/configure.ac @@ -27,14 +27,14 @@ AC_INIT([xf86-video-mga], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-mga) -XORG_RELEASE_VERSION - 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(.) @@ -176,10 +176,6 @@ AC_SUBST([moduledir]) DRIVER_NAME=mga AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([ Makefile src/Makefile |