From ca08b93d5829a03e464fb27d96292c37825aa5ea Mon Sep 17 00:00:00 2001
From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed, 28 Jan 2009 16:11:37 -0200
Subject: Janitor: correct make distcheck.

---
 .gitignore   | 5 +++++
 Makefile.am  | 4 ++--
 configure.ac | 7 ++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index b5b5e52..06615a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,8 @@ missing
 mkinstalldirs
 stamp-h1
 *~
+*.o
+DMX*.3
+libdmx-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 43b136e..f75d1be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ SUBDIRS = src man
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dmx.pc
 
-EXTRA_DIST = dmx.pc.in autogen.sh
+EXTRA_DIST = dmx.pc.in
 
 
 EXTRA_DIST += ChangeLog
@@ -33,6 +33,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 374b500..7f943b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,21 +27,26 @@ AC_INIT(libdmx, 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)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
 
 # Check for dependencies
 PKG_CHECK_MODULES(DMX, x11 xext xextproto dmxproto)
-
+DMX_CFLAGS="$CWARNFLAGS $DMX_CFLAGS"
 AC_SUBST(DMX_CFLAGS)
 AC_SUBST(DMX_LIBS)
 
 XORG_CHECK_MALLOC_ZERO
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
 	   src/Makefile
-- 
cgit v1.2.1