proto/randrproto: Branch 'master'
Paulo Cesar Pereira de Andrade
pcpa at kemper.freedesktop.org
Tue Jan 27 14:40:35 PST 2009
.gitignore | 3 +++
Makefile.am | 4 ++--
configure.ac | 4 ++++
3 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 1c7e20d115bc470479f32afd703ca7966754c54f
Author: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
Date: Tue Jan 27 20:06:28 2009 -0200
Janitor: Correct make distcheck and dont distribute autogen.sh
diff --git a/.gitignore b/.gitignore
index c0562cd..2468418 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ configure
install-sh
missing
randrproto.pc
+randrproto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 59e0378..ec0cf19 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ pkgconfig_DATA = randrproto.pc
randrdocdir = $(datadir)/doc/$(PACKAGE)
randrdoc_DATA = randrproto.txt
-EXTRA_DIST = autogen.sh randrproto.pc.in $(randrdoc_DATA)
+EXTRA_DIST = randrproto.pc.in $(randrdoc_DATA)
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
@@ -17,6 +17,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 5c0cc88..4707389 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,11 @@ AC_PREREQ([2.57])
AC_INIT([RandrProto], [1.2.99.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+# Require xorg-macros: 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)
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
randrproto.pc])
More information about the xorg-commit
mailing list