diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-26 19:32:20 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-26 19:32:20 -0200 |
| commit | 228dccc301ae10a1c17bb1cc91efcd5cef69db4f (patch) | |
| tree | d34d1907a6649101479f50c6ade3e34b35ef7cf8 | |
| parent | 8773a750f5489b4a8f577f87873066486e9d85a8 (diff) | |
Correct make distcheck.
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 11 insertions, 2 deletions
@@ -19,3 +19,6 @@ missing stamp-h1 xvinfo xvinfo.1 +xvinfo-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index b4fd944..fc53df7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,14 +35,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 9e9f3fa..c00fa39 100644 --- a/configure.ac +++ b/configure.ac @@ -26,17 +26,23 @@ AC_INIT(xvinfo,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# 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) AC_PROG_CC AC_PROG_INSTALL +XORG_CWARNFLAGS # Checks for pkg-config packages PKG_CHECK_MODULES(XVINFO, xv x11) +XVINFO_CFLAGS="$CWARNFLAGS $XVINFO_CFLAGS" AC_SUBST(XVINFO_CFLAGS) AC_SUBST(XVINFO_LIBS) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |