From 9bd9d550a0d6fb4fe3daacb604658de92e69d99c Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Sun, 9 Jan 2011 20:28:27 -0500
Subject: [PATCH] exa: build 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 <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>
---
 configure.ac                                |  1 +
 hw/xfree86/exa/.gitignore                   |  2 --
 hw/xfree86/exa/Makefile.am                  | 14 ++------------
 hw/xfree86/exa/man/Makefile.am              | 11 +++++++++++
 hw/xfree86/exa/{exa.man.pre => man/exa.man} |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 hw/xfree86/exa/.gitignore
 create mode 100644 hw/xfree86/exa/man/Makefile.am
 rename hw/xfree86/exa/{exa.man.pre => man/exa.man} (96%)

diff --git a/configure.ac b/configure.ac
index ffad0af6d..45756ed70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2213,6 +2213,7 @@ hw/xfree86/doc/sgml/Makefile
 hw/xfree86/dri/Makefile
 hw/xfree86/dri2/Makefile
 hw/xfree86/exa/Makefile
+hw/xfree86/exa/man/Makefile
 hw/xfree86/fbdevhw/Makefile
 hw/xfree86/fbdevhw/man/Makefile
 hw/xfree86/i2c/Makefile
diff --git a/hw/xfree86/exa/.gitignore b/hw/xfree86/exa/.gitignore
deleted file mode 100644
index d20a82fb5..000000000
--- a/hw/xfree86/exa/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-#		Add & Override for this directory and it's subdirectories
-exa.man
diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am
index da9b720d7..39f7a9057 100644
--- a/hw/xfree86/exa/Makefile.am
+++ b/hw/xfree86/exa/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = man
+
 module_LTLIBRARIES = libexa.la
 
 libexa_la_LDFLAGS = -avoid-version
@@ -14,15 +16,3 @@ libexa_la_SOURCES = \
 
 libexa_la_LIBADD = \
 	../../../exa/libexa.la
-
-include $(top_srcdir)/cpprules.in
-
-drivermandir = $(DRIVER_MAN_DIR)
-driverman_DATA = exa.$(DRIVER_MAN_SUFFIX)
-CLEANFILES = $(driverman_DATA) exa.man
-
-exa.$(DRIVER_MAN_SUFFIX): exa.man
-	-$(AM_V_at)rm -f exa.$(DRIVER_MAN_SUFFIX)
-	$(AM_V_at)$(LN_S) exa.man exa.$(DRIVER_MAN_SUFFIX)
-
-EXTRA_DIST = exa.man.pre
diff --git a/hw/xfree86/exa/man/Makefile.am b/hw/xfree86/exa/man/Makefile.am
new file mode 100644
index 000000000..db287db9b
--- /dev/null
+++ b/hw/xfree86/exa/man/Makefile.am
@@ -0,0 +1,11 @@
+drivermandir = $(DRIVER_MAN_DIR)
+driverman_PRE = exa.man
+driverman_DATA = $(driverman_PRE:man=$(DRIVER_MAN_SUFFIX))
+
+EXTRA_DIST = $(driverman_PRE)
+CLEANFILES = $(driverman_DATA)
+SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(DRIVER_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff --git a/hw/xfree86/exa/exa.man.pre b/hw/xfree86/exa/man/exa.man
similarity index 96%
rename from hw/xfree86/exa/exa.man.pre
rename to hw/xfree86/exa/man/exa.man
index 5c953e256..30d01824d 100644
--- a/hw/xfree86/exa/exa.man.pre
+++ b/hw/xfree86/exa/man/exa.man
@@ -7,7 +7,7 @@ exa \- new 2D acceleration architecture for X.Org
 .B EXA
 provides a simple API for video drivers to implement for 2D acceleration.  It
 is a module loaded by drivers, and is not intended to be loaded on its own.
-See your driver's manual page for how to enable 
+See your driver's manual page for how to enable
 .BR EXA .
 .PP
 The
@@ -25,7 +25,7 @@ the Render extension.  Not related to the Composite extension.  Default: No.
 Disables acceleration of uploading pixmap data to the framebuffer. Default: No.
 .TP
 .BI "Option \*qEXANoDownloadFromScreen\*q \*q" boolean \*q
-Disables acceleration of downloading of pixmap data from the framebuffer. 
+Disables acceleration of downloading of pixmap data from the framebuffer.
 .B NOTE:
 Not usable with drivers which rely on DownloadFromScreen succeeding.
 Default: No.