Makefile.am: Rule to autogenerate ChangeLog from git on make dist

6 files changed, 17 insertions, 55 deletions

diff --git a/.gitignore b/.gitignore
index 2df4a8d..b5f3c05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,5 @@ ltmain.sh
 missing
 stamp-h1
 *~
+xf86-input-joystick-*.tar.bz2
+xf86-input-joystick-*.tar.gz
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 92bef54..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,51 +0,0 @@
-2007-03-13  Sascha Hlusiak <saschahlusiak@freedesktop.org>
-
-	* src/xf86Jstk.c:
-	Cleaning and rearranging of code.
-	Made the module actually work at all.
-
-2006-04-06  Adam Jackson  <ajax@freedesktop.org>
-
-	* configure.ac:
-	* src/xf86Jstk.c:
-	Unlibcwrap.  Bump server version requirement.  Bump to 1.1.0.
-
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version for X11R7 release.
-
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
-
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* man/Makefile.am:
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
-
-2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Remove extraneous AC_MSG_RESULT.
-
-2005-11-29  Adam Jackson  <ajax@freedesktop.org>
-
-	* configure.ac:
-	Only build dlloader modules by default.
-
-2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for X11R7 RC2 release.
-
-2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index 7052905..af2effb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,14 @@
 
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src man
+
+EXTRA_DIST = autogen.sh ChangeLog
+
+CLEANFILES = 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)
+
+dist-hook: ChangeLog
diff --git a/man/.gitignore b/man/.gitignore
index 7cdc486..c858bd6 100644
--- a/man/.gitignore
+++ b/man/.gitignore
@@ -1,3 +1,3 @@
 Makefile
 Makefile.in
-joystick.4x
\ No newline at end of file
+joystick.4
diff --git a/man/joystick.man b/man/joystick.man
index 9e1673f..e4e4e5a 100644
--- a/man/joystick.man
+++ b/man/joystick.man
@@ -154,7 +154,7 @@ This example will set up the axis as scrolling vertically inverted, which half o
 .BI "  Option \*qMapAxis1\*q     \*q" "mode=accelerated axis=-0.5zy" \*q
 .fi
 
-THis example maps four buttons to the four half axes, so you can use them like a pad. The movement will get half
+This example maps four buttons to the four half axes, so you can use them like a pad. The movement will get half
 the normal speed:
 .nf
 .BI "  Option \*qMapButton1\*q     \*q" "axis=+0.5x" \*q
diff --git a/src/jstk_axis.c b/src/jstk_axis.c
index 4840ade..e0b48e8 100644
--- a/src/jstk_axis.c
+++ b/src/jstk_axis.c
@@ -126,8 +126,8 @@ jstkAxisTimer(OsTimerPtr        timer,
 
     if (priv->button[i].currentspeed < 100.0f) priv->button[i].currentspeed = 
                            (priv->button[i].currentspeed + 3.0) * 1.07f - 3.0;
-   p1 = priv->button[i].currentspeed * (float)NEXTTIMER / 180.0f *
-        priv->button[i].amplify;
+    p1 = priv->button[i].currentspeed * (float)NEXTTIMER / 180.0f *
+         priv->button[i].amplify;
     p1 *= priv->amplify;
     p2 = p1 / 8.0f;