diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-10-26 12:54:20 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-10-26 12:54:20 -0400 |
| commit | 59bc379e87489f95f89851e2b5b27bdc680c656f (patch) | |
| tree | 7db4b86d393f3709216bc23d8cc4263f1c2758a6 | |
| parent | 7e2a262db906b8ac2d59c4ce3ba24312f3b5259f (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 | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 6a0325e..8b7c3c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,8 +20,6 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man -EXTRA_DIST = ChangeLog -MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog diff --git a/configure.ac b/configure.ac index 6a807a6..b1cc2a1 100644 --- a/configure.ac +++ b/configure.ac @@ -33,15 +33,17 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE # Require xorg-macros: XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +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_DEFAULT_OPTIONS AH_TOP([#include "xorg-server.h"]) |