diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-01-09 20:27:52 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-01-18 15:10:29 -0800 |
| commit | ac5ffef60e05eb05275913b133786709881e7e7e (patch) | |
| tree | 571494f8ed7669752e4d9a19571f20aba7257d5c | |
| parent | 9240cffd659b1c13d66162200c6e384ea1cdbc44 (diff) | |
Xephyr: build Xephyr man pages using XORG_MANPAGE_SECTIONS
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@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/.gitignore | 2 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/Makefile.am | 18 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/man/Makefile.am | 10 | ||||
| -rw-r--r-- | hw/kdrive/ephyr/man/Xephyr.man (renamed from hw/kdrive/ephyr/Xephyr.man.pre) | 8 |
5 files changed, 17 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index 32b7b5484..a482a730b 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 bfe7e08c2..4962d1ef0 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 8646703ad..9d9b64ee5 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 000000000..58f1cbd4a --- /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 index eb80b96b0..8e7bfd550 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@o-hand.com> 2004 - - |