Janitor: make distcheck, compiler warnings, .gitignore.

8 files changed, 19 insertions, 23 deletions

diff --git a/.gitignore b/.gitignore
index 05af1de..f3c8925 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
 aclocal.m4
 autom4te.cache
 compile
@@ -20,3 +22,9 @@ mkinstalldirs
 stamp-h1
 xvmc.pc
 *~
+*.o
+*.la
+*.lo
+libXvMC-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 28f0863..bbca204 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,12 +24,12 @@ SUBDIRS = src include
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xvmc.pc
 
-EXTRA_DIST = xvmc.pc.in autogen.sh
+EXTRA_DIST = xvmc.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 668ec91..27736f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,19 +26,19 @@ AC_INIT(libXvMC, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
 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)
-
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
 
 # Check for dependencies
 PKG_CHECK_MODULES(XVMC, x11 xext xv xextproto videoproto)
-
+XVMC_CFLAGS="$CWARNFLAGS $XVMC_CFLAGS"
 AC_SUBST(XVMC_CFLAGS)
 AC_SUBST(XVMC_LIBS)
 
@@ -46,6 +46,7 @@ AC_CHECK_FUNC([shmat], AC_DEFINE(HAS_SHM,1,[Has shm*() functions]))
 		  
 XORG_CHECK_MALLOC_ZERO
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 dnl Allow checking code with lint, sparse, etc.
 XORG_WITH_LINT
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/include/X11/.gitignore b/include/X11/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/include/X11/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/include/X11/extensions/.gitignore b/include/X11/extensions/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/include/X11/extensions/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 34c9a0a..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-libXvMC.la
-libXvMCW.la
-*.lo
-Makefile
-Makefile.in
diff --git a/src/XvMCWrapper.c b/src/XvMCWrapper.c
index 42f175d..b9f97b2 100644
--- a/src/XvMCWrapper.c
+++ b/src/XvMCWrapper.c
@@ -315,15 +315,15 @@ static void initW(Display *dpy, XvPortID port)
       
 	xW.initialised = 0;
 	xW.vldextension = 0;
-      
-	if (0 == configFile) {
+
+	if (NULL == configFile) {
 	    fprintf(stderr,"XvMCWrapper: Could not open config file \"%s\".\n",
 		    STRS(XVMC_CONFIGDIR) "/XvMCConfig");
 	    perror("XvMCWrapper");
 	    return;
 	}
 
-	if (0 == fgets(nameBuffer, BUFLEN, configFile)) {
+	if (NULL == fgets(nameBuffer, BUFLEN, configFile)) {
 	    fclose(configFile);
 	    fprintf(stderr,"XvMCWrapper: Could not read XvMC library name.\n");
 	    perror("XvMCWrapper");