diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-10-26 12:54:20 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-11-02 18:00:58 -0500 |
| commit | 9fc986bd5dc3bd1741b1ad4e4da152edfaf928d9 (patch) | |
| tree | d2a49e6d3c92d07cb1977afefd0bd8450f53c772 | |
| parent | cd4e5ab0c64f477c343ab161ec309c42b9737450 (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 be8812f..3b2bc91 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,9 +25,6 @@ SUBDIRS = src man config include pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xorg-joystick.pc -EXTRA_DIST = ChangeLog -MAINTAINERCLEANFILES = ChangeLog - .PHONY: ChangeLog ChangeLog: diff --git a/configure.ac b/configure.ac index e0be568..d4ebd5d 100644 --- a/configure.ac +++ b/configure.ac @@ -32,16 +32,18 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -# 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_CONFIG_HEADER([config.h]) # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC -XORG_CWARNFLAGS AH_TOP([#include "xorg-server.h"]) @@ -117,10 +119,6 @@ AC_HEADER_STDC DRIVER_NAME=joystick AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile src/Makefile man/Makefile |