svn merge ^/branches/released .

36 files changed, 108 insertions, 62 deletions

diff --git a/libXext/man/Makefile.am b/libXext/man/Makefile.am
index 0b4288882..0d7c1bba5 100644
--- a/libXext/man/Makefile.am
+++ b/libXext/man/Makefile.am
@@ -1,74 +1,85 @@
 libmandir = $(LIB_MAN_DIR)

 

-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)

-

-libman_PRE = \

-	DBE.man \

-	DPMSCapable.man \

-	DPMSDisable.man \

-	DPMSEnable.man \

-	DPMSForceLevel.man \

-	DPMSGetTimeouts.man \

-	DPMSGetVersion.man \

-	DPMSInfo.man \

-	DPMSQueryExtension.man \

-	DPMSSetTimeouts.man \

-	XShape.man \

-	XShm.man \

-	XcupGetReservedColormapEntries.man \

-	XcupQueryVersion.man \

-	XcupStoreColors.man \

-	XdbeAllocateBackBufferName.man \

-	XdbeBeginIdiom.man \

-	XdbeDeallocateBackBufferName.man \

-	XdbeEndIdiom.man \

-	XdbeFreeVisualInfo.man \

-	XdbeGetBackBufferAttributes.man \

-	XdbeGetVisualInfo.man \

-	XdbeQueryExtension.man \

-	XdbeSwapBuffers.man \

-	Xevi.man \

+libman_PRE =					\

+	$(all_shadows:=.man)			\

+	DBE.man					\

+	DPMSCapable.man				\

+	DPMSDisable.man				\

+	DPMSEnable.man				\

+	DPMSForceLevel.man			\

+	DPMSGetTimeouts.man			\

+	DPMSGetVersion.man			\

+	DPMSInfo.man				\

+	DPMSQueryExtension.man			\

+	DPMSSetTimeouts.man			\

+	XShape.man				\

+	XShm.man				\

+	XcupGetReservedColormapEntries.man	\

+	XcupQueryVersion.man			\

+	XcupStoreColors.man			\

+	XdbeAllocateBackBufferName.man		\

+	XdbeBeginIdiom.man			\

+	XdbeDeallocateBackBufferName.man	\

+	XdbeEndIdiom.man			\

+	XdbeFreeVisualInfo.man			\

+	XdbeGetBackBufferAttributes.man		\

+	XdbeGetVisualInfo.man			\

+	XdbeQueryExtension.man			\

+	XdbeSwapBuffers.man			\

+	Xevi.man				\

 	Xmbuf.man

 

-XShape_man_aliases = XShapeQueryExtension XShapeQueryVersion XShapeCombineRegion XShapeCombineRectangles XShapeCombineMask XShapeCombineShape XShapeOffsetShape XShapeQueryExtents XShapeSelectInput XShapeInputSelected XShapeGetRectangles

-

-XShm_man_aliases = XShmQueryExtension XShmQueryVersion XShmPixmapFormat XShmAttach XShmDetach XShmCreateImage XShmPutImage XShmGetImage XShmCreatePixmap XShmGetEventBase

-

-Xmbuf_man_aliases = XmbufQueryExtension XmbufGetVersion XmbufCreateBuffers XmbufDestroyBuffers XmbufDisplayBuffers XmbufGetWindowAttributes XmbufChangeWindowAttributes XmbufGetBufferAttributes XmbufChangeBufferAttributes XmbufGetScreenInfo XmbufCreateStereoWindow

-

-Xevi_man_aliases = XeviQueryVersion XeviGetVisualInfo XeviQueryExtension

-

-all_aliases = $(XShape_man_aliases) $(XShm_man_aliases) $(Xmbuf_man_aliases) $(Xevi_man_aliases)

-

-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \

-	      $(all_aliases:=.@LIB_MAN_SUFFIX@)

+XShape_shadows =				\

+	XShapeQueryExtension			\

+	XShapeQueryVersion			\

+	XShapeCombineRegion			\

+	XShapeCombineRectangles			\

+	XShapeCombineMask			\

+	XShapeCombineShape			\

