xorg/driver/xf86-input-jamstudio: [PATCH] Janitor: make distcheck, .gitignore.

Wed Feb 4 14:45:42 PST 2009

On Wed, Feb 04, 2009 at 06:25:47PM -0200, Paulo César Pereira de Andrade wrote:
>   The "gratuitous" move of the lines
> 
> DRIVER_NAME=foo
> AC_SUBST([DRIVER_NAME])
> 
> is to better match the pattern used in video drivers.
> 
>   But maybe it would be better to either actually
> try to use a solution that makes use of the "pattern"
> 
> @DRIVER_NAME at _foo = bar
> 
> and use a single Makefile.am for all drivers, like
> it would be a good idea to have a single autogen.sh
> for all modules.

looking at the git log, jamstudio is dead and I'd rather bury it than put
janitor patches in. It makes it look like the driver actually matters.

Cheers,
  Peter

> From 2fc48bb883fe624ebf52d5d8cc6050dbe644a127 Mon Sep 17 00:00:00 2001
> From: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
> Date: Wed, 4 Feb 2009 17:53:02 -0200
> Subject: [PATCH] Janitor: make distcheck, .gitignore.
> 
>   Use an automatically generated ChangeLog instead of a hand written,
> maintained one.
>   Use a single toplevel .gitignore.
> ---
>  .gitignore      |    6 ++++++
>  ChangeLog       |   45 ---------------------------------------------
>  Makefile.am     |    9 +++++++++
>  configure.ac    |   15 +++++++++------
>  man/.gitignore  |    2 --
>  src/.gitignore  |    6 ------
>  src/Makefile.am |    2 ++
>  7 files changed, 26 insertions(+), 59 deletions(-)
>  delete mode 100644 ChangeLog
>  delete mode 100644 man/.gitignore
>  delete mode 100644 src/.gitignore
> 
> diff --git a/.gitignore b/.gitignore
> index 2df4a8d..4e4d50a 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -1,3 +1,5 @@
> +.deps
> +.libs
>  Makefile
>  Makefile.in
>  *.la
> @@ -18,3 +20,7 @@ ltmain.sh
>  missing
>  stamp-h1
>  *~
> +*.4
> +xf86-input-jamstudio-*.tar.*
> +ChangeLog
> +tags
> diff --git a/ChangeLog b/ChangeLog
> deleted file mode 100644
> index e873cfc..0000000
> --- a/ChangeLog
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -2006-04-06  Adam Jackson  <ajax at freedesktop.org>
> -
> -	* configure.ac:
> -	* src/js_x.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 at 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..6a0325e 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -20,3 +20,12 @@
>  
>  AUTOMAKE_OPTIONS = foreign
>  SUBDIRS = src man
> +EXTRA_DIST = ChangeLog
> +MAINTAINERCLEANFILES = ChangeLog
> +
> +.PHONY: ChangeLog
> +
> +ChangeLog:
> +	$(CHANGELOG_CMD)
> +
> +dist-hook: ChangeLog
> diff --git a/configure.ac b/configure.ac
> index 17e34c8..1bb1741 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -32,15 +32,16 @@ AM_INIT_AUTOMAKE([dist-bzip2])
>  
>  AM_MAINTAINER_MODE
>  
> -DRIVER_NAME=js_x
> -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"])
>  
> @@ -77,16 +78,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])
> +XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
>  
>  # Checks for libraries.
>  
>  # Checks for header files.
>  AC_HEADER_STDC
>  
> +DRIVER_NAME=js_x
> +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 2221bbc..6a38358 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 = $(XORG_CFLAGS)
> +
>  @DRIVER_NAME at _drv_la_LTLIBRARIES = @DRIVER_NAME at _drv.la
>  @DRIVER_NAME at _drv_la_LDFLAGS = -module -avoid-version
>  @DRIVER_NAME at _drv_ladir = @inputdir@
> -- 
> 1.6.1