Janitor: ansification, make distcheck, compiler warnings, .gitignore.

6 files changed, 41 insertions, 79 deletions

diff --git a/.gitignore b/.gitignore
index e66b17c..bff2b2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,11 @@
+.deps
+.libs
 aclocal.m4
 autom4te.cache
 compile
 config.guess
+config.h
+config.h.in
 config.log
 config.status
 config.sub
@@ -14,5 +18,13 @@ Makefile
 Makefile.in
 missing
 mkinstalldirs
+stamp-h1
 xxf86vm.pc
 *~
+*.3
+*.o
+*.la
+*.lo
+libXxf86vm-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index bfe2cdb..bf8f1e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,14 +3,12 @@ SUBDIRS = src man
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xxf86vm.pc
 
-EXTRA_DIST = xxf86vm.pc.in autogen.sh
-
-EXTRA_DIST += ChangeLog
+EXTRA_DIST = xxf86vm.pc.in 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 47b8c10..2259530 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,11 +4,15 @@ AC_INIT(libXxf86vm, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=x
 AM_INIT_AUTOMAKE([foreign 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(src/config.h)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XXF86VM, xproto x11 xextproto xext xf86vidmodeproto)
@@ -16,6 +20,7 @@ PKG_CHECK_MODULES(XXF86VM, xproto x11 xextproto xext xf86vidmodeproto)
 XORG_CHECK_MALLOC_ZERO
 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 2d0f344..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.3*
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 5e33e26..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-config.h
-config.h.in
-.deps
-.libs
-libXxf86vm.la
-*.lo
-Makefile
-Makefile.in
-stamp-h1
diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index 3a7de6b..7b33ff0 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -88,9 +88,7 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86vidmode_info)
  *****************************************************************************/
 
 Bool
-XF86VidModeQueryExtension (dpy, event_basep, error_basep)
-    Display *dpy;
-    int *event_basep, *error_basep;
+XF86VidModeQueryExtension(Display *dpy, int *event_basep, int *error_basep)
 {
     XExtDisplayInfo *info = find_display (dpy);
 
@@ -104,10 +102,7 @@ XF86VidModeQueryExtension (dpy, event_basep, error_basep)
 }
 
 Bool
-XF86VidModeQueryVersion(dpy, majorVersion, minorVersion)
-    Display* dpy;
-    int* majorVersion; 
-    int* minorVersion;
+XF86VidModeQueryVersion(Display* dpy, int* majorVersion, int* minorVersion)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeQueryVersionReply rep;
@@ -201,11 +196,8 @@ XF86VidModeGetGamma(Display *dpy, int screen, XF86VidModeGamma *Gamma)
 }
 
 Bool
-XF86VidModeGetModeLine(dpy, screen, dotclock, modeline)
-    Display* dpy;
-    int screen;
-    int* dotclock; 
-    XF86VidModeModeLine* modeline;
+XF86VidModeGetModeLine(Display* dpy, int screen, int* dotclock,
+		       XF86VidModeModeLine* modeline)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeGetModeLineReply rep;
@@ -278,11 +270,8 @@ XF86VidModeGetModeLine(dpy, screen, dotclock, modeline)
 }
 
 Bool
-XF86VidModeGetAllModeLines(dpy, screen, modecount, modelinesPtr)
-    Display* dpy;
-    int screen;
-    int* modecount; 
-    XF86VidModeModeInfo ***modelinesPtr;
+XF86VidModeGetAllModeLines(Display* dpy, int screen, int* modecount,
+			   XF86VidModeModeInfo ***modelinesPtr)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeGetAllModeLinesReply rep;
@@ -440,11 +429,9 @@ XF86VidModeGetAllModeLines(dpy, screen, modecount, modelinesPtr)
 #endif
 
 Bool
-XF86VidModeAddModeLine (dpy, screen, newmodeline, aftermodeline)
-    Display *dpy;
-    int screen;
-    XF86VidModeModeInfo* newmodeline;
-    XF86VidModeModeInfo* aftermodeline;
+XF86VidModeAddModeLine(Display *dpy, int screen,
+		       XF86VidModeModeInfo* newmodeline,
+		       XF86VidModeModeInfo* aftermodeline)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeAddModeLineReq *req;
@@ -553,10 +540,8 @@ XF86VidModeAddModeLine (dpy, screen, newmodeline, aftermodeline)
 }
 
 Bool
