diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-10-26 12:54:22 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-11-02 17:34:50 -0500 |
| commit | dd3ce955349f7545d9aa2aacbb018811d7b9faa3 (patch) | |
| tree | 3ac76010f0137370b678640ba48658491c1c02c8 | |
| parent | b48c3f38767cdcd71eccfa6a0f4a15501a39f83a (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 | 4 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 6 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index d79e354..22446fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,9 +21,7 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man -EXTRA_DIST = ChangeLog CALLMAP Release.txt - -MAINTAINERCLEANFILES=ChangeLog +EXTRA_DIST = CALLMAP Release.txt .PHONY: ChangeLog diff --git a/configure.ac b/configure.ac index e461861..35103bd 100644 --- a/configure.ac +++ b/configure.ac @@ -26,10 +26,11 @@ AC_INIT([xf86-video-siliconmotion], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-siliconmotion) -# Require xorg-macros version 1.2 or newer for XORG_CWARNFLAGS and -# XORG_CHANGELOG macros -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2.1 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.2.1) +# 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_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) @@ -90,7 +91,6 @@ if test "x$XMODES" = xyes; then AC_DEFINE(HAVE_XMODES, 1, [X server has new mode code]) fi -XORG_CWARNFLAGS XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS" AC_SUBST([XORG_CFLAGS]) AC_SUBST([moduledir]) @@ -98,10 +98,6 @@ AC_SUBST([moduledir]) DRIVER_NAME=siliconmotion AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([ Makefile src/Makefile |