Ansification and compile warning fixes.

  This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
make distcheck and all gcc 4.3 and sparse warnings.

4 files changed, 15 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 3433a1c..66e325d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,7 @@ stamp-h1
 xcmsdb
 xcmsdb.1
 *~
+*.o
+xcmsdb-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 5ac4188..d0a4c39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,7 @@
 
 bin_PROGRAMS = xcmsdb
 
-xcmsdb_CFLAGS = $(XCMSDB_CFLAGS)
+AM_CFLAGS = $(XCMSDB_CFLAGS)
 xcmsdb_LDADD = $(XCMSDB_LIBS)
 
 xcmsdb_SOURCES =	\
@@ -71,6 +71,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 7cbfab9..3af3676 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,17 +26,25 @@ AC_INIT(xcmsdb,[1.0.1], [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)
 
 AC_PROG_CC
 AC_PROG_INSTALL
 
+XORG_CWARNFLAGS
+
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XCMSDB, x11)
+XCMSDB_CFLAGS="$CWARNFLAGS $XCMSDB_CFLAGS"
 AC_SUBST(XCMSDB_CFLAGS)
 AC_SUBST(XCMSDB_LIBS)
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile])
diff --git a/xcmsdb.c b/xcmsdb.c
index f0e5e34..be55ba6 100644
--- a/xcmsdb.c
+++ b/xcmsdb.c
@@ -53,7 +53,7 @@ static int _XcmsGetProperty(Display *pDpy, Window w, Atom property,
 			    unsigned long *pNBytes, char **pValue);
 
 
-char *ProgramName;
+static char *ProgramName;
 
 static void
 Syntax (void)