diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-19 19:05:44 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-19 19:05:44 -0200 |
| commit | 31395a96cff3570440229b2715c8ba557a6ce8d4 (patch) | |
| tree | 47d674a6d5869a3ffea0f68c5860145a8a45a556 | |
| parent | 64d1fe69362bb0edcd5736ee6988d9bd394ea5c0 (diff) | |
Correct make distcheck.
No warnings were generated by gcc 4.3 neither sparse when using
XORG_CWARNFLAGS.
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 10 |
3 files changed, 12 insertions, 4 deletions
@@ -18,3 +18,7 @@ stamp-h1 xauth xauth.1 *~ +*.o +xauth-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 24a12c0..21f3fc5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,6 +79,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 ffe378c..42e3d83 100644 --- a/configure.ac +++ b/configure.ac @@ -27,19 +27,22 @@ AM_MAINTAINER_MODE AM_CONFIG_HEADER(config.h) -# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro -m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.1) +# Require xorg-macros: XORG_WITH_LINT, 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 AC_PROG_INSTALL +XORG_CWARNFLAGS + AC_TYPE_SIGNAL AC_CHECK_HEADERS([net/errno.h]) # Checks for pkg-config packages PKG_CHECK_MODULES(XAUTH, x11 xau xext xmuu) +XAUTH_CFLAGS="$CWARNFLAGS $XAUTH_CFLAGS" AC_SUBST(XAUTH_CFLAGS) AC_SUBST(XAUTH_LIBS) @@ -50,5 +53,6 @@ XTRANS_CONNECTION_FLAGS XORG_WITH_LINT XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |