diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-26 16:18:35 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-26 16:18:35 -0200 |
| commit | be665ef592f24ccc93a46dc938c3a101d6668cdf (patch) | |
| tree | c9baf353b514312a3eeda78867c3ae188c4d0779 | |
| parent | 9271b26d991608b562960aa041b0c371086cc490 (diff) | |
Correct make distcheck and don't distribute autogen.sh.
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 10 |
3 files changed, 13 insertions, 5 deletions
@@ -18,3 +18,7 @@ stamp-h1 xprop xprop.1 *~ +*.o +xprop-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index d3fc24a..454ab86 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,14 +39,14 @@ appmandir = $(APP_MAN_DIR) appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh +EXTRA_DIST = $(appman_PRE) ChangeLog CLEANFILES = $(appman_DATA) 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 ec85b80..bba437b 100644 --- a/configure.ac +++ b/configure.ac @@ -27,22 +27,26 @@ 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_CHECK_HEADERS([wchar.h wctype.h]) # Checks for pkg-config packages PKG_CHECK_MODULES(XPROP, x11) +XPROP_CFLAGS="$CWARNFLAGS $XPROP_CFLAGS" AC_SUBST(XPROP_CFLAGS) AC_SUBST(XPROP_LIBS) XORG_WITH_LINT XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |