4 files changed, 14 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 07276d9..146b3d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,7 @@ install-sh
 missing
 stamp-h1
 *~
+*.o
+xf86dga-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 94f31cd..29ad1ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,6 +68,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 ad6543c..1e26248 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,17 +26,25 @@ AC_INIT(xf86dga,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xor
 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(XF86DGA, x11 xxf86dga)
+XF86DGA_CFLAGS="$CWARNFLAGS $XF86DGA_CFLAGS"
 AC_SUBST(XF86DGA_CFLAGS)
 AC_SUBST(XF86DGA_LIBS)
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile])
diff --git a/dga.c b/dga.c
index eb1ec6e..c460ce7 100644
--- a/dga.c
+++ b/dga.c
@@ -22,7 +22,7 @@ GetTimeInMillis(void)
 {
     struct timeval  tp;
 
-    gettimeofday(&tp, 0);
+    gettimeofday(&tp, NULL);
     return(tp.tv_sec * 1000) + (tp.tv_usec / 1000);
 }