diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2008-12-17 19:19:03 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2008-12-17 19:19:03 -0800 |
| commit | 03f6a08c503ff12e2457a9ccc13bfbb801e2161d (patch) | |
| tree | 2708a6c6fad46de6fdce5581eba9f2341638b900 | |
| parent | 0ca983a6bac03489fb0d2ad158114a811eb276a2 (diff) | |
Use XORG_CWARNFLAGS & XORG_CHANGELOG from xorg-macros 1.2
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 213031d..ce7a262 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = mkfontscale -mkfontscale_CFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE +AM_CFLAGS = @MKFONTSCALE_CFLAGS@ @X11_CFLAGS@ -D_BSD_SOURCE $(CWARNFLAGS) mkfontscale_LDADD = @MKFONTSCALE_LIBS@ mkfontscale_SOURCES = \ @@ -67,12 +67,9 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): sed $(MAN_SUBSTS) < $< > $@ -EXTRA_DIST += ChangeLog -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 ae5436c..18d73ae 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,12 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) +# Require xorg-macros version >= 1.2.0 for 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) + AC_PROG_CC +XORG_CWARNFLAGS AC_PROG_INSTALL AC_CHECK_LIB(z, gzopen, [], @@ -53,5 +58,6 @@ AC_SUBST(X11_CFLAGS) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |