diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2009-10-26 12:54:23 -0400 |
|---|---|---|
| committer | Gaetan Nadon <memsize@videotron.ca> | 2009-10-26 12:54:23 -0400 |
| commit | 573e48bbaad584d968a21b5b30ef355d2ae71362 (patch) | |
| tree | 72d4e2c5cd17fa50beca29fcc53b83479e1e90be | |
| parent | 24deadfff2dc0c8aaee722e875918072ec6a0067 (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 | 7 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 7052905..8b7c3c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,3 +20,10 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 92ee38d..6d61b33 100644 --- a/configure.ac +++ b/configure.ac @@ -32,6 +32,12 @@ AC_CONFIG_AUX_DIR(.) AM_INIT_AUTOMAKE([dist-bzip2]) +# 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_MAINTAINER_MODE # Checks for programs. @@ -90,9 +96,6 @@ AC_SUBST([moduledir]) DRIVER_NAME=xgixp AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION - AC_OUTPUT([ Makefile src/Makefile |