Janitor: make distcheck, compiler warnings, .gitignore.

6 files changed, 18 insertions, 25 deletions

diff --git a/.gitignore b/.gitignore
index 134f731..41c861b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
 aclocal.m4
 autom4te.cache
 config.guess
@@ -19,3 +21,9 @@ stamp-h1
 xmu.pc
 xmuu.pc
 *~
+*.o
+*.la
+*.lo
+libXmu-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 8eb6410..955bcb9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,16 +6,14 @@ pkgconfig_DATA = xmu.pc xmuu.pc
 EXTRA_DIST = \
 	xmu.pc.in \
 	xmuu.pc.in \
-	autogen.sh \
-	include/X11/Xmu/WhitePoint.h
-
-EXTRA_DIST += ChangeLog
+	include/X11/Xmu/WhitePoint.h \
+	ChangeLog
 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 901ffd3..48e2829 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,19 +15,20 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
+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])
 
-# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.1)
-
 
 # Checks for programs.
 AC_PROG_LIBTOOL
 AC_PROG_CC
+XORG_CWARNFLAGS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XMU, xt xext x11 xextproto)
+XMU_CFLAGS="$CWARNFLAGS $XMU_CFLAGS"
 AC_SUBST(XMU_CFLAGS)
 AC_SUBST(XMU_LIBS)
 
@@ -62,13 +63,8 @@ XORG_LINT_LIBRARY([Xmu])
 LINTLIBUU=`echo $LINTLIB | sed s/Xmu/Xmuu/`
 AC_SUBST(LINTLIBUU)
 
-if test "x$GCC" = "xyes"; then
-        GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
-        -Wmissing-prototypes -Wmissing-declarations -Wnested-externs"
-        XMU_CFLAGS="$GCC_WARNINGS $XMU_CFLAGS"
-fi
-
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
            include/Makefile
diff --git a/include/.gitignore b/include/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/include/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index b47b240..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-libXmu.la
-libXmuu.la
-*.lo
-Makefile
-Makefile.in
diff --git a/src/EditresCom.c b/src/EditresCom.c
index 66da52c..28e1be3 100644
--- a/src/EditresCom.c
+++ b/src/EditresCom.c
@@ -1611,7 +1611,7 @@ InsertWidget(ProtocolStream *stream, Widget w)
   unsigned long *widget_list;
     register int i, num_widgets;
 
-  for (temp = w, i = 0; temp != 0; temp = XtParent(temp), i++)
+  for (temp = w, i = 0; temp != NULL; temp = XtParent(temp), i++)
     ;
 
     num_widgets = i;