diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-10-26 12:54:20 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-11-19 09:40:56 -0500 |
| commit | c0473e4921f3c3beec59abefb63180cba4d168df (patch) | |
| tree | 5ad1996d6f4d3e3296129d47b1a78d18e3ea84be | |
| parent | afc9e917656508fc3277b7d39e5ab436cf0542f4 (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 | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index e8e6ec1..eae0f10 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,9 +28,6 @@ SUBDIRS = src man include pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xorg-evdev.pc -EXTRA_DIST = ChangeLog - -MAINTAINERCLEANFILES=ChangeLog .PHONY: ChangeLog diff --git a/configure.ac b/configure.ac index 2f1bfbb..c44c9e2 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"]) |