From 60b23a8cd5eefd77b64c84ab4de478420ae58f07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= Date: Mon, 3 Oct 2005 21:22:08 +0000 Subject: [PATCH] - For all drivers that have a .sgml file, add code in their build system to build the README file at make dist time - in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that will check if the required tools and files exist, and if so set a conditional. - util/modular/symlink.sh - Link all the .sgml to xf86-video-/README.sgml - Add all the README. to the list of excluded files - xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml: Various changes to make it spew less warnings when the text file is built. --- Makefile.am | 7 +++++++ README.sgml | 10 +++++----- configure.ac | 2 ++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7052905..2b6c46a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,3 +20,10 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man + +if BUILD_LINUXDOC +README: README.sgml + $(MAKE_TEXT) README.sgml && mv README.txt README +endif + +EXTRA_DIST = README.sgml diff --git a/README.sgml b/README.sgml index 7921b06..3f4b7bf 100644 --- a/README.sgml +++ b/README.sgml @@ -9,9 +9,6 @@ Thomas Winischhofer (thomas@winischhofer.net) 6 July 2005 - - - @@ -25,8 +22,8 @@ It currently supports the following chipsets: old series: SiS 5597/5598, 6236/AGP/DVD, 530/620 300 series: SiS 300/305, 540, 630/730 - 315 series: SiS 315/E/PRO, 55x, 650, 651, M650, 740, [M]661[F/M/G]X, [M]741[GX] - 330 series: SiS 330 ("Xabre"), [M]760[GX], [M]761[GX] + 315 series: SiS 315/E/PRO, 55x, 650, 651, M650, 740, [M]661&[F/M/G]X, [M]741[GX] + 330 series: SiS 330 ("Xabre"), [M]760[GX], [M]761[GX] 340 series: SiS 34x, XGI Volari Z7, V3XT, V5, V8 @@ -59,6 +56,7 @@ have the same meaning. Option "SWCursor" [boolean] +

Option "HWCursor" [boolean] These options select whether the software (SW) or hardware (HW) cursor should be used. The default is using the hardware cursor. @@ -162,6 +160,7 @@ have the same meaning. Selects the TV output standard. May be PAL or NTSC, on some machines (depending on the hardware) also PALM and PALN. Default: BIOS setting. Option "TVXPosOffset" [integer] +

Option "TVYPosOffset" [integer] These options allow relocating the image on your TV. Both options take an integer within the range of -16 to 16. Default: 0. Not supported for @@ -174,6 +173,7 @@ have the same meaning. should be super-overscan (slightly larger than the viewable area) or not. Option "SISTVXScale" [integer] +

Option "SISTVYScale" [integer] (For SiS video bridges only) These options allow zooming the image on your TV. SISTVXScale takes an integer within the range of -16 to 16. diff --git a/configure.ac b/configure.ac index e161407..5060770 100644 --- a/configure.ac +++ b/configure.ac @@ -93,6 +93,8 @@ AC_SUBST([moduledir]) XORG_RELEASE_VERSION +XORG_CHECK_LINUXDOC + AC_OUTPUT([ Makefile src/Makefile