From 3450c1498afe0fc8beabf70f864d241f54e7a3a4 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 19 Jan 2011 10:06:55 -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 | 15 +--------- appres.man | 89 --------------------------------------------------------- configure.ac | 5 +++- man/Makefile.am | 12 ++++++++ man/appres.man | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 106 insertions(+), 104 deletions(-) delete mode 100644 appres.man create mode 100644 man/Makefile.am create mode 100644 man/appres.man diff --git a/Makefile.am b/Makefile.am index e624d5f..85b419c 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 = appres AM_CFLAGS = $(APPRES_CFLAGS) $(CWARNFLAGS) @@ -27,17 +28,7 @@ appres_LDADD = $(APPRES_LIBS) appres_SOURCES = \ appres.c -appman_PRE = \ - appres.man - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) autogen.sh MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - .PHONY: ChangeLog INSTALL @@ -49,8 +40,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/appres.man b/appres.man deleted file mode 100644 index d36afdd..0000000 --- a/appres.man +++ /dev/null @@ -1,89 +0,0 @@ -.\" Copyright 1993, 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 APPRES 1 __xorgversion__ -.SH NAME -appres \- list X application resource database -.SH SYNOPSIS -.B "appres" -[class [instance]] [\-1] [toolkitoptions] -.SH DESCRIPTION -.PP -The \fIappres\fP program prints the resources seen by an application -(or subhierarchy of an application) with the specified \fIclass\fP and -\fIinstance\fP names. It can be used to determine which -resources a particular program will load. For example, -.sp 1 -.in +.5i -.nf -% appres XTerm -.fi -.in -.5i -.sp 1 -will list the resources that any \fIxterm\fP program will load. -If no application class is specified, the class \fI-AppResTest-\fP is used. -.PP -To match a particular instance name, specify an instance name -explicitly after the class name, or use the normal Xt toolkit option. -For example, -.sp 1 -.in +.5i -.nf -% appres XTerm myxterm -.fi -.in -.5i -or -.in +.5i -.nf -% appres XTerm \-name myxterm -.fi -.in -.5i -.PP -To list resources that match a subhierarchy of an application, specify -hierarchical class and instance names. The number of class and instance -components must be equal, and the instance name should not be -specified with a toolkit option. For example, -.sp 1 -.in +.5i -.nf -% appres Xman.TopLevelShell.Form xman.topBox.form -.fi -.in -.5i -.sp 1 -will list the resources of widgets of \fIxman\fP topBox hierarchy. -To list just the resources matching a specific level in the hierarchy, -use the \-1 option. For example, -.sp 1 -.in +.5i -.nf -% appres XTerm.VT100 xterm.vt100 \-1 -.fi -.in -.5i -.sp 1 -will list the resources matching the \fIxterm\fP vt100 widget. -.SH "SEE ALSO" -.PP -X(__miscmansuffix__), xrdb(__appmansuffix__), listres(__appmansuffix__) -.SH AUTHOR -Jim Fulton, MIT X Consortium diff --git a/configure.ac b/configure.ac index e87c68d..e9c80d7 100644 --- a/configure.ac +++ b/configure.ac @@ -41,4 +41,7 @@ XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(APPRES, x11 xt) -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..76a8224 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = appres.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/appres.man b/man/appres.man new file mode 100644 index 0000000..d36afdd --- /dev/null +++ b/man/appres.man @@ -0,0 +1,89 @@ +.\" Copyright 1993, 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 APPRES 1 __xorgversion__ +.SH NAME +appres \- list X application resource database +.SH SYNOPSIS +.B "appres" +[class [instance]] [\-1] [toolkitoptions] +.SH DESCRIPTION +.PP +The \fIappres\fP program prints the resources seen by an application +(or subhierarchy of an application) with the specified \fIclass\fP and +\fIinstance\fP names. It can be used to determine which +resources a particular program will load. For example, +.sp 1 +.in +.5i +.nf +% appres XTerm +.fi +.in -.5i +.sp 1 +will list the resources that any \fIxterm\fP program will load. +If no application class is specified, the class \fI-AppResTest-\fP is used. +.PP +To match a particular instance name, specify an instance name +explicitly after the class name, or use the normal Xt toolkit option. +For example, +.sp 1 +.in +.5i +.nf +% appres XTerm myxterm +.fi +.in -.5i +or +.in +.5i +.nf +% appres XTerm \-name myxterm +.fi +.in -.5i +.PP +To list resources that match a subhierarchy of an application, specify +hierarchical class and instance names. The number of class and instance +components must be equal, and the instance name should not be +specified with a toolkit option. For example, +.sp 1 +.in +.5i +.nf +% appres Xman.TopLevelShell.Form xman.topBox.form +.fi +.in -.5i +.sp 1 +will list the resources of widgets of \fIxman\fP topBox hierarchy. +To list just the resources matching a specific level in the hierarchy, +use the \-1 option. For example, +.sp 1 +.in +.5i +.nf +% appres XTerm.VT100 xterm.vt100 \-1 +.fi +.in -.5i +.sp 1 +will list the resources matching the \fIxterm\fP vt100 widget. +.SH "SEE ALSO" +.PP +X(__miscmansuffix__), xrdb(__appmansuffix__), listres(__appmansuffix__) +.SH AUTHOR +Jim Fulton, MIT X Consortium -- cgit v1.2.3