[PATCH 2/2] Janitor: make distcheck, .gitignore.

Mon Feb 9 13:15:50 PST 2009

Use a single .gitignore file and remove .cvsignore files.
  Replace ChangeLog with automatically generated one.
  Use same pattern for $moduledir and $sdkdir, that works with
make distcheck.
  Use XORG_CWARNFLAGS to help find driver problems.

Signed-off-by: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
---
 .gitignore      |    6 ++++++
 ChangeLog       |   53 -----------------------------------------------------
 configure.ac    |   25 +++++++++----------------
 man/.cvsignore  |    2 --
 man/Makefile.am |    4 ++--
 src/.cvsignore  |    6 ------
 src/Makefile.am |    2 +-
 7 files changed, 18 insertions(+), 80 deletions(-)
 delete mode 100644 ChangeLog
 delete mode 100644 man/.cvsignore
 delete mode 100644 src/.cvsignore

diff --git a/.gitignore b/.gitignore
index 2df4a8d..7675019 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-video-imstt-*.tar.*
+ChangeLog
+tags
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 405d40b..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,53 +0,0 @@
-2006-04-07  Adam Jackson  <ajax at freedesktop.org>
-
-	* configure.ac:
-	* src/imstt.h:
-	* src/imstt_accel.c:
-	* src/imstt_driver.c:
-	Unlibcwrap.  Bump server version requirement.  Bump to 1.1.0.
-
-2006-02-08  Luc Verhaegen <libv at skynet.be>
-
-	* src/imstt_driver.c: (IMSTTPreInit):
-
-	Remove idiotic usage of pScrn->clock, useless anyway.
-
-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/configure.ac b/configure.ac
index f33643b..97a3b8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,6 +27,9 @@ AC_INIT([xf86-video-imstt],
         xf86-video-imstt)
 
 AC_CONFIG_SRCDIR([Makefile.am])
+# 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])
 AC_CONFIG_AUX_DIR(.)
 
@@ -38,14 +41,13 @@ AM_MAINTAINER_MODE
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_PROG_CC
+XORG_CWARNFLAGS
 
 AH_TOP([#include "xorg-server.h"])
-
-AC_ARG_WITH(xorg-module-dir,
-            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-                           [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-            [moduledir="$withval"],
-            [moduledir="$libdir/xorg/modules"])
+moduledir="$libdir/xorg/modules"
+sdkdir="$includedir/xorg"
+AC_SUBST(moduledir)
+AC_SUBST(sdkdir)
 
 # Checks for extensions
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
@@ -53,21 +55,12 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-
-# Checks for libraries.
 
-# Checks for header files.
 AC_HEADER_STDC
 
-AC_SUBST([XORG_CFLAGS])
-AC_SUBST([moduledir])
-
-DRIVER_NAME=imstt
-AC_SUBST([DRIVER_NAME])
-
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([
 	Makefile
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/man/Makefile.am b/man/Makefile.am
index f0eb29b..c38c323 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -26,11 +26,11 @@
 
 drivermandir = $(DRIVER_MAN_DIR)
 
-driverman_PRE = @DRIVER_NAME at .man
+driverman_PRE = imstt.man
 
 driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
 
-EXTRA_DIST = @DRIVER_NAME at .man
+EXTRA_DIST = imstt.man
 
 CLEANFILES = $(driverman_DATA)
 
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/Makefile.am b/src/Makefile.am
index 35b1748..cc1f747 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@
 # -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@
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS)
 imstt_drv_la_LTLIBRARIES = imstt_drv.la
 imstt_drv_la_LDFLAGS = -module -avoid-version
 imstt_drv_ladir = @moduledir@/drivers
-- 
1.6.1

------=_20090209194719_81681--

