From 9240cffd659b1c13d66162200c6e384ea1cdbc44 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sun, 9 Jan 2011 20:27:51 -0500 Subject: [PATCH] Xvfb: build Xvfb man pages using XORG_MANPAGE_SECTIONS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Nothing requires the use of a C preprocessor Using standard file extensions (.man) means no need for .gitignore Use standard directory and makefile Fix trailing whitespaces Reviewed-by: Alan Coopersmith Reviewed-by: Rémi Cardona Signed-off-by: Gaetan Nadon Signed-off-by: Keith Packard --- configure.ac | 1 + hw/vfb/.gitignore | 2 -- hw/vfb/Makefile.am | 21 ++------------------- hw/vfb/man/Makefile.am | 10 ++++++++++ hw/vfb/{Xvfb.man.pre => man/Xvfb.man} | 12 ++++++------ 5 files changed, 19 insertions(+), 27 deletions(-) create mode 100644 hw/vfb/man/Makefile.am rename hw/vfb/{Xvfb.man.pre => man/Xvfb.man} (99%) diff --git a/configure.ac b/configure.ac index 81e5a8e00..32b7b5484 100644 --- a/configure.ac +++ b/configure.ac @@ -2242,6 +2242,7 @@ hw/dmx/input/Makefile hw/dmx/glxProxy/Makefile hw/dmx/Makefile hw/vfb/Makefile +hw/vfb/man/Makefile hw/xnest/Makefile hw/xnest/man/Makefile hw/xwin/Makefile diff --git a/hw/vfb/.gitignore b/hw/vfb/.gitignore index 55076f01d..c04754124 100644 --- a/hw/vfb/.gitignore +++ b/hw/vfb/.gitignore @@ -1,3 +1 @@ -# Add & Override for this directory and it's subdirectories Xvfb -Xvfb.man diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am index de5e1c5c9..ed46dbbc1 100644 --- a/hw/vfb/Makefile.am +++ b/hw/vfb/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = man + bin_PROGRAMS = Xvfb noinst_LIBRARIES = libfbcmap.a @@ -28,24 +30,5 @@ Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS) Xvfb_DEPENDENCIES = $(XVFB_LIBS) Xvfb_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -# Man page -include $(top_srcdir)/cpprules.in - -appmandir = $(APP_MAN_DIR) - -appman_PRE = Xvfb.man -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -BUILT_SOURCES = $(appman_PRE) -CLEANFILES = $(appman_PRE) $(appman_DATA) - -SUFFIXES += .$(APP_MAN_SUFFIX) .man - -.man.$(APP_MAN_SUFFIX): - -$(AM_V_at)rm -f $@ - $(AM_V_at)$(LN_S) $< $@ - -EXTRA_DIST = Xvfb.man.pre - relink: $(AM_V_at)rm -f Xvfb$(EXEEXT) && $(MAKE) Xvfb$(EXEEXT) diff --git a/hw/vfb/man/Makefile.am b/hw/vfb/man/Makefile.am new file mode 100644 index 000000000..5decaddb1 --- /dev/null +++ b/hw/vfb/man/Makefile.am @@ -0,0 +1,10 @@ +appmandir = $(APP_MAN_DIR) +appman_PRE = Xvfb.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/hw/vfb/Xvfb.man.pre b/hw/vfb/man/Xvfb.man similarity index 99% rename from hw/vfb/Xvfb.man.pre rename to hw/vfb/man/Xvfb.man index 569afe175..95b4dd4c1 100644 --- a/hw/vfb/Xvfb.man.pre +++ b/hw/vfb/man/Xvfb.man @@ -1,16 +1,16 @@ .\" $XdotOrg: xc/programs/Xserver/hw/vfb/Xvfb.man,v 1.3 2005/03/23 20:49:52 gisburn Exp $ .\" $Xorg: Xvfb.man,v 1.4 2001/02/09 02:04:45 xorgcvs Exp $ .\" Copyright 1993, 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. @@ -18,7 +18,7 @@ .\" 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 @@ -66,7 +66,7 @@ have values from 1 to 32. .B "\-fbdir \fIframebuffer-directory\fP" This option specifies the directory in which the memory mapped files containing the framebuffer memory should be created. -See FILES. +See FILES. This option only exists on machines that have the mmap and msync system calls. .TP 4 @@ -113,7 +113,7 @@ Xvfb -pixdepths 3 27 -fbdir /var/tmp The server will listen for connections as server number 0, will have the default screen configuration (one screen, 1280x1024x8), will also support pixmap -depths of 3 and 27, +depths of 3 and 27, and will use memory mapped files in /var/tmp for the framebuffer. .TP 8 xwud -in /var/tmp/Xvfb_screen0