From 0e96450836cc876d213e02491394da3f6fa7575d 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 | 18 +----------- configure.ac | 5 +++- man/Makefile.am | 12 ++++++++ man/xlogo.man | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ xlogo.man | 90 --------------------------------------------------------- 5 files changed, 107 insertions(+), 108 deletions(-) create mode 100644 man/Makefile.am create mode 100644 man/xlogo.man delete mode 100644 xlogo.man diff --git a/Makefile.am b/Makefile.am index 51bd1dd..39359f5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xlogo AM_CFLAGS = $(XLOGO_CFLAGS) $(CWARNFLAGS) @@ -36,9 +37,6 @@ xlogo_SOURCES += \ RenderLogo.h endif -appman_PRE = \ - xlogo.man - # App default files DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults @@ -48,21 +46,7 @@ dist_appdefault_DATA = \ app-defaults/XLogo \ app-defaults/XLogo-color - -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 18e5e54..4ae8c6c 100644 --- a/configure.ac +++ b/configure.ac @@ -65,4 +65,7 @@ AC_ARG_WITH(appdefaultdir, [appdefaultdir="$withval"], [appdefaultdir="${xt_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..61b640d --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xlogo.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/xlogo.man b/man/xlogo.man new file mode 100644 index 0000000..b02a78c --- /dev/null +++ b/man/xlogo.man @@ -0,0 +1,90 @@ +.\" Copyright 1988, 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 XLOGO 1 __xorgversion__ +.SH NAME +xlogo - X Window System logo +.SH SYNOPSIS +.B xlogo +[-\fItoolkitoption\fP ...] +.SH DESCRIPTION +The \fIxlogo\fP program displays the X Window System logo. +.SH OPTIONS +.I Xlogo +accepts all of the standard X Toolkit command line options, as well as the +following: +.TP 8 +.B \-render +This option indicates that the logo should be drawn with anti-aliased edges using the RENDER extension. +.TP 8 +.B \-sharp +If -render is also specified, this forces the edges to be rendered in sharp mode, (ie. 1-bit alpha channel). +.TP 8 +.B \-shape +This option indicates that the logo window should be shaped rather than +rectangular. +.SH RESOURCES +The default width and the default height are each 100 pixels. +This program uses the \fILogo\fP widget in the Athena widget set. It +understands all of the Simple widget resource names and classes as well as: +.TP 8 +.B foreground (\fPclass\fB Foreground) +Specifies the color for the logo. The default is depends on whether +\fIreverseVideo\fP is specified. If \fIreverseVideo\fP is specified +the default is \fIXtDefaultForeground\fP, otherwise the default is +\fIXtDefaultBackground\fP. +.TP 8 +.B shapeWindow (\fPclass\fB ShapeWindow) +Specifies that the window is shaped to the X logo. The default is False. +.SH WIDGETS +In order to specify resources, it is useful to know the hierarchy of +the widgets which compose \fIxlogo\fR. In the notation below, +indentation indicates hierarchical structure. The widget class name +is given first, followed by the widget instance name. +.sp +.nf +.TA .5i +.ta .5i +XLogo xlogo + Logo xlogo +.fi +.sp +.SH ENVIRONMENT +.TP 8 +.B DISPLAY +to get the default host and display number. +.TP 8 +.B XENVIRONMENT +to get the name of a resource file that overrides the global resources +stored in the RESOURCE_MANAGER property. +.SH FILES +.TP +.I __apploaddir__/XLogo +specifies required resources +.SH SEE ALSO +X(__miscmansuffix__), xrdb(__appmansuffix__) +.SH AUTHORS +Ollie Jones of Apollo Computer and Jim Fulton of the MIT X Consortium +wrote the logo graphics routine, based on a graphic design by Danny +Chong and Ross Chapman of Apollo Computer. diff --git a/xlogo.man b/xlogo.man deleted file mode 100644 index b02a78c..0000000 --- a/xlogo.man +++ /dev/null @@ -1,90 +0,0 @@ -.\" Copyright 1988, 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 XLOGO 1 __xorgversion__ -.SH NAME -xlogo - X Window System logo -.SH SYNOPSIS -.B xlogo -[-\fItoolkitoption\fP ...] -.SH DESCRIPTION -The \fIxlogo\fP program displays the X Window System logo. -.SH OPTIONS -.I Xlogo -accepts all of the standard X Toolkit command line options, as well as the -following: -.TP 8 -.B \-render -This option indicates that the logo should be drawn with anti-aliased edges using the RENDER extension. -.TP 8 -.B \-sharp -If -render is also specified, this forces the edges to be rendered in sharp mode, (ie. 1-bit alpha channel). -.TP 8 -.B \-shape -This option indicates that the logo window should be shaped rather than -rectangular. -.SH RESOURCES -The default width and the default height are each 100 pixels. -This program uses the \fILogo\fP widget in the Athena widget set. It -understands all of the Simple widget resource names and classes as well as: -.TP 8 -.B foreground (\fPclass\fB Foreground) -Specifies the color for the logo. The default is depends on whether -\fIreverseVideo\fP is specified. If \fIreverseVideo\fP is specified -the default is \fIXtDefaultForeground\fP, otherwise the default is -\fIXtDefaultBackground\fP. -.TP 8 -.B shapeWindow (\fPclass\fB ShapeWindow) -Specifies that the window is shaped to the X logo. The default is False. -.SH WIDGETS -In order to specify resources, it is useful to know the hierarchy of -the widgets which compose \fIxlogo\fR. In the notation below, -indentation indicates hierarchical structure. The widget class name -is given first, followed by the widget instance name. -.sp -.nf -.TA .5i -.ta .5i -XLogo xlogo - Logo xlogo -.fi -.sp -.SH ENVIRONMENT -.TP 8 -.B DISPLAY -to get the default host and display number. -.TP 8 -.B XENVIRONMENT -to get the name of a resource file that overrides the global resources -stored in the RESOURCE_MANAGER property. -.SH FILES -.TP -.I __apploaddir__/XLogo -specifies required resources -.SH SEE ALSO -X(__miscmansuffix__), xrdb(__appmansuffix__) -.SH AUTHORS -Ollie Jones of Apollo Computer and Jim Fulton of the MIT X Consortium -wrote the logo graphics routine, based on a graphic design by Danny -Chong and Ross Chapman of Apollo Computer. -- cgit v1.2.3