Correct make distcheck and sparse warnings.

4 files changed, 35 insertions, 24 deletions

diff --git a/.gitignore b/.gitignore
index 86b0e8a..39f38ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,7 @@ stamp-h1
 xrdb
 xrdb.1
 *~
+*.o
+xrdb-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index a4e93ed..7fead6e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,14 +34,14 @@ appmandir = $(APP_MAN_DIR)
 
 appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 
-EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
+EXTRA_DIST = $(appman_PRE) ChangeLog
 CLEANFILES = $(appman_DATA)
 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 6348b55..3ca09e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,13 +25,18 @@ AC_INIT(xrdb,[1.0.5], [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
 
 AC_CHECK_FUNC([mkstemp], 
-   AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the `mkstemp' function.]))
+   AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the 'mkstemp' function.]))
 
 # Find MAXHOSTNAMELEN definition
 # Common hidey holes:
@@ -77,10 +82,12 @@ AC_DEFINE_UNQUOTED([CPP], "$CPP_PATH", [Path to CPP program])
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XRDB, xmuu x11)
+XRDB_CFLAGS="$CWARNFLAGS $XRDB_CFLAGS"
 AC_SUBST(XRDB_CFLAGS)
 AC_SUBST(XRDB_LIBS)
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile])
diff --git a/xrdb.c b/xrdb.c
index f6b4f05..8811120 100644
--- a/xrdb.c
+++ b/xrdb.c
@@ -116,32 +116,32 @@ typedef struct _String {
     int room, used;
 } String;
 
-char *ProgramName;
-Bool quiet = False;
-char tmpname[32];
-char *filename = NULL;
+static char *ProgramName;
+static Bool quiet = False;
+static char tmpname[32];
+static char *filename = NULL;
 #ifdef PATHETICCPP
-Bool need_real_defines = False;
-char tmpname2[32];
+static Bool need_real_defines = False;
+static char tmpname2[32];
 #ifdef WIN32
-char tmpname3[32];
+static char tmpname3[32];
 #endif
 #endif
-int oper = OPLOAD;
-char *editFile = NULL;
-const char *cpp_program = NULL;
+static int oper = OPLOAD;
+static char *editFile = NULL;
+static const char *cpp_program = NULL;
 static const char* const cpp_locations[] = { CPP };
-char *backup_suffix = BACKUP_SUFFIX;
-Bool dont_execute = False;
-String defines;
-int defines_base;
+static char *backup_suffix = BACKUP_SUFFIX;
+static Bool dont_execute = False;
+static String defines;
+static int defines_base;
 #define MAX_CMD_DEFINES 512
-char *cmd_defines[MAX_CMD_DEFINES];
-int num_cmd_defines = 0;
-String includes;
-Display *dpy;
-Buffer buffer;
-Entries newDB;
+static char *cmd_defines[MAX_CMD_DEFINES];
+static int num_cmd_defines = 0;
+static String includes;
+static Display *dpy;
+static Buffer buffer;
+static Entries newDB;
 
 static void fatal(char *, ...);
 static void addstring ( String *arg, const char *s );
@@ -544,7 +544,7 @@ DoDisplayDefines(Display *display, String *defs, char *host)
     XFreeExtensionList(extnames);
 }
 
-char *ClassNames[] = {
+static char *ClassNames[] = {
     "StaticGray",
     "GrayScale",
     "StaticColor",