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

6 files changed, 30 insertions, 47 deletions

diff --git a/.gitignore b/.gitignore
index 64b9b9b..ad3d7ab 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
 xxf86misc.pc
 *~
+*.3
+*.o
+*.la
+*.lo
+libXxf86misc-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index d80a181..1b735d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,14 +3,12 @@ SUBDIRS = src man
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xxf86misc.pc
 
-EXTRA_DIST = xxf86misc.pc.in autogen.sh
-
-EXTRA_DIST += ChangeLog
+EXTRA_DIST = xxf86misc.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 c821849..2ad247e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,11 +4,15 @@ AC_INIT(libXxf86misc, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product
 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(XXF86MISC, xproto x11 xextproto xext xf86miscproto)
@@ -16,6 +20,7 @@ PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto)
 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 07e6fa2..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-config.h
-config.h.in
-.deps
-.libs
-libXxf86misc.la
-*.lo
-Makefile
-Makefile.in
-stamp-h1
diff --git a/src/XF86Misc.c b/src/XF86Misc.c
index b0669d5..193224f 100644
--- a/src/XF86Misc.c
+++ b/src/XF86Misc.c
@@ -56,9 +56,7 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86misc_info)
  *                                                                           *
  *****************************************************************************/
 
-Bool XF86MiscQueryExtension (dpy, event_basep, error_basep)
-    Display *dpy;
-    int *event_basep, *error_basep;
+Bool XF86MiscQueryExtension (Display *dpy, int *event_basep, int *error_basep)
 {
     XExtDisplayInfo *info = find_display (dpy);
 
@@ -71,10 +69,7 @@ Bool XF86MiscQueryExtension (dpy, event_basep, error_basep)
     }
 }
 
-Bool XF86MiscQueryVersion(dpy, majorVersion, minorVersion)
-    Display* dpy;
-    int* majorVersion; 
-    int* minorVersion;
+Bool XF86MiscQueryVersion(Display* dpy, int* majorVersion, int* minorVersion)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscQueryVersionReply rep;
@@ -119,9 +114,7 @@ XF86MiscSetClientVersion(Display *dpy)
     return True;
 }
 
-Bool XF86MiscGetMouseSettings(dpy, mouseinfo)
-    Display* dpy;
-    XF86MiscMouseSettings *mouseinfo;
+Bool XF86MiscGetMouseSettings(Display* dpy, XF86MiscMouseSettings *mouseinfo)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscGetMouseSettingsReply rep;
@@ -165,9 +158,7 @@ Bool XF86MiscGetMouseSettings(dpy, mouseinfo)
     return True;
 }
 
-Bool XF86MiscGetKbdSettings(dpy, kbdinfo)
-    Display* dpy;
-    XF86MiscKbdSettings *kbdinfo;
+Bool XF86MiscGetKbdSettings(Display* dpy, XF86MiscKbdSettings *kbdinfo)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscGetKbdSettingsReply rep;
@@ -195,9 +186,7 @@ Bool XF86MiscGetKbdSettings(dpy, kbdinfo)
     return True;
 }
 
-Bool XF86MiscSetMouseSettings(dpy, mouseinfo)
-    Display* dpy;
-    XF86MiscMouseSettings *mouseinfo;
+Bool XF86MiscSetMouseSettings(Display* dpy, XF86MiscMouseSettings *mouseinfo)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscSetMouseSettingsReq *req;
@@ -235,9 +224,7 @@ Bool XF86MiscSetMouseSettings(dpy, mouseinfo)
     return True;
 }
 
-Bool XF86MiscSetKbdSettings(dpy, kbdinfo)
-    Display* dpy;
-    XF86MiscKbdSettings *kbdinfo;
+Bool XF86MiscSetKbdSettings(Display* dpy, XF86MiscKbdSettings *kbdinfo)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscSetKbdSettingsReq *req;
@@ -258,9 +245,7 @@ Bool XF86MiscSetKbdSettings(dpy, kbdinfo)
     return True;
 }
 
-int XF86MiscSetGrabKeysState(dpy, enable)
-    Display* dpy;
-    Bool enable;
+int XF86MiscSetGrabKeysState(Display* dpy, Bool enable)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscSetGrabKeysStateReply rep;
@@ -284,9 +269,7 @@ int XF86MiscSetGrabKeysState(dpy, enable)
     return rep.status;
 }
 
-Bool XF86MiscGetFilePaths(dpy, filpaths)
-    Display* dpy;
-    XF86MiscFilePaths *filpaths;
+Bool XF86MiscGetFilePaths(Display* dpy, XF86MiscFilePaths *filpaths)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscGetFilePathsReply rep;
@@ -354,12 +337,9 @@ Bool XF86MiscGetFilePaths(dpy, filpaths)
     return True;
 }
 
-Status XF86MiscPassMessage(dpy, screen, msgtype, msgval, retmsg)
-    Display* dpy;
-    int screen;
-    const char* msgtype;
-    const char* msgval;
-    char** retmsg;
+Status XF86MiscPassMessage(Display* dpy, int screen,
+			   const char* msgtype, const char* msgval,
+			   char** retmsg)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86MiscPassMessageReply rep;