From 1f078912053cc9294408bc447238514082a6c680 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 19 Jan 2011 10:06:56 -0500 Subject: config: move man pages into their own directory Use services provided by XORG_MANPAGE_SECTIONS. Use standard Makefile for man pages. Signed-off-by: Gaetan Nadon --- Makefile.am | 16 +--------- configure.ac | 5 ++- man/Makefile.am | 12 ++++++++ man/xgamma.man | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ xgamma.man | 96 --------------------------------------------------------- 5 files changed, 113 insertions(+), 112 deletions(-) create mode 100644 man/Makefile.am create mode 100644 man/xgamma.man delete mode 100644 xgamma.man diff --git a/Makefile.am b/Makefile.am index 4ca199d..d0a11d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xgamma AM_CFLAGS = $(CWARNFLAGS) $(XGAMMA_CFLAGS) @@ -27,18 +28,7 @@ xgamma_LDADD = $(XGAMMA_LIBS) xgamma_SOURCES = \ xgamma.c -appman_PRE = \ - xgamma.man - - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - .PHONY: ChangeLog INSTALL @@ -51,8 +41,4 @@ ChangeLog: dist-hook: ChangeLog INSTALL -SUFFIXES = .$(APP_MAN_SUFFIX) .man -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/configure.ac b/configure.ac index 283e6d1..a9d6491 100644 --- a/configure.ac +++ b/configure.ac @@ -41,4 +41,7 @@ XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XGAMMA, x11 xxf86vm) -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..ea71d64 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xgamma.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/man/xgamma.man b/man/xgamma.man new file mode 100644 index 0000000..0216e40 --- /dev/null +++ b/man/xgamma.man @@ -0,0 +1,96 @@ +.\" Copyright 1999 by The XFree86 Project, Inc. +.\" +.\" All Rights Reserved. +.\" +.\" The above copyright notice and this permission notice shall be included +.\" in all copies or substantial portions of the Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +.\" IN NO EVENT SHALL THE XFREE86 PROJECT 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. +.\" +.\" Except as contained in this notice, the name of The XFree86 Project shall +.\" not be used in advertising or otherwise to promote the sale, use or +.\" other dealings in this Software without prior written authorization +.\" from The XFree86 Project. +.\" +.TH xgamma 1 __vendorversion__ +.SH NAME +xgamma - Alter a monitor's gamma correction through the X server +.SH SYNOPSIS +.B "xgamma" +[-display \fIdisplay\fP] [-screen \fIscreen\fP] [-quiet] +[-gamma f.f | [[-rgamma f.f] [-ggamma f.f] [-bgamma f.f]]] +.SH DESCRIPTION +.PP +.B xgamma +allows X users to query and alter the gamma correction of a monitor via +the X video mode extension (XFree86-VidModeExtension). +.PP +If no value for the gamma correction is given via the +.I -gamma +or +.IR -rgamma / -ggamma / -bgamma +options, +.B xgamma +prints the current gamma correction of the display. +.SH OPTIONS +.PP +.TP 8 +.B "-display \fIdisplay\fP" +This argument allows you to specify the server to connect to; see \fIX(__miscmansuffix__)\fP. +.PP +.TP 8 +.B "-screen \fIscreen\fP" +When multiple displays are configured as a single logical display, this option +allows you to select the screen you wish to change. +.PP +.TP 8 +.B "-quiet" +Silence the normal output of +.B xgamma +.PP +.TP 8 +.B "-help" +Print out the `Usage:' command syntax summary. +.PP +.TP 8 +.B "-gamma f.f" +The gamma correction can either be defined as a single value, or +separately for the red, green and blue components. This argument +specifies the gamma correction as a single value. +.PP +.TP 8 +.B "-rgamma f.f" +This argument specifies the red component of the gamma correction. +.PP +.TP 8 +.B "-ggamma f.f" +This argument specifies the green component of the gamma correction. +.PP +.TP 8 +.B "-bgamma f.f" +This argument specifies the blue component of the gamma correction. +.SH ENVIRONMENT +.PP +.TP 8 +.B DISPLAY +To get default host and display number. +.SH BUGS +.PP +This client changes the internal values of the gamma correction for the +Xserver. Whether or not these values are respected depends on the video +drivers. +.PP +The gamma values are passed to the Xserver with 3 decimal places of +accuracy. +.SH SEE ALSO +xvidtune(__appmansuffix__) +.SH AUTHORS +Kaleb S. Keithley, X Consortium. +.br +David Dawes, David Bateman diff --git a/xgamma.man b/xgamma.man deleted file mode 100644 index 0216e40..0000000 --- a/xgamma.man +++ /dev/null @@ -1,96 +0,0 @@ -.\" Copyright 1999 by The XFree86 Project, Inc. -.\" -.\" All Rights Reserved. -.\" -.\" The above copyright notice and this permission notice shall be included -.\" in all copies or substantial portions of the Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -.\" IN NO EVENT SHALL THE XFREE86 PROJECT 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. -.\" -.\" Except as contained in this notice, the name of The XFree86 Project shall -.\" not be used in advertising or otherwise to promote the sale, use or -.\" other dealings in this Software without prior written authorization -.\" from The XFree86 Project. -.\" -.TH xgamma 1 __vendorversion__ -.SH NAME -xgamma - Alter a monitor's gamma correction through the X server -.SH SYNOPSIS -.B "xgamma" -[-display \fIdisplay\fP] [-screen \fIscreen\fP] [-quiet] -[-gamma f.f | [[-rgamma f.f] [-ggamma f.f] [-bgamma f.f]]] -.SH DESCRIPTION -.PP -.B xgamma -allows X users to query and alter the gamma correction of a monitor via -the X video mode extension (XFree86-VidModeExtension). -.PP -If no value for the gamma correction is given via the -.I -gamma -or -.IR -rgamma / -ggamma / -bgamma -options, -.B xgamma -prints the current gamma correction of the display. -.SH OPTIONS -.PP -.TP 8 -.B "-display \fIdisplay\fP" -This argument allows you to specify the server to connect to; see \fIX(__miscmansuffix__)\fP. -.PP -.TP 8 -.B "-screen \fIscreen\fP" -When multiple displays are configured as a single logical display, this option -allows you to select the screen you wish to change. -.PP -.TP 8 -.B "-quiet" -Silence the normal output of -.B xgamma -.PP -.TP 8 -.B "-help" -Print out the `Usage:' command syntax summary. -.PP -.TP 8 -.B "-gamma f.f" -The gamma correction can either be defined as a single value, or -separately for the red, green and blue components. This argument -specifies the gamma correction as a single value. -.PP -.TP 8 -.B "-rgamma f.f" -This argument specifies the red component of the gamma correction. -.PP -.TP 8 -.B "-ggamma f.f" -This argument specifies the green component of the gamma correction. -.PP -.TP 8 -.B "-bgamma f.f" -This argument specifies the blue component of the gamma correction. -.SH ENVIRONMENT -.PP -.TP 8 -.B DISPLAY -To get default host and display number. -.SH BUGS -.PP -This client changes the internal values of the gamma correction for the -Xserver. Whether or not these values are respected depends on the video -drivers. -.PP -The gamma values are passed to the Xserver with 3 decimal places of -accuracy. -.SH SEE ALSO -xvidtune(__appmansuffix__) -.SH AUTHORS -Kaleb S. Keithley, X Consortium. -.br -David Dawes, David Bateman -- cgit v1.2.3