[PATCH xserver 08/15] Xephyr: build Xephyr man pages using XORG_MANPAGE_SECTIONS
Gaetan Nadon
memsize at videotron.ca
Sun Jan 9 17:27:52 PST 2011
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 <alan.coopersmith at oracle.com>
Reviewed-by: Rémi Cardona <remi at gentoo.org>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
configure.ac | 1 +
hw/kdrive/ephyr/.gitignore | 2 --
hw/kdrive/ephyr/Makefile.am | 18 +++---------------
hw/kdrive/ephyr/man/Makefile.am | 10 ++++++++++
hw/kdrive/ephyr/{Xephyr.man.pre => man/Xephyr.man} | 8 +++-----
5 files changed, 17 insertions(+), 22 deletions(-)
create mode 100644 hw/kdrive/ephyr/man/Makefile.am
rename hw/kdrive/ephyr/{Xephyr.man.pre => man/Xephyr.man} (98%)
diff --git a/configure.ac b/configure.ac
index 32b7b54..a482a73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2257,6 +2257,7 @@ hw/xquartz/pbproxy/Makefile
hw/xquartz/xpr/Makefile
hw/kdrive/Makefile
hw/kdrive/ephyr/Makefile
+hw/kdrive/ephyr/man/Makefile
hw/kdrive/fake/Makefile
hw/kdrive/fbdev/Makefile
hw/kdrive/linux/Makefile
diff --git a/hw/kdrive/ephyr/.gitignore b/hw/kdrive/ephyr/.gitignore
index bfe7e08..4962d1e 100644
--- a/hw/kdrive/ephyr/.gitignore
+++ b/hw/kdrive/ephyr/.gitignore
@@ -1,3 +1 @@
-# Add & Override for this directory and it's subdirectories
Xephyr
-Xephyr.man
diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
index 8646703..9d9b64e 100644
--- a/hw/kdrive/ephyr/Makefile.am
+++ b/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/hw/kdrive/ephyr/man/Makefile.am b/hw/kdrive/ephyr/man/Makefile.am
new file mode 100644
index 0000000..58f1cbd
--- /dev/null
+++ b/hw/kdrive/ephyr/man/Makefile.am
@@ -0,0 +1,10 @@
+appmandir = $(APP_MAN_DIR)
+appman_PRE = Xephyr.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/kdrive/ephyr/Xephyr.man.pre b/hw/kdrive/ephyr/man/Xephyr.man
similarity index 98%
rename from hw/kdrive/ephyr/Xephyr.man.pre
rename to hw/kdrive/ephyr/man/Xephyr.man
index eb80b96..8e7bfd5 100644
--- a/hw/kdrive/ephyr/Xephyr.man.pre
+++ b/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 at o-hand.com> 2004
-
-
--
1.6.0.4
More information about the xorg-devel
mailing list