From e2ffb441371eb759c512f8266ae40680518726da 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 | 18 +-------------- configure.ac | 5 +++- man/Makefile.am | 12 ++++++++++ man/smproxy.man | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ smproxy.man | 72 --------------------------------------------------------- 5 files changed, 89 insertions(+), 90 deletions(-) create mode 100644 man/Makefile.am create mode 100644 man/smproxy.man delete mode 100644 smproxy.man diff --git a/Makefile.am b/Makefile.am index bf47b0c..8beafc6 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 = smproxy AM_CFLAGS = $(CWARNFLAGS) $(SMPROXY_CFLAGS) @@ -29,24 +30,7 @@ smproxy_SOURCES = \ smproxy.c \ smproxy.h -appman_PRE = \ - smproxy.man - - -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 b011d3a..0daa9f2 100644 --- a/configure.ac +++ b/configure.ac @@ -40,4 +40,7 @@ AC_CHECK_FUNCS([mkstemp]) # Checks for pkg-config packages PKG_CHECK_MODULES(SMPROXY, sm xt xmuu) -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..7a853e1 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = smproxy.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/smproxy.man b/man/smproxy.man new file mode 100644 index 0000000..892dbf2 --- /dev/null +++ b/man/smproxy.man @@ -0,0 +1,72 @@ +.\" Copyright 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 SMPROXY 1 __xorgversion__ +.SH NAME +smproxy \- Session Manager Proxy +.SH SYNOPSIS +.B smproxy +[-clientId id] [-restore saveFile] +.SH OPTIONS +.TP 8 +.B \-clientId \fIid\fP +Specifies the session ID used by \fIsmproxy\fP in the previous session. +.TP 8 +.B \-restore \fIsaveFile\fP +Specifies the file used by \fIsmproxy\fP to save state in the previous session. +.SH DESCRIPTION +.PP +\fIsmproxy\fP allows X applications that do not support X11R6 session +management to participate in an X11R6 session. +.br +.sp +In order for \fIsmproxy\fP to act as a proxy for an X application, one of +the following must be true: +.br +.sp +- The application maps a top level window containing the +\fBWM_CLIENT_LEADER\fR property. This property provides a pointer to +the client leader window which contains the \fBWM_CLASS\fR, \fBWM_NAME\fR, +\fBWM_COMMAND\fR, and \fBWM_CLIENT_MACHINE\fR properties. +.br +.sp +or ... +.br +.sp +- The application maps a top level window which does not contain the +\fBWM_CLIENT_LEADER\fR property. However, this top level window +contains the \fBWM_CLASS\fR, \fBWM_NAME\fR, \fBWM_COMMAND\fR, and +\fBWM_CLIENT_MACHINE\fR properties. +.PP +An application that support the \fBWM_SAVE_YOURSELF\fR protocol will receive +a \fBWM_SAVE_YOURSELF\fR client message each time the session manager issues +a checkpoint or shutdown. This allows the application to save state. If +an application does not support the \fBWM_SAVE_YOURSELF\fR protocol, then +the proxy will provide enough information to the session manager to restart +the application (using \fBWM_COMMAND\fR), but no state will be restored. +.SH SEE ALSO +xsm(__appmansuffix__) +.SH AUTHOR +Ralph Mor, X Consortium + diff --git a/smproxy.man b/smproxy.man deleted file mode 100644 index 892dbf2..0000000 --- a/smproxy.man +++ /dev/null @@ -1,72 +0,0 @@ -.\" Copyright 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 SMPROXY 1 __xorgversion__ -.SH NAME -smproxy \- Session Manager Proxy -.SH SYNOPSIS -.B smproxy -[-clientId id] [-restore saveFile] -.SH OPTIONS -.TP 8 -.B \-clientId \fIid\fP -Specifies the session ID used by \fIsmproxy\fP in the previous session. -.TP 8 -.B \-restore \fIsaveFile\fP -Specifies the file used by \fIsmproxy\fP to save state in the previous session. -.SH DESCRIPTION -.PP -\fIsmproxy\fP allows X applications that do not support X11R6 session -management to participate in an X11R6 session. -.br -.sp -In order for \fIsmproxy\fP to act as a proxy for an X application, one of -the following must be true: -.br -.sp -- The application maps a top level window containing the -\fBWM_CLIENT_LEADER\fR property. This property provides a pointer to -the client leader window which contains the \fBWM_CLASS\fR, \fBWM_NAME\fR, -\fBWM_COMMAND\fR, and \fBWM_CLIENT_MACHINE\fR properties. -.br -.sp -or ... -.br -.sp -- The application maps a top level window which does not contain the -\fBWM_CLIENT_LEADER\fR property. However, this top level window -contains the \fBWM_CLASS\fR, \fBWM_NAME\fR, \fBWM_COMMAND\fR, and -\fBWM_CLIENT_MACHINE\fR properties. -.PP -An application that support the \fBWM_SAVE_YOURSELF\fR protocol will receive -a \fBWM_SAVE_YOURSELF\fR client message each time the session manager issues -a checkpoint or shutdown. This allows the application to save state. If -an application does not support the \fBWM_SAVE_YOURSELF\fR protocol, then -the proxy will provide enough information to the session manager to restart -the application (using \fBWM_COMMAND\fR), but no state will be restored. -.SH SEE ALSO -xsm(__appmansuffix__) -.SH AUTHOR -Ralph Mor, X Consortium - -- cgit v1.2.3