[PATCH] Janitor: make distcheck, compile warnings, .gitignore.
Paulo Cesar Pereira de Andrade
pcpa at mandriva.com.br
Thu Feb 5 11:07:31 PST 2009
Use `` instead of $().
Use $PKG_CONFIG to honor user build setup.
Replace ChangeLog with automatically generated version, this is
also the "make distcheck" correction.
Compile warning were generate by using XORG_CWARNFLAGS macro, and
generated by gcc and/or sparse.
Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
---
.gitignore | 6 ++++++
ChangeLog | 25 -------------------------
Makefile.am | 9 +++++++++
configure.ac | 16 +++++++++-------
shared/Makefile.am | 1 +
src/Makefile.am | 1 +
src/vmmouse.c | 6 +++---
tools/Makefile.am | 1 +
tools/vmmouse_detect.c | 2 +-
9 files changed, 31 insertions(+), 36 deletions(-)
delete mode 100644 ChangeLog
diff --git a/.gitignore b/.gitignore
index 4f978e1..3cc0128 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,9 @@ ltmain.sh
missing
stamp-h1
*~
+*.4
+hal-probe-vmmouse
+vmmouse_detect
+xf86-input-vmmouse-*.tar.*
+ChangeLog
+tags
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 467041b..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,25 +0,0 @@
-2006-04-06 Adam Jackson <ajax at freedesktop.org>
-
- * configure.ac:
- * src/vmmouse.c:
- * src/vmmouse_proto.h:
- Unlibcwrap. Bump server version requirement. Bump to 12.4.0.
-
-2006-03-28 Philip Langdale <plangdale at vmware.com>
-
- * configure.ac:
- * src/vmmouse.c: Bump PATCHLEVEL.
- * src/vmmouse_proto.h: Use the right #define
- when detecting a 64bit compilation. This fixes
- the driver to actually work for 64bit builds.
-
-2006-01-16 Philip Langdale <plangdale at vmware.com>
-
- * configure.ac:
- * src/vmmouse.c: Bump PATCHLEVEL.
- * src/vmmouse_proto.c: push/pop ebx to keep
- gcc4 happy when compiling with -fPIC.
-
-2006-01-06 Philip Langdale <plangdale at vmware.com>
-
- * Initial release.
diff --git a/Makefile.am b/Makefile.am
index 2e7b369..9eb5b50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,12 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = shared src tools fdi man
+EXTRA_DIST = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 118ae84..eec8a62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,15 +32,16 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-DRIVER_NAME=vmmouse
-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"])
@@ -102,7 +103,7 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.1] xproto $REQUIRED_MODULES)
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+sdkdir=`PKG_CONFIG --variable=sdkdir xorg-server`
PKG_CHECK_EXISTS([xorg-server >= 1.1.0],
[AC_DEFINE([HAVE_XORG_SERVER_1_1_0], 1,
@@ -116,15 +117,16 @@ PKG_CHECK_EXISTS([xorg-server > 1.4.0.90],
[AC_DEFINE([ABS_VALUATOR_AXES], 1,
[Define absolute valuator axes])])
-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-AC_SUBST([CFLAGS])
-
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
+DRIVER_NAME=vmmouse
+AC_SUBST([DRIVER_NAME])
+
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile shared/Makefile src/Makefile tools/Makefile fdi/Makefile man/Makefile])
diff --git a/shared/Makefile.am b/shared/Makefile.am
index feedffa..011b07b 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -17,6 +17,7 @@
# VMWARE, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS)
INCLUDES = -I$(srcdir)
diff --git a/src/Makefile.am b/src/Makefile.am
index 6848537..b84330b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,6 +17,7 @@
# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS)
@DRIVER_NAME at _drv_la_LTLIBRARIES = @DRIVER_NAME at _drv.la
@DRIVER_NAME at _drv_la_LDFLAGS = -module -avoid-version
diff --git a/src/vmmouse.c b/src/vmmouse.c
index a712bd5..9fd926a 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -108,7 +108,7 @@
* extra zero for the fourth digit.
*/
#ifdef __GNUC__
-const char vm_mouse_version[] __attribute__((section(".modinfo"),unused)) =
+static const char vm_mouse_version[] __attribute__((section(".modinfo"),unused)) =
"version=" VMMOUSE_DRIVER_VERSION_STRING ".0";
#endif
@@ -302,7 +302,7 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
*/
osInfo = xf86OSMouseInit(0);
if (!osInfo)
- return FALSE;
+ return NULL;
mPriv = xcalloc (1, sizeof (VMMousePrivRec));
@@ -367,7 +367,7 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
pInfo->fd = -1;
pInfo->dev = NULL;
pInfo->private_flags = 0;
- pInfo->always_core_feedback = 0;
+ pInfo->always_core_feedback = NULL;
pInfo->conf_idev = dev;
/* Allocate the MouseDevRec and initialise it. */
diff --git a/tools/Makefile.am b/tools/Makefile.am
index c00d65d..046f33c 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -17,6 +17,7 @@
# VMWARE, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS)
bin_PROGRAMS = @DRIVER_NAME at _detect
diff --git a/tools/vmmouse_detect.c b/tools/vmmouse_detect.c
index 0dd4827..6036d98 100644
--- a/tools/vmmouse_detect.c
+++ b/tools/vmmouse_detect.c
@@ -30,7 +30,7 @@
#include <signal.h>
#include "vmmouse_client.h"
-void
+static void
segvCB(int sig)
{
exit(1);
--
1.6.1
------=_20090205173717_34147--
More information about the xorg
mailing list