summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-27 20:06:28 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2009-01-27 20:06:28 -0200
commitb8b3878351a148e527df44ddf8886917f00d1a85 (patch)
treebc0cd8a2c60075f76c3800acb12577d2cbcee037
parente28d33b35a0a795aec7e3174b42a0f317c15a827 (diff)
Janitor: Correct make distcheck and dont distribute autogen.sh
-rw-r--r--.gitignore3
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac4
3 files changed, 9 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index fa6f681..c4bb570 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ install-sh
missing
xineramaproto.pc
*~
+xineramaproto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index d00df00..591a301 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ xinerama_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xineramaproto.pc
-EXTRA_DIST = autogen.sh xineramaproto.pc.in
+EXTRA_DIST = xineramaproto.pc.in
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
@@ -13,6 +13,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 a1749c0..ee2d35b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,11 @@ AC_PREREQ([2.57])
AC_INIT([XineramaProto], [1.1.2], [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
xineramaproto.pc])