+	XShapeOffsetShape			\

+	XShapeQueryExtents			\

+	XShapeSelectInput			\

+	XShapeInputSelected			\

+	XShapeGetRectangles

+

+XShm_shadows =					\

+	XShmQueryExtension			\

+	XShmQueryVersion			\

+	XShmPixmapFormat			\

+	XShmAttach				\

+	XShmDetach				\

+	XShmCreateImage				\

+	XShmPutImage				\

+	XShmGetImage				\

+	XShmCreatePixmap			\

+	XShmGetEventBase

+

+Xmbuf_shadows =					\

+	XmbufQueryExtension			\

+	XmbufGetVersion				\

+	XmbufCreateBuffers			\

+	XmbufDestroyBuffers			\

+	XmbufDisplayBuffers			\

+	XmbufGetWindowAttributes		\

+	XmbufChangeWindowAttributes		\

+	XmbufGetBufferAttributes		\

+	XmbufChangeBufferAttributes		\

+	XmbufGetScreenInfo			\

+	XmbufCreateStereoWindow

+

+Xevi_shadows =					\

+	XeviQueryVersion			\

+	XeviGetVisualInfo			\

+	XeviQueryExtension

+

+all_shadows = $(XShape_shadows) $(XShm_shadows) $(Xmbuf_shadows) $(Xevi_shadows)

+

+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)

 

 EXTRA_DIST  = $(libman_PRE)

 

 CLEANFILES  = $(libman_DATA)

 

-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)

-

-XShape_shadowmen = $(XShape_man_aliases:=.@LIB_MAN_SUFFIX@)

-

-$(XShape_shadowmen):

