>From b4a05a860087f1aea5bc64390ea23e17654e48c3 Mon Sep 17 00:00:00 2001
From: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
Date: Thu, 5 Feb 2009 15:11:04 -0200
Subject: [PATCH] Janitor: make distcheck, compile warnings, .gitignore.
Use `` instead of $().
Use $PKG_CONFIG to honor user build setup.
Use XORG_CHANGELOG to correct "make distcheck".
Don't add $CWARNFLAGS to $XORG_FLAGS, as suggested by
Dan Nicholson, so one could write:
% make CWARNFLAGS='-Werror'
or the like.
Remove an unused variable.
Signed-off-by: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
---
.gitignore | 4 ++++
Makefile.am | 6 ++++--
configure.ac | 16 +++++++++-------
man/.gitignore | 2 --
src/.gitignore | 6 ------
src/Makefile.am | 2 ++
src/xf86PM.c | 2 --
7 files changed, 19 insertions(+), 19 deletions(-)
delete mode 100644 man/.gitignore
delete mode 100644 src/.gitignore
diff --git a/.gitignore b/.gitignore
index 04b9542..03de1d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
ChangeLog
Makefile
Makefile.in
@@ -20,3 +22,5 @@ missing
stamp-h1
*~
man/penmount.?
+xf86-input-penmount-*.tar.*
+tags
diff --git a/Makefile.am b/Makefile.am
index 42f8b54..dde2381 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,11 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
CLEANFILES = ChangeLog
-EXTRA_DIST = 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 b245f5f..1af9fb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,15 +32,16 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-DRIVER_NAME=penmount
-AC_SUBST([DRIVER_NAME])
-
+# 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])
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
+XORG_CWARNFLAGS
AH_TOP([#include "xorg-server.h"])
@@ -76,17 +77,18 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-
-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-AC_SUBST([CFLAGS])
+sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
+DRIVER_NAME=penmount
+AC_SUBST([DRIVER_NAME])
+
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile src/Makefile man/Makefile])
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/Makefile.am b/src/Makefile.am
index 2042e32..eb71a94 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,8 @@
# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
# _ladir passes a dummy rpath to libtool so the thing will actually link
# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS)
+
@driver_n...@_drv_la_ltlibraries = @driver_n...@_drv.la
@driver_n...@_drv_la_ldflags = -module -avoid-version
@driver_n...@_drv_ladir = @inputdir@
diff --git a/src/xf86PM.c b/src/xf86PM.c
index 95adb8b..e20b327 100644
--- a/src/xf86PM.c
+++ b/src/xf86PM.c
@@ -462,8 +462,6 @@ DeviceControl (DeviceIntPtr dev, int mode)
{
InputInfoPtr pInfo = dev->public.devicePrivate;
PenMountPrivatePtr priv = (PenMountPrivatePtr) (pInfo->private);
- unsigned char map[] =
- {0, 1};
switch (mode)
{
--
1.6.1
_______________________________________________
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg
