From 1439da945a066c5bdf821a4f1af2bc356452e170 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 | 21 ++---------------- configure.ac | 5 ++++- man/Makefile.am | 12 +++++++++++ man/xlsclients.man | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ xlsclients.man | 62 ------------------------------------------------------ 5 files changed, 80 insertions(+), 82 deletions(-) create mode 100644 man/Makefile.am create mode 100644 man/xlsclients.man delete mode 100644 xlsclients.man diff --git a/Makefile.am b/Makefile.am index 4bd94c8..0fb5667 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 = xlsclients AM_CFLAGS = $(CWARNFLAGS) $(XLSCLIENTS_CFLAGS) @@ -27,24 +28,8 @@ xlsclients_LDADD = $(XLSCLIENTS_LIBS) $(LIBOBJS) xlsclients_SOURCES = \ xlsclients.c -appman_PRE = \ - xlsclients.man - - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) +EXTRA_DIST = strnlen.h 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 @@ -55,5 +40,3 @@ ChangeLog: $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL - -EXTRA_DIST += strnlen.h diff --git a/configure.ac b/configure.ac index 3d7410f..39204e8 100644 --- a/configure.ac +++ b/configure.ac @@ -47,4 +47,7 @@ XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XLSCLIENTS, xcb xcb-atom) -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..0837dba --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xlsclients.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/xlsclients.man b/man/xlsclients.man new file mode 100644 index 0000000..552907f --- /dev/null +++ b/man/xlsclients.man @@ -0,0 +1,62 @@ +.\" Copyright 1991, 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 XLSCLIENTS 1 __xorgversion__ +.SH NAME +xlsclients - list client applications running on a display +.SH SYNOPSIS +.B "xlsclients" +[-display \fIdisplayname\fP] [-a] [-l] [-m maxcmdlen] +.SH DESCRIPTION +.PP +.I Xlsclients +is a utility for listing information about the client applications +running on a display. It may be used to generate scripts representing +a snapshot of the user's current session. +.SH OPTIONS +.TP 8 +.B \-display \fIdisplayname\fP +This option specifies the X server to contact. +.TP 8 +.B \-a +This option indicates that clients on all screens should be listed. By +default, only those clients on the default screen are listed. +.TP 8 +.B \-l +List in long format, giving the window name, icon name, +and class hints in addition to the machine name and command string shown in +the default format. +.TP 8 +.B \-m \fImaxcmdlen\fP +This option specifies the maximum number of characters in a command to +print out. The default is 10000. +.SH ENVIRONMENT +.PP +.TP 8 +.B DISPLAY +To get the default host, display number, and screen. +.SH "SEE ALSO" +X(__miscmansuffix__), xwininfo(__appmansuffix__), xprop(__appmansuffix__) +.SH AUTHOR +Jim Fulton, MIT X Consortium diff --git a/xlsclients.man b/xlsclients.man deleted file mode 100644 index 552907f..0000000 --- a/xlsclients.man +++ /dev/null @@ -1,62 +0,0 @@ -.\" Copyright 1991, 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 XLSCLIENTS 1 __xorgversion__ -.SH NAME -xlsclients - list client applications running on a display -.SH SYNOPSIS -.B "xlsclients" -[-display \fIdisplayname\fP] [-a] [-l] [-m maxcmdlen] -.SH DESCRIPTION -.PP -.I Xlsclients -is a utility for listing information about the client applications -running on a display. It may be used to generate scripts representing -a snapshot of the user's current session. -.SH OPTIONS -.TP 8 -.B \-display \fIdisplayname\fP -This option specifies the X server to contact. -.TP 8 -.B \-a -This option indicates that clients on all screens should be listed. By -default, only those clients on the default screen are listed. -.TP 8 -.B \-l -List in long format, giving the window name, icon name, -and class hints in addition to the machine name and command string shown in -the default format. -.TP 8 -.B \-m \fImaxcmdlen\fP -This option specifies the maximum number of characters in a command to -print out. The default is 10000. -.SH ENVIRONMENT -.PP -.TP 8 -.B DISPLAY -To get the default host, display number, and screen. -.SH "SEE ALSO" -X(__miscmansuffix__), xwininfo(__appmansuffix__), xprop(__appmansuffix__) -.SH AUTHOR -Jim Fulton, MIT X Consortium -- cgit v1.2.3