diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | hw/xfree86/exa/.gitignore | 2 | ||||
| -rw-r--r-- | hw/xfree86/exa/Makefile.am | 14 | ||||
| -rw-r--r-- | hw/xfree86/exa/man/Makefile.am | 11 | ||||
| -rw-r--r-- | hw/xfree86/exa/man/exa.man (renamed from hw/xfree86/exa/exa.man.pre) | 4 |
5 files changed, 16 insertions, 16 deletions
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 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. |