From c80c86499b3e47bcba68960bcba1bd33d9394fc5 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 | 17 +------------- configure.ac | 5 +++- man/Makefile.am | 12 ++++++++++ man/xdpyinfo.man | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ xdpyinfo.man | 69 -------------------------------------------------------- 5 files changed, 86 insertions(+), 86 deletions(-) create mode 100644 man/Makefile.am create mode 100644 man/xdpyinfo.man delete mode 100644 xdpyinfo.man diff --git a/Makefile.am b/Makefile.am index 1039f5e..31285a5 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 = xdpyinfo AM_CFLAGS = \ @@ -53,17 +54,7 @@ xdpyinfo_LDADD = \ xdpyinfo_SOURCES = \ xdpyinfo.c -appman_PRE = \ - xdpyinfo.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 @@ -75,12 +66,6 @@ ChangeLog: dist-hook: ChangeLog INSTALL -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) diff --git a/configure.ac b/configure.ac index 2ab8a6d..c134358 100644 --- a/configure.ac +++ b/configure.ac @@ -139,4 +139,7 @@ PKG_CHECK_MODULES(DPY_XTST, xtst, dnl Allow checking code with lint, sparse, etc. XORG_WITH_LINT -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..f08c6db --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xdpyinfo.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/xdpyinfo.man b/man/xdpyinfo.man new file mode 100644 index 0000000..6dfc789 --- /dev/null +++ b/man/xdpyinfo.man @@ -0,0 +1,69 @@ +.\" Copyright 1988, 1989, 1994, 1998 The Open Group +.\" +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. +.\" +.\" 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 OPEN GROUP 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 Open Group 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 Open Group. +.\" +.TH XDPYINFO 1 __xorgversion__ +.SH NAME +xdpyinfo \- display information utility for X +.SH SYNOPSIS +.B "xdpyinfo" +[\-display \fIdisplayname\fP] +[\-queryExtensions] +[\-ext \fIextension-name\fP] +.SH DESCRIPTION +.PP +.I Xdpyinfo +is a utility for displaying information about an X server. It is used to +examine the +capabilities of a server, the predefined values for various parameters used +in communicating between clients and the server, and the different types of +screens and visuals that are available. +.PP +By default, numeric information (opcode, base event, base error) about +protocol extensions is not displayed. This information can be obtained +with the \fB\-queryExtensions\fP option. Use of this option on servers +that dynamically load extensions will likely cause all possible extensions +to be loaded, which can be slow and can consume significant server resources. +.PP +Detailed information about a particular extension is displayed with the +\fB\-ext\fP \fIextensionName\fP option. If \fIextensionName\fP is +\fBall\fP, information about all extensions supported by both \fIxdpyinfo\fP +and the server is displayed. +.SH ENVIRONMENT +.PP +.TP 8 +.B DISPLAY +To get the default host, display number, and screen. +.SH "SEE ALSO" +.IR X (__miscmansuffix__), +.IR xprop (__appmansuffix__), +.IR xrdb (__appmansuffix__), +.IR xwininfo (__appmansuffix__), +.IR xdriinfo (__appmansuffix__), +.IR xvinfo (__appmansuffix__), +.IR glxinfo (__appmansuffix__) +.SH AUTHOR +Jim Fulton, MIT X Consortium +.br +Support for the XFree86-VidModeExtension, XFree86-DGA, XFree86-Misc, +and XKB extensions added by Joe Moss diff --git a/xdpyinfo.man b/xdpyinfo.man deleted file mode 100644 index 6dfc789..0000000 --- a/xdpyinfo.man +++ /dev/null @@ -1,69 +0,0 @@ -.\" Copyright 1988, 1989, 1994, 1998 The Open Group -.\" -.\" Permission to use, copy, modify, distribute, and sell this software and its -.\" documentation for any purpose is hereby granted without fee, provided that -.\" the above copyright notice appear in all copies and that both that -.\" copyright notice and this permission notice appear in supporting -.\" documentation. -.\" -.\" 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 OPEN GROUP 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 Open Group 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 Open Group. -.\" -.TH XDPYINFO 1 __xorgversion__ -.SH NAME -xdpyinfo \- display information utility for X -.SH SYNOPSIS -.B "xdpyinfo" -[\-display \fIdisplayname\fP] -[\-queryExtensions] -[\-ext \fIextension-name\fP] -.SH DESCRIPTION -.PP -.I Xdpyinfo -is a utility for displaying information about an X server. It is used to -examine the -capabilities of a server, the predefined values for various parameters used -in communicating between clients and the server, and the different types of -screens and visuals that are available. -.PP -By default, numeric information (opcode, base event, base error) about -protocol extensions is not displayed. This information can be obtained -with the \fB\-queryExtensions\fP option. Use of this option on servers -that dynamically load extensions will likely cause all possible extensions -to be loaded, which can be slow and can consume significant server resources. -.PP -Detailed information about a particular extension is displayed with the -\fB\-ext\fP \fIextensionName\fP option. If \fIextensionName\fP is -\fBall\fP, information about all extensions supported by both \fIxdpyinfo\fP -and the server is displayed. -.SH ENVIRONMENT -.PP -.TP 8 -.B DISPLAY -To get the default host, display number, and screen. -.SH "SEE ALSO" -.IR X (__miscmansuffix__), -.IR xprop (__appmansuffix__), -.IR xrdb (__appmansuffix__), -.IR xwininfo (__appmansuffix__), -.IR xdriinfo (__appmansuffix__), -.IR xvinfo (__appmansuffix__), -.IR glxinfo (__appmansuffix__) -.SH AUTHOR -Jim Fulton, MIT X Consortium -.br -Support for the XFree86-VidModeExtension, XFree86-DGA, XFree86-Misc, -and XKB extensions added by Joe Moss -- cgit v1.2.3