From 5058a07bd4be9f15094b7bbde0fd4d9a975d3ca9 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 | 17 +-------- configure.ac | 5 ++- man/Makefile.am | 12 +++++++ man/oclock.man | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ oclock.man | 104 -------------------------------------------------------- 5 files changed, 121 insertions(+), 121 deletions(-) create mode 100644 man/Makefile.am create mode 100644 man/oclock.man delete mode 100644 oclock.man diff --git a/Makefile.am b/Makefile.am index f4eadc8..4137ba7 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 = oclock AM_CFLAGS = $(OCLOCK_CFLAGS) $(CWARNFLAGS) @@ -32,9 +33,6 @@ oclock_SOURCES = \ transform.c \ transform.h -appman_PRE = \ - oclock.man - # App default files (*.ad) DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults @@ -46,20 +44,7 @@ dist_appdefault_DATA = \ EXTRA_DIST = oclock.bit oclmask.bit -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST += $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -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) < $< > $@ - .PHONY: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 2de9ec9..a5bfbc1 100644 --- a/configure.ac +++ b/configure.ac @@ -49,4 +49,7 @@ AC_ARG_WITH(appdefaultdir, AC_SUBST(appdefaultdir) -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..87efc04 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = oclock.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/oclock.man b/man/oclock.man new file mode 100644 index 0000000..feb06eb --- /dev/null +++ b/man/oclock.man @@ -0,0 +1,104 @@ +.\" $Xorg: oclock.man,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ +.\" Copyright 1989, 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. +.\" +.\" $XFree86: xc/programs/oclock/oclock.man,v 1.8 2001/12/14 20:01:00 dawes Exp $ +.\" +.TH OCLOCK 1 __xorgversion__ +.SH NAME +oclock \- round X clock +.SH SYNOPSIS +.B oclock +[\-option ... ] +.SH DESCRIPTION +.I Oclock +simply displays the current time on an analog display. +.SH OPTIONS +.TP 8 +.B \-fg \fIcolor\fB +choose a different color for the both hands and the jewel of the clock +.TP 8 +.B \-bg \fIcolor\fB +choose a different color for the background. +.TP 8 +.B \-jewel \fIcolor\fB +choose a different color for the jewel on the clock. +.TP 8 +.B \-minute \fIcolor\fB +choose a different color for the minute hand of the clock. +.TP 8 +.B \-hour \fIcolor\fB +choose a different color for the hour hand of the clock. +.TP 8 +.B \-backing \fI{ WhenMapped Always NotUseful }\fB +selects an appropriate level of backing store. +.TP 8 +.B \-geometry \fIgeometry\fB +define the initial window geometry; see \fIX(__miscmansuffix__)\fP. +.TP 8 +.B \-display \fIdisplay\fB +specify the display to use; see \fIX(__miscmansuffix__)\fP. +.TP 8 +.B \-bd \fIcolor\fB +choose a different color for the window border. +.TP 8 +.B \-bw \fIwidth\fB +choose a different width for the window border. As the Clock widget changes +its border around quite a bit, this is most usefully set to zero. +.TP 8 +.B \-shape +causes the clock to use the Shape extension to create an oval window. +This is the default unless the shapeWindow resource is set to false. +.TP 8 +.B \-noshape +causes the clock to not reshape itself and ancestors to exactly +fit the outline of the clock. +.TP 8 +.B \-transparent +causes the clock to consist only of the jewel, the hands, and the border. +.SH COLORS +If you would like your clock to be viewable in color, include the following +in the #ifdef COLOR section you read with xrdb: +.sp 1 +*customization: -color +.sp 1 +.br +This will cause oclock to pick up the colors in the app-defaults color +customization file: +__projectroot__/lib/X11/app-defaults/Clock-color. +Below are the default colors: +.sp 1 +Clock*Background: grey +.br +Clock*BorderColor: light blue +.br +Clock*hour: yellow +.br +Clock*jewel: yellow +.br +Clock*minute: yellow +.SH "SEE ALSO" +X(__miscmansuffix__), X Toolkit documentation +.SH AUTHOR +Keith Packard, MIT X Consortium diff --git a/oclock.man b/oclock.man deleted file mode 100644 index feb06eb..0000000 --- a/oclock.man +++ /dev/null @@ -1,104 +0,0 @@ -.\" $Xorg: oclock.man,v 1.4 2001/02/09 02:05:33 xorgcvs Exp $ -.\" Copyright 1989, 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. -.\" -.\" $XFree86: xc/programs/oclock/oclock.man,v 1.8 2001/12/14 20:01:00 dawes Exp $ -.\" -.TH OCLOCK 1 __xorgversion__ -.SH NAME -oclock \- round X clock -.SH SYNOPSIS -.B oclock -[\-option ... ] -.SH DESCRIPTION -.I Oclock -simply displays the current time on an analog display. -.SH OPTIONS -.TP 8 -.B \-fg \fIcolor\fB -choose a different color for the both hands and the jewel of the clock -.TP 8 -.B \-bg \fIcolor\fB -choose a different color for the background. -.TP 8 -.B \-jewel \fIcolor\fB -choose a different color for the jewel on the clock. -.TP 8 -.B \-minute \fIcolor\fB -choose a different color for the minute hand of the clock. -.TP 8 -.B \-hour \fIcolor\fB -choose a different color for the hour hand of the clock. -.TP 8 -.B \-backing \fI{ WhenMapped Always NotUseful }\fB -selects an appropriate level of backing store. -.TP 8 -.B \-geometry \fIgeometry\fB -define the initial window geometry; see \fIX(__miscmansuffix__)\fP. -.TP 8 -.B \-display \fIdisplay\fB -specify the display to use; see \fIX(__miscmansuffix__)\fP. -.TP 8 -.B \-bd \fIcolor\fB -choose a different color for the window border. -.TP 8 -.B \-bw \fIwidth\fB -choose a different width for the window border. As the Clock widget changes -its border around quite a bit, this is most usefully set to zero. -.TP 8 -.B \-shape -causes the clock to use the Shape extension to create an oval window. -This is the default unless the shapeWindow resource is set to false. -.TP 8 -.B \-noshape -causes the clock to not reshape itself and ancestors to exactly -fit the outline of the clock. -.TP 8 -.B \-transparent -causes the clock to consist only of the jewel, the hands, and the border. -.SH COLORS -If you would like your clock to be viewable in color, include the following -in the #ifdef COLOR section you read with xrdb: -.sp 1 -*customization: -color -.sp 1 -.br -This will cause oclock to pick up the colors in the app-defaults color -customization file: -__projectroot__/lib/X11/app-defaults/Clock-color. -Below are the default colors: -.sp 1 -Clock*Background: grey -.br -Clock*BorderColor: light blue -.br -Clock*hour: yellow -.br -Clock*jewel: yellow -.br -Clock*minute: yellow -.SH "SEE ALSO" -X(__miscmansuffix__), X Toolkit documentation -.SH AUTHOR -Keith Packard, MIT X Consortium -- cgit v1.2.3