-XF86VidModeDeleteModeLine (dpy, screen, modeline)
-    Display *dpy;
-    int screen;
-    XF86VidModeModeInfo* modeline;
+XF86VidModeDeleteModeLine(Display *dpy, int screen,
+			  XF86VidModeModeInfo* modeline)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeDeleteModeLineReq *req;
@@ -617,10 +602,7 @@ XF86VidModeDeleteModeLine (dpy, screen, modeline)
 }
 
 Bool
-XF86VidModeModModeLine (dpy, screen, modeline)
-    Display *dpy;
-    int screen;
-    XF86VidModeModeLine* modeline;
+XF86VidModeModModeLine(Display *dpy, int screen, XF86VidModeModeLine* modeline)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeModModeLineReq *req;
@@ -679,10 +661,8 @@ XF86VidModeModModeLine (dpy, screen, modeline)
 }
 
 Status
-XF86VidModeValidateModeLine (dpy, screen, modeline)
-    Display *dpy;
-    int screen;
-    XF86VidModeModeInfo* modeline;
+XF86VidModeValidateModeLine(Display *dpy, int screen,
+			    XF86VidModeModeInfo* modeline)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeValidateModeLineReq *req;
@@ -750,10 +730,7 @@ XF86VidModeValidateModeLine (dpy, screen, modeline)
 }
 
 Bool
-XF86VidModeSwitchMode(dpy, screen, zoom)
-    Display* dpy;
-    int screen;
-    int zoom;
+XF86VidModeSwitchMode(Display* dpy, int screen, int zoom)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeSwitchModeReq *req;
@@ -772,10 +749,7 @@ XF86VidModeSwitchMode(dpy, screen, zoom)
 }
     
 Bool
-XF86VidModeSwitchToMode(dpy, screen, modeline)
-    Display* dpy;
-    int screen;
-    XF86VidModeModeInfo* modeline;
+XF86VidModeSwitchToMode(Display* dpy, int screen, XF86VidModeModeInfo* modeline)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeSwitchToModeReq *req;
@@ -861,10 +835,7 @@ XF86VidModeSwitchToMode(dpy, screen, modeline)
 }
     
 Bool
-XF86VidModeLockModeSwitch(dpy, screen, lock)
-    Display* dpy;
-    int screen;
-    int lock;
+XF86VidModeLockModeSwitch(Display* dpy, int screen, int lock)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeLockModeSwitchReq *req;
@@ -883,10 +854,7 @@ XF86VidModeLockModeSwitch(dpy, screen, lock)
 }
     
 Bool
-XF86VidModeGetMonitor(dpy, screen, monitor)
-    Display* dpy;
-    int screen;
-    XF86VidModeMonitor* monitor;
+XF86VidModeGetMonitor(Display* dpy, int screen, XF86VidModeMonitor* monitor)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeGetMonitorReply rep;
@@ -972,10 +940,7 @@ XF86VidModeGetMonitor(dpy, screen, monitor)
 }
 
 Bool
-XF86VidModeGetViewPort(dpy, screen, x, y)
-    Display* dpy;
-    int screen;
-    int *x, *y;
+XF86VidModeGetViewPort(Display* dpy, int screen, int *x, int *y)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeGetViewPortReply rep;
@@ -1025,10 +990,7 @@ XF86VidModeGetViewPort(dpy, screen, x, y)
 }
 
 Bool
-XF86VidModeSetViewPort(dpy, screen, x, y)
-    Display* dpy;
-    int screen;
-    int x, y;
+XF86VidModeSetViewPort(Display* dpy, int screen, int x, int y)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeSetViewPortReq *req;
@@ -1049,11 +1011,8 @@ XF86VidModeSetViewPort(dpy, screen, x, y)
 }
 
 Bool
-XF86VidModeGetDotClocks(dpy, screen,
-	    flagsPtr, numclocksPtr, maxclocksPtr, clocksPtr)
-    Display* dpy;
-    int screen;
-    int *flagsPtr, *numclocksPtr, *maxclocksPtr, *clocksPtr[]; 
+XF86VidModeGetDotClocks(Display* dpy, int screen, int *flagsPtr,
+			int *numclocksPtr, int *maxclocksPtr, int *clocksPtr[])
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeGetDotClocksReply rep;