xf86-video-mach64: Branch 'master' - 4 commits

Thu Nov 19 11:39:45 PST 2009

.gitignore   |   84 ++++++++++++++++++++++++++++++++++++++++++++---------------
 Makefile.am  |   11 ++++---
 configure.ac |   14 ++++-----
 3 files changed, 76 insertions(+), 33 deletions(-)

New commits:
commit da3afdb69d426db6423c505f1c4ec10b9cd40304
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Wed Oct 28 14:41:41 2009 -0400

    INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
    
    Automake 'foreign' option is specified in configure.ac.
    Remove from Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 52cf224..48f385a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@
 #  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.
 
-AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src man
 
 if BUILD_LINUXDOC
commit a0b11f322c440ccf13347c42d08ed5e0b208d79c
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Wed Oct 28 14:09:09 2009 -0400

    INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
    
    Add missing INSTALL file. Use standard GNU file on building tarball
    README may have been updated
    Remove AUTHORS file as it is empty and no content available yet.
    Remove NEWS file as it is empty and no content available yet.

diff --git a/Makefile.am b/Makefile.am
index 5f0278e..52cf224 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,12 @@ endif
 
 EXTRA_DIST = README.ati README.ati.sgml
 
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
 
 ChangeLog:
 	$(CHANGELOG_CMD)
 
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index 393cab6..d99507b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR(.)
 
-AM_INIT_AUTOMAKE([dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 AM_MAINTAINER_MODE
 
commit 963be32d684b32957d7e646eb19259d7710bf66a
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Mon Oct 26 12:54:21 2009 -0400

    Several driver modules do not have a ChangeLog target in Makefile.am #23814
    
    The git generated ChangeLog replaces the hand written one.
    Update configure.ac to xorg-macros level 1.3.
    Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
    Update Makefile.am to add ChangeLog target if missing
    Remove ChangeLog from EXTRA_DIST or *CLEAN variables
    This is a pre-req for the INSTALL_CMD

diff --git a/Makefile.am b/Makefile.am
index 7fd7bae..5f0278e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,8 +26,7 @@ README.ati: README.ati.sgml
 	$(MAKE_TEXT) README.ati.sgml && mv README.ati.txt README.ati
 endif
 
-EXTRA_DIST = README.ati README.ati.sgml ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+EXTRA_DIST = README.ati README.ati.sgml
 
 .PHONY: ChangeLog
 
diff --git a/configure.ac b/configure.ac
index 2e6bc91..393cab6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,15 +34,16 @@ AM_INIT_AUTOMAKE([dist-bzip2])
 
 AM_MAINTAINER_MODE
 
-# 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)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], 
+          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
 
 # Checks for programs.
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_PROG_CC
-XORG_CWARNFLAGS
 
 AH_TOP([#include "xorg-server.h"])
 
@@ -222,10 +223,7 @@ AC_SUBST([moduledir])
 DRIVER_NAME=mach64
 AC_SUBST([DRIVER_NAME])
 
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
 XORG_CHECK_LINUXDOC
-XORG_CHANGELOG
 
 AC_MSG_NOTICE(
 [Please change the Driver line in xorg.conf from "ati" to "mach64"]
commit 3e54585250d22541a31068b5b8f0c8743dbccce6
Author: Gaetan Nadon <memsize at videotron.ca>
Date:   Thu Oct 22 12:34:17 2009 -0400

    .gitignore: use common defaults with custom section # 24239
    
    Using common defaults will reduce errors and maintenance.
    Only the very small or inexistent custom section need periodic maintenance
    when the structure of the component changes. Do not edit defaults.

diff --git a/.gitignore b/.gitignore
index ddc5574..461d73a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,78 @@
-*~
-*.la
-*.lo
-.#*
-.deps
-.libs
-Makefile
-Makefile.in
+#
+#		X.Org module default exclusion patterns
+#		The next section if for module specific patterns
+#
+#	Do not edit the following section
+# 	GNU Build System (Autotools)
 aclocal.m4
-ati.4
-ati.4x
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
 compile
 config.guess
 config.h
 config.h.in
 config.log
+config-ml.in
+config.py
 config.status
+config.status.lineno
 config.sub
 configure
-configure.lineno
-cscope.files
-cscope.out
+configure.scan
 depcomp
+.deps/
+INSTALL
 install-sh
+.libs/
 libtool
+libtool.m4
 ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
 missing
-r128.4
-r128.4x
-radeon.4
-radeon.4x
-stamp-h1
-*cscope*
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+#	Do not edit the following section
+# 	Edit Compile Debug Document Distribute
+*~
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+#		Add & Override patterns for xf86-video-mach64 
+#
+#		Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+# 
