Correct make distcheck and sparse warnings.

4 files changed, 14 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index e4f33df..efdc6ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,7 @@ stamp-h1
 xfsinfo
 xfsinfo.1
 *~
+*.o
+xfsinfo-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index c498ddb..f5a4dc5 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 91c6c0d..27135fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,18 +26,26 @@ AC_INIT(xfsinfo,[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
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
 
+XORG_CWARNFLAGS
+
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XFSINFO, x11 libfs)
+XFSINFO_CFLAGS="$CWARNFLAGS $XFSINFO_CFLAGS"
 AC_SUBST(XFSINFO_CFLAGS)
 AC_SUBST(XFSINFO_LIBS)
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile])
diff --git a/xfsinfo.c b/xfsinfo.c
index 5ff9952..f1ea02d 100644
--- a/xfsinfo.c
+++ b/xfsinfo.c
@@ -68,7 +68,7 @@ static void print_catalogue_info(FSServer *svr);
 static void print_extension_info(FSServer *svr);
 static void print_alternate_info(FSServer *svr);
 
-char       *progname;
+static char *progname;
 
 static void
 usage(void)