-	$(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XShape.$(LIB_MAN_SUFFIX) > $@

-

-XShm_shadowmen = $(XShm_man_aliases:=.@LIB_MAN_SUFFIX@)

-

-$(XShm_shadowmen):

-	$(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XShm.$(LIB_MAN_SUFFIX) > $@

-

-Xmbuf_shadowmen = $(Xmbuf_man_aliases:=.@LIB_MAN_SUFFIX@)

-

-$(Xmbuf_shadowmen):

-	$(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xmbuf.$(LIB_MAN_SUFFIX) > $@

-

-Xevi_shadowmen = $(Xevi_man_aliases:=.@LIB_MAN_SUFFIX@)

-

-$(Xevi_shadowmen):

-	$(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/Xevi.$(LIB_MAN_SUFFIX) > $@

-

 SUFFIXES = .$(LIB_MAN_SUFFIX) .man

 

 # String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure

diff --git a/libXext/man/XShapeCombineMask.man b/libXext/man/XShapeCombineMask.man
new file mode 100644
index 000000000..033600bd9
--- /dev/null
+++ b/libXext/man/XShapeCombineMask.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShape.__libmansuffix__

diff --git a/libXext/man/XShapeCombineRectangles.man b/libXext/man/XShapeCombineRectangles.man
new file mode 100644
index 000000000..033600bd9
--- /dev/null
+++ b/libXext/man/XShapeCombineRectangles.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShape.__libmansuffix__

diff --git a/libXext/man/XShapeCombineRegion.man b/libXext/man/XShapeCombineRegion.man
new file mode 100644
index 000000000..033600bd9
--- /dev/null
+++ b/libXext/man/XShapeCombineRegion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShape.__libmansuffix__

diff --git a/libXext/man/XShapeCombineShape.man b/libXext/man/XShapeCombineShape.man
new file mode 100644
index 000000000..033600bd9
--- /dev/null
+++ b/libXext/man/XShapeCombineShape.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShape.__libmansuffix__

diff --git a/libXext/man/XShapeGetRectangles.man b/libXext/man/XShapeGetRectangles.man
new file mode 100644
index 000000000..033600bd9
--- /dev/null
+++ b/libXext/man/XShapeGetRectangles.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShape.__libmansuffix__

diff --git a/libXext/man/XShapeInputSelected.man b/libXext/man/XShapeInputSelected.man
new file mode 100644
index 000000000..033600bd9
--- /dev/null
+++ b/libXext/man/XShapeInputSelected.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShape.__libmansuffix__

diff --git a/libXext/man/XShapeOffsetShape.man b/libXext/man/XShapeOffsetShape.man
new file mode 100644
index 000000000..033600bd9
--- /dev/null
+++ b/libXext/man/XShapeOffsetShape.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShape.__libmansuffix__

diff --git a/libXext/man/XShapeQueryExtension.man b/libXext/man/XShapeQueryExtension.man
new file mode 100644
index 000000000..033600bd9
--- /dev/null
+++ b/libXext/man/XShapeQueryExtension.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShape.__libmansuffix__

diff --git a/libXext/man/XShapeQueryExtents.man b/libXext/man/XShapeQueryExtents.man
new file mode 100644
index 000000000..033600bd9
--- /dev/null
+++ b/libXext/man/XShapeQueryExtents.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShape.__libmansuffix__

diff --git a/libXext/man/XShapeQueryVersion.man b/libXext/man/XShapeQueryVersion.man
new file mode 100644
index 000000000..033600bd9
--- /dev/null
+++ b/libXext/man/XShapeQueryVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShape.__libmansuffix__

diff --git a/libXext/man/XShapeSelectInput.man b/libXext/man/XShapeSelectInput.man
new file mode 100644
index 000000000..033600bd9
--- /dev/null
+++ b/libXext/man/XShapeSelectInput.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShape.__libmansuffix__

diff --git a/libXext/man/XShmAttach.man b/libXext/man/XShmAttach.man
new file mode 100644
index 000000000..d2725373c
--- /dev/null
+++ b/libXext/man/XShmAttach.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShm.__libmansuffix__

diff --git a/libXext/man/XShmCreateImage.man b/libXext/man/XShmCreateImage.man
new file mode 100644
index 000000000..d2725373c
--- /dev/null
+++ b/libXext/man/XShmCreateImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShm.__libmansuffix__

diff --git a/libXext/man/XShmCreatePixmap.man b/libXext/man/XShmCreatePixmap.man
new file mode 100644
index 000000000..d2725373c
--- /dev/null
+++ b/libXext/man/XShmCreatePixmap.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShm.__libmansuffix__

diff --git a/libXext/man/XShmDetach.man b/libXext/man/XShmDetach.man
new file mode 100644
index 000000000..d2725373c
--- /dev/null
+++ b/libXext/man/XShmDetach.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShm.__libmansuffix__

diff --git a/libXext/man/XShmGetEventBase.man b/libXext/man/XShmGetEventBase.man
new file mode 100644
index 000000000..d2725373c
--- /dev/null
+++ b/libXext/man/XShmGetEventBase.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShm.__libmansuffix__

diff --git a/libXext/man/XShmGetImage.man b/libXext/man/XShmGetImage.man
new file mode 100644
index 000000000..d2725373c
--- /dev/null
+++ b/libXext/man/XShmGetImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShm.__libmansuffix__

diff --git a/libXext/man/XShmPixmapFormat.man b/libXext/man/XShmPixmapFormat.man
new file mode 100644
index 000000000..d2725373c
--- /dev/null
+++ b/libXext/man/XShmPixmapFormat.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShm.__libmansuffix__

diff --git a/libXext/man/XShmPutImage.man b/libXext/man/XShmPutImage.man
new file mode 100644
index 000000000..d2725373c
--- /dev/null
+++ b/libXext/man/XShmPutImage.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShm.__libmansuffix__

diff --git a/libXext/man/XShmQueryExtension.man b/libXext/man/XShmQueryExtension.man
new file mode 100644
index 000000000..d2725373c
--- /dev/null
+++ b/libXext/man/XShmQueryExtension.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShm.__libmansuffix__

diff --git a/libXext/man/XShmQueryVersion.man b/libXext/man/XShmQueryVersion.man
new file mode 100644
index 000000000..d2725373c
--- /dev/null
+++ b/libXext/man/XShmQueryVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/XShm.__libmansuffix__

diff --git a/libXext/man/XeviGetVisualInfo.man b/libXext/man/XeviGetVisualInfo.man
new file mode 100644
index 000000000..dae44c178
--- /dev/null
+++ b/libXext/man/XeviGetVisualInfo.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xevi.__libmansuffix__

diff --git a/libXext/man/XeviQueryExtension.man b/libXext/man/XeviQueryExtension.man
new file mode 100644
index 000000000..dae44c178
--- /dev/null
+++ b/libXext/man/XeviQueryExtension.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xevi.__libmansuffix__

diff --git a/libXext/man/XeviQueryVersion.man b/libXext/man/XeviQueryVersion.man
new file mode 100644
index 000000000..dae44c178
--- /dev/null
+++ b/libXext/man/XeviQueryVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xevi.__libmansuffix__

diff --git a/libXext/man/XmbufChangeBufferAttributes.man b/libXext/man/XmbufChangeBufferAttributes.man
new file mode 100644
index 000000000..2a25ca646
--- /dev/null
+++ b/libXext/man/XmbufChangeBufferAttributes.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xmbuf.__libmansuffix__

diff --git a/libXext/man/XmbufChangeWindowAttributes.man b/libXext/man/XmbufChangeWindowAttributes.man
new file mode 100644
index 000000000..2a25ca646
--- /dev/null
+++ b/libXext/man/XmbufChangeWindowAttributes.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xmbuf.__libmansuffix__

diff --git a/libXext/man/XmbufCreateBuffers.man b/libXext/man/XmbufCreateBuffers.man
new file mode 100644
index 000000000..2a25ca646
--- /dev/null
+++ b/libXext/man/XmbufCreateBuffers.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xmbuf.__libmansuffix__

diff --git a/libXext/man/XmbufCreateStereoWindow.man b/libXext/man/XmbufCreateStereoWindow.man
new file mode 100644
index 000000000..2a25ca646
--- /dev/null
+++ b/libXext/man/XmbufCreateStereoWindow.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xmbuf.__libmansuffix__

diff --git a/libXext/man/XmbufDestroyBuffers.man b/libXext/man/XmbufDestroyBuffers.man
new file mode 100644
index 000000000..2a25ca646
--- /dev/null
+++ b/libXext/man/XmbufDestroyBuffers.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xmbuf.__libmansuffix__

diff --git a/libXext/man/XmbufDisplayBuffers.man b/libXext/man/XmbufDisplayBuffers.man
new file mode 100644
index 000000000..2a25ca646
--- /dev/null
+++ b/libXext/man/XmbufDisplayBuffers.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xmbuf.__libmansuffix__

diff --git a/libXext/man/XmbufGetBufferAttributes.man b/libXext/man/XmbufGetBufferAttributes.man
new file mode 100644
index 000000000..2a25ca646
--- /dev/null
+++ b/libXext/man/XmbufGetBufferAttributes.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xmbuf.__libmansuffix__

diff --git a/libXext/man/XmbufGetScreenInfo.man b/libXext/man/XmbufGetScreenInfo.man
new file mode 100644
index 000000000..2a25ca646
--- /dev/null
+++ b/libXext/man/XmbufGetScreenInfo.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xmbuf.__libmansuffix__

diff --git a/libXext/man/XmbufGetVersion.man b/libXext/man/XmbufGetVersion.man
new file mode 100644
index 000000000..2a25ca646
--- /dev/null
+++ b/libXext/man/XmbufGetVersion.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xmbuf.__libmansuffix__

diff --git a/libXext/man/XmbufGetWindowAttributes.man b/libXext/man/XmbufGetWindowAttributes.man
new file mode 100644
index 000000000..2a25ca646
--- /dev/null
+++ b/libXext/man/XmbufGetWindowAttributes.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xmbuf.__libmansuffix__

diff --git a/libXext/man/XmbufQueryExtension.man b/libXext/man/XmbufQueryExtension.man
new file mode 100644
index 000000000..2a25ca646
--- /dev/null
+++ b/libXext/man/XmbufQueryExtension.man
@@ -0,0 +1 @@
+.so man__libmansuffix__/Xmbuf.__libmansuffix__