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 | 8f89812dd9fef33aa7427e3aabd0897fe8ffcc2f (patch) | |
| tree | e06916c9ee716eba046599c30240be770ef58710 | |
| parent | d229780bcb9461386d01f51bf7f26ca295f24cfb (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 | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 2c2cd08..8b7c3c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,10 +21,6 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man -EXTRA_DIST = ChangeLog - -MAINTAINERCLEANFILES = ChangeLog - .PHONY: ChangeLog ChangeLog: diff --git a/configure.ac b/configure.ac index a73a3b1..bba71c7 100644 --- a/configure.ac +++ b/configure.ac @@ -36,15 +36,17 @@ DRIVER_NAME=void AC_SUBST([DRIVER_NAME]) # 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"]) |