svn merge ^/branches/released .

3 files changed, 42 insertions, 57 deletions

diff --git a/xorg-server/hw/vfb/Makefile.am b/xorg-server/hw/vfb/Makefile.am
index f7a8c24af..ed46dbbc1 100644
--- a/xorg-server/hw/vfb/Makefile.am
+++ b/xorg-server/hw/vfb/Makefile.am
@@ -1,51 +1,34 @@
-bin_PROGRAMS = Xvfb

-noinst_LIBRARIES = libfbcmap.a

-

-AM_CFLAGS = -DHAVE_DIX_CONFIG_H \

-            -DNO_HW_ONLY_EXTS \

-            -DNO_MODULE_EXTS \

-            $(XVFBMODULES_CFLAGS) \

-	    $(DIX_CFLAGS)

-

-SRCS =	InitInput.c \

-	InitOutput.c \

-	$(top_srcdir)/Xext/dpmsstubs.c \

-	$(top_srcdir)/Xi/stubs.c \

-	$(top_srcdir)/mi/miinitext.c

-

-libfbcmap_a_CFLAGS = $(AM_CFLAGS)

-libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap_mi.c

-

-Xvfb_SOURCES = $(SRCS)

-

-XVFB_LIBS = \

-        @XVFB_LIBS@ \

-	libfbcmap.a \

-	$(MAIN_LIB) \

-	$(XSERVER_LIBS)

-

-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)

+SUBDIRS = man
+
+bin_PROGRAMS = Xvfb
+noinst_LIBRARIES = libfbcmap.a
+
+AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
+            -DNO_HW_ONLY_EXTS \
+            -DNO_MODULE_EXTS \
+            $(XVFBMODULES_CFLAGS) \
+	    $(DIX_CFLAGS)
+
+SRCS =	InitInput.c \
+	InitOutput.c \
+	$(top_srcdir)/Xext/dpmsstubs.c \
+	$(top_srcdir)/Xi/stubs.c \
+	$(top_srcdir)/mi/miinitext.c
+
+libfbcmap_a_CFLAGS = $(AM_CFLAGS)
+libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap_mi.c
+
+Xvfb_SOURCES = $(SRCS)
+
+XVFB_LIBS = \
+        @XVFB_LIBS@ \
+	libfbcmap.a \
+	$(MAIN_LIB) \
+	$(XSERVER_LIBS)
+
+Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS)
+Xvfb_DEPENDENCIES = $(XVFB_LIBS)
+Xvfb_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
+
+relink:
+	$(AM_V_at)rm -f Xvfb$(EXEEXT) && $(MAKE) Xvfb$(EXEEXT)
diff --git a/xorg-server/hw/vfb/man/Makefile.am b/xorg-server/hw/vfb/man/Makefile.am
new file mode 100644
index 000000000..93941882a
--- /dev/null
+++ b/xorg-server/hw/vfb/man/Makefile.am
@@ -0,0 +1,2 @@
+include $(top_srcdir)/manpages.am
+appman_PRE = Xvfb.man
diff --git a/xorg-server/hw/vfb/Xvfb.man.pre b/xorg-server/hw/vfb/man/Xvfb.man
index 569afe175..95b4dd4c1 100644
--- a/xorg-server/hw/vfb/Xvfb.man.pre
+++ b/xorg-server/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