From 9657123fb0b61c48e9777d3642ac5d7b2168cf1f Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 15 Jul 2009 15:58:25 -0400 Subject: [PATCH] Use XORG_CHANGELOG macro to create ChangeLog. #22611 Adding the macro in configure.ac and use it in Makefile.am Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 Global maintenance on all modules --- Makefile.am | 3 +-- configure.ac | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 534c3fd..d254b4d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,9 +30,8 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog -# "git log" with the space should be available since git 1.3.0 ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 7680a3d..dc1cb48 100644 --- a/configure.ac +++ b/configure.ac @@ -16,6 +16,9 @@ AM_MAINTAINER_MODE AC_CONFIG_FILES([shave shave-libtool]) +# Require xorg-macros: 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) # Program checks. AC_DISABLE_STATIC @@ -351,6 +354,7 @@ m4_pattern_forbid([XORG_MANPAGE_SECTIONS])dnl XORG_MANPAGE_SECTIONS m4_pattern_forbid([XORG_RELEASE_VERSION])dnl XORG_RELEASE_VERSION +XORG_CHANGELOG dnl These are also defined in XORG_RELEASE_VERSION since 2006-11-30. dnl So we check whether XORG_RELEASE_VERSION has already done this -- 1.6.0.4