Janitor: Correct make distcheck

  Remove extra .gitignore in subdirectories
  Correct a sparse warning

7 files changed, 21 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index 3bc459b..94779e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
 Makefile
 Makefile.in
 aclocal.m4
@@ -16,6 +18,15 @@ libtool
 ltmain.sh
 missing
 mkinstalldirs
+shadows.DONE
 stamp-h1
 xcomposite.pc
 *~
+*.3
+Xcomposite.man
+*.o
+*.la
+*.lo
+libXcomposite-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index ab48e9c..28802ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,12 +24,12 @@ SUBDIRS = src man
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xcomposite.pc
 
-EXTRA_DIST = xcomposite.pc.in autogen.sh ChangeLog
+EXTRA_DIST = xcomposite.pc.in 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 5cf5f74..d5c0791 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,11 +36,15 @@ AC_INIT(libXcomposite, 0.4.0, [https://bugs.freedesktop.org/enter_bug.cgi?produc
 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)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
 
 AC_ARG_VAR([XMLTO], [Path to xmlto command])
 AC_PATH_PROG([XMLTO], [xmlto])
@@ -58,11 +62,13 @@ fi
 COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
 AC_SUBST(COMPOSITEEXT_VERSION)
 PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11 xfixes xext fixesproto)
+XCOMPOSITE_CFLAGS="$CWARNFLAGS $XCOMPOSITE_CFLAGS"
 AC_SUBST(XCOMPOSITE_CFLAGS)
 AC_SUBST(XCOMPOSITE_LIBS)
 
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
 	   src/Makefile
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 2dcc75c..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-shadows.DONE
-*.3
-*~
-Xcomposite.man
-Makefile
-Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 799fc97..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-*.lo
-*.la
-Makefile
-Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index f18cf12..a7d8269 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,7 +19,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
+AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libXcomposite.la
 
diff --git a/src/Xcomposite.c b/src/Xcomposite.c
index 33b5727..b5637b0 100644
--- a/src/Xcomposite.c
+++ b/src/Xcomposite.c
@@ -133,7 +133,7 @@ XCompositeExtAddDisplay (XCompositeExtInfo	*extinfo,
 	    UnlockDisplay (dpy);
 	    SyncHandle ();
 	    Xfree(info);
-	    return 0;
+	    return NULL;
 	}
 	info->major_version = rep.majorVersion;
 	info->minor_version = rep.minorVersion;