From 7ebdc6c2ed2917dd48687aa16c6909186a575e2d 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 | 17 +-------- configure.ac | 5 ++- man/Makefile.am | 12 ++++++ man/xkbprint.man | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ xkbprint.man | 113 ------------------------------------------------------- 5 files changed, 130 insertions(+), 130 deletions(-) create mode 100644 man/Makefile.am create mode 100644 man/xkbprint.man delete mode 100644 xkbprint.man diff --git a/Makefile.am b/Makefile.am index 9ab9834..c60eeb4 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 = xkbprint AM_CFLAGS = $(CWARNFLAGS) $(XKBPRINT_CFLAGS) @@ -32,23 +33,7 @@ xkbprint_SOURCES = \ xkbprint.c \ xkbprint.h -appman_PRE = \ - xkbprint.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 811ab80..4723982 100644 --- a/configure.ac +++ b/configure.ac @@ -41,4 +41,7 @@ XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XKBPRINT, xkbfile x11) -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..3555706 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xkbprint.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/xkbprint.man b/man/xkbprint.man new file mode 100644 index 0000000..97fe5c9 --- /dev/null +++ b/man/xkbprint.man @@ -0,0 +1,113 @@ +.\" $Xorg: xkbprint.man,v 1.3 2000/08/17 19:54:50 cpqbld Exp $ +.\" +.\" $XFree86: xc/programs/xkbprint/xkbprint.man,v 1.7 2001/01/27 18:21:16 dawes Exp $ +.\" +.TH XKBPRINT 1 __xorgversion__ +.SH NAME +xkbprint \- print an XKB keyboard description +.SH SYNOPSIS +.B xkbprint +[options] source [ output_file ] +.SH DESCRIPTION +.PP +The +.I xkbprint +command generates a printable or encapsulated PostScript description of the +XKB keyboard description specified by \fIsource\fP. The \fIsource\fP can be +any compiled keymap (.xkm) file that includes a geometry description or an +X display specification. If an \fIoutput_file\fP is specified, xkbprint +writes to it. If no output file is specified, xkbprint creates replaces +the extension of the source file with \fI.ps\fP or \fI.eps\fP depending +on the requested format. If the source is a non-local X display (e.g.:0), +xkbprint appends the appropriate prefix to the display specification, +replacing the colon with a dash. For a local display, xkprint uses +server-\fIn\fP where \fIn\fP is the number of the display. +.SH OPTIONS +.TP 8 +.B \-?, -help +Prints a usage message. +.TP 8 +.B \-color +Print using the colors specified in the geometry file; by default, xkbprint +prints a black-and-white image of the keyboard. +.TP 8 +.B \-dflts +Attempt to compute default names for any missing components, such as keys. +.TP 8 +.B \-diffs +Show symbols only where they are explicitly bound. +.TP 8 +.B \-eps +Generate an encapsulated PostScript file. +.TP 8 +.B \-fit +Fit the keyboard image on the page (default). +.TP 8 +.B \-full +Print the keyboard at full size. +.TP 8 +.B \-grid\ \fIres\fP +Print a grid with \fIres\fPmm resolution over the keyboard. +.TP 8 +.B \-if\ \fIfontName\fP +Specifies an internal PostScript type 1 font to dump to the specified +output file or to \fIfontName\fP.pfa, if no output file is specified. +No keyboard description is printed if an internal font is dumped. +.TP 8 +.B \-label\ \fItype\fP +Specifies the labels to be printed on keys; legal types are: \fInone\fP, +\fIname\fP,\fIcode\fP,\fIsymbols\fP. +.TP 8 +.B \-lc\ \fI\fP +Specifies a locale in which KeySyms should be resolved. +.TP 8 +.B \-level1 +Generate level 1 PostScript. +.TP 8 +.B \-level2 +Generate level 2 PostScript. +.TP 8 +.B \-lg\ \fIgroup\fP +Print symbols in keyboard groups starting from \fIgroup\fP. +.TP 8 +.B \-ll\ \fIlevel\fP +Print symbols starting from shift level \fIlevel\fP. +.TP 8 +.B \-mono +Generate black-and-white image of keyboard (default). +.TP 8 +.B \-n\ \fInum\fP +Print \fInum\fP copies. +.TP 8 +.B \-nkg\ \fInum\fP +Print the symbols in \fInum\fP keyboard groups. +.TP 8 +.B \-npk\ \fInum\fP +Number of keyboard images to print on each page; for EPS files, this +specifies the total number of keyboard images to print. +.TP 8 +.B \-o\ \fIfile\fP +Write output to \fIfile\fP. +.TP 8 +.B \-R\fIdirectory\fP +Use \fIdirectory\fP as the root directory; all path names are interpreted +relative to \fIdirectory\fP. +.TP 8 +.B -pict \fIwhich\fP +Controls use of pictographs instead of keysym names where available. +\fIwhich\fP can be any of \fIall\fP, \fInone\fP, or \fIcommon\fP(default). +.TP 8 +.B -synch +Forces synchronization for X requests. +.TP 8 +.B -w\ \fIlevel\fP +Sets warning level (0 for no warning, 10 for all warnings). +.SH "SEE ALSO" +X(__miscmansuffix__),xkbcomp(__appmansuffix__) +.SH COPYRIGHT +Copyright 1995, Silicon Graphics Computer Systems +Copyright 1995, 1998 The Open Group +.br +See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions. +.SH AUTHOR +Erik Fortune, Silicon Graphics diff --git a/xkbprint.man b/xkbprint.man deleted file mode 100644 index 97fe5c9..0000000 --- a/xkbprint.man +++ /dev/null @@ -1,113 +0,0 @@ -.\" $Xorg: xkbprint.man,v 1.3 2000/08/17 19:54:50 cpqbld Exp $ -.\" -.\" $XFree86: xc/programs/xkbprint/xkbprint.man,v 1.7 2001/01/27 18:21:16 dawes Exp $ -.\" -.TH XKBPRINT 1 __xorgversion__ -.SH NAME -xkbprint \- print an XKB keyboard description -.SH SYNOPSIS -.B xkbprint -[options] source [ output_file ] -.SH DESCRIPTION -.PP -The -.I xkbprint -command generates a printable or encapsulated PostScript description of the -XKB keyboard description specified by \fIsource\fP. The \fIsource\fP can be -any compiled keymap (.xkm) file that includes a geometry description or an -X display specification. If an \fIoutput_file\fP is specified, xkbprint -writes to it. If no output file is specified, xkbprint creates replaces -the extension of the source file with \fI.ps\fP or \fI.eps\fP depending -on the requested format. If the source is a non-local X display (e.g.:0), -xkbprint appends the appropriate prefix to the display specification, -replacing the colon with a dash. For a local display, xkprint uses -server-\fIn\fP where \fIn\fP is the number of the display. -.SH OPTIONS -.TP 8 -.B \-?, -help -Prints a usage message. -.TP 8 -.B \-color -Print using the colors specified in the geometry file; by default, xkbprint -prints a black-and-white image of the keyboard. -.TP 8 -.B \-dflts -Attempt to compute default names for any missing components, such as keys. -.TP 8 -.B \-diffs -Show symbols only where they are explicitly bound. -.TP 8 -.B \-eps -Generate an encapsulated PostScript file. -.TP 8 -.B \-fit -Fit the keyboard image on the page (default). -.TP 8 -.B \-full -Print the keyboard at full size. -.TP 8 -.B \-grid\ \fIres\fP -Print a grid with \fIres\fPmm resolution over the keyboard. -.TP 8 -.B \-if\ \fIfontName\fP -Specifies an internal PostScript type 1 font to dump to the specified -output file or to \fIfontName\fP.pfa, if no output file is specified. -No keyboard description is printed if an internal font is dumped. -.TP 8 -.B \-label\ \fItype\fP -Specifies the labels to be printed on keys; legal types are: \fInone\fP, -\fIname\fP,\fIcode\fP,\fIsymbols\fP. -.TP 8 -.B \-lc\ \fI\fP -Specifies a locale in which KeySyms should be resolved. -.TP 8 -.B \-level1 -Generate level 1 PostScript. -.TP 8 -.B \-level2 -Generate level 2 PostScript. -.TP 8 -.B \-lg\ \fIgroup\fP -Print symbols in keyboard groups starting from \fIgroup\fP. -.TP 8 -.B \-ll\ \fIlevel\fP -Print symbols starting from shift level \fIlevel\fP. -.TP 8 -.B \-mono -Generate black-and-white image of keyboard (default). -.TP 8 -.B \-n\ \fInum\fP -Print \fInum\fP copies. -.TP 8 -.B \-nkg\ \fInum\fP -Print the symbols in \fInum\fP keyboard groups. -.TP 8 -.B \-npk\ \fInum\fP -Number of keyboard images to print on each page; for EPS files, this -specifies the total number of keyboard images to print. -.TP 8 -.B \-o\ \fIfile\fP -Write output to \fIfile\fP. -.TP 8 -.B \-R\fIdirectory\fP -Use \fIdirectory\fP as the root directory; all path names are interpreted -relative to \fIdirectory\fP. -.TP 8 -.B -pict \fIwhich\fP -Controls use of pictographs instead of keysym names where available. -\fIwhich\fP can be any of \fIall\fP, \fInone\fP, or \fIcommon\fP(default). -.TP 8 -.B -synch -Forces synchronization for X requests. -.TP 8 -.B -w\ \fIlevel\fP -Sets warning level (0 for no warning, 10 for all warnings). -.SH "SEE ALSO" -X(__miscmansuffix__),xkbcomp(__appmansuffix__) -.SH COPYRIGHT -Copyright 1995, Silicon Graphics Computer Systems -Copyright 1995, 1998 The Open Group -.br -See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions. -.SH AUTHOR -Erik Fortune, Silicon Graphics -- cgit v1.2.3