aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/kdrive/ephyr
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-19 17:29:52 +0000
committermarha <marha@users.sourceforge.net>2011-01-19 17:29:52 +0000
commita13b75f056f9f9efcf6ecb8610b40ddbbb2bbb69 (patch)
tree778ce0682518f7a0615ce5585410f3aaecb14421 /xorg-server/hw/kdrive/ephyr
parent6e3cfc5bc8ca969856e4d56dec01870df709d75a (diff)
downloadvcxsrv-a13b75f056f9f9efcf6ecb8610b40ddbbb2bbb69.tar.gz
vcxsrv-a13b75f056f9f9efcf6ecb8610b40ddbbb2bbb69.tar.bz2
vcxsrv-a13b75f056f9f9efcf6ecb8610b40ddbbb2bbb69.zip
xserver pixman mesa git update 19 jan 2011
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr')
-rw-r--r--xorg-server/hw/kdrive/ephyr/Makefile.am18
-rw-r--r--xorg-server/hw/kdrive/ephyr/man/Makefile.am2
-rw-r--r--xorg-server/hw/kdrive/ephyr/man/Xephyr.man (renamed from xorg-server/hw/kdrive/ephyr/Xephyr.man.pre)8
3 files changed, 8 insertions, 20 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/Makefile.am b/xorg-server/hw/kdrive/ephyr/Makefile.am
index 8646703ad..9d9b64ee5 100644
--- a/xorg-server/hw/kdrive/ephyr/Makefile.am
+++ b/xorg-server/hw/kdrive/ephyr/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = man
+
INCLUDES = \
@KDRIVE_INCS@ \
@KDRIVE_CFLAGS@ \
@@ -83,20 +85,6 @@ Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
relink:
$(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS)
-MAN_SRCS = Xephyr.man.pre
-
-appmandir = $(APP_MAN_DIR)
-appman_DATA = Xephyr.$(APP_MAN_SUFFIX)
-
-Xephyr.$(APP_MAN_SUFFIX): Xephyr.man
- -$(AM_V_at)rm -f Xephyr.$(APP_MAN_SUFFIX)
- $(AM_V_at)$(LN_S) Xephyr.man Xephyr.$(APP_MAN_SUFFIX)
-
-include $(top_srcdir)/cpprules.in
-
-CLEANFILES = $(appman_DATA) Xephyr.man
-
EXTRA_DIST = \
$(HOSTVIDEO_SRCS) \
- $(HOSTDRI_SRCS) \
- $(MAN_SRCS)
+ $(HOSTDRI_SRCS)
diff --git a/xorg-server/hw/kdrive/ephyr/man/Makefile.am b/xorg-server/hw/kdrive/ephyr/man/Makefile.am
new file mode 100644
index 000000000..e8a372143
--- /dev/null
+++ b/xorg-server/hw/kdrive/ephyr/man/Makefile.am
@@ -0,0 +1,2 @@
+include $(top_srcdir)/manpages.am
+appman_PRE = Xephyr.man
diff --git a/xorg-server/hw/kdrive/ephyr/Xephyr.man.pre b/xorg-server/hw/kdrive/ephyr/man/Xephyr.man
index eb80b96b0..8e7bfd550 100644
--- a/xorg-server/hw/kdrive/ephyr/Xephyr.man.pre
+++ b/xorg-server/hw/kdrive/ephyr/man/Xephyr.man
@@ -46,9 +46,9 @@ sets the screen size.
.BI -parent " id"
uses exiting window
.I id .
-If a
-.BI -screen
-argument follows a
+If a
+.BI -screen
+argument follows a
.BI -parent
argument, this screen is embedded into the given window.
.TP 8
@@ -85,5 +85,3 @@ Mouse button 5 probably won't work.
X(__miscmansuffix__), Xserver(__appmansuffix__)
.SH AUTHOR
Matthew Allum <mallum@o-hand.com> 2004
-
-