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 72bb1a7..5fcaef7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,7 @@ install-sh
 missing
 stamp-h1
 *~
+*.o
+appres-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 82e9382..82ca466 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,7 @@ 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/appres.c b/appres.c
index 22da42c..761de42 100644
--- a/appres.c
+++ b/appres.c
@@ -35,9 +35,9 @@ in this Software without prior written authorization from The Open Group.
 
 #define NONAME "-AppResTest-"
 
-char *ProgramName;
+static char *ProgramName;
 
-XrmQuark XrmQString;
+static XrmQuark XrmQString;
 
 static void 
 usage (void)
diff --git a/configure.ac b/configure.ac
index 8d0a969..d924bb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,15 +28,23 @@ AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
 
+# 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)
+
 AC_PROG_CC
 AC_PROG_INSTALL
 
+XORG_CWARNFLAGS
+
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(APPRES, x11 xt)
+APPRES_CFLAGS="$CWARNFLAGS $APPRES_CFLAGS"
 AC_SUBST(APPRES_CFLAGS)
 AC_SUBST(APPRES_LIBS)
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile])