diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-08 14:51:17 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-08 15:08:28 +1000 |
| commit | f8bd425aeff224b01bede7ec4b4731132de1a1bd (patch) | |
| tree | 747f69ebaf8a554d19ec55bd3041496999e62a11 | |
| parent | fb5ef37927c9c440c0ded515cea6ccaca418d00b (diff) | |
Replace changelog command with CHANGELOG_CMD from m4 macros.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 4f9559c..061da14 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,6 +28,6 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog 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 ecb863d..b9efc24 100644 --- a/configure.ac +++ b/configure.ac @@ -35,12 +35,16 @@ AM_MAINTAINER_MODE DRIVER_NAME=void AC_SUBST([DRIVER_NAME]) +# Require xorg-macros: XORG_CWARNFLAGS, 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) AM_CONFIG_HEADER([config.h]) # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC +XORG_CWARNFLAGS AH_TOP([#include "xorg-server.h"]) @@ -88,5 +92,6 @@ AC_HEADER_STDC XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile man/Makefile]) |