aboutsummaryrefslogtreecommitdiff
path: root/libXext
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-08-07 14:16:42 +0000
committermarha <marha@users.sourceforge.net>2010-08-07 14:16:42 +0000
commit4e3f3e7b8cc2c617187bdf23a9948bfd5121074e (patch)
treeddd603e7fd5151ae250b7fb63c9e84eebc79814e /libXext
parent6849d83857b4e470a44ad8b6aa5cfb283fd64c89 (diff)
downloadvcxsrv-4e3f3e7b8cc2c617187bdf23a9948bfd5121074e.tar.gz
vcxsrv-4e3f3e7b8cc2c617187bdf23a9948bfd5121074e.tar.bz2
vcxsrv-4e3f3e7b8cc2c617187bdf23a9948bfd5121074e.zip
libXext xserver libX11 libXdmcp libxcb git update 7/8/2010
Diffstat (limited to 'libXext')
-rw-r--r--libXext/configure.ac3
-rw-r--r--libXext/man/Makefile.am187
2 files changed, 76 insertions, 114 deletions
diff --git a/libXext/configure.ac b/libXext/configure.ac
index d095ff08e..b3b60e869 100644
--- a/libXext/configure.ac
+++ b/libXext/configure.ac
@@ -51,9 +51,6 @@ AC_HEADER_STDC
XORG_CHECK_MALLOC_ZERO
-# Man page processing requirements
-XORG_PROG_RAWCPP
-
dnl Allow checking code with lint, sparse, etc.
XORG_WITH_LINT
XORG_LINT_LIBRARY([Xext])
diff --git a/libXext/man/Makefile.am b/libXext/man/Makefile.am
index f3447bda3..0b4288882 100644
--- a/libXext/man/Makefile.am
+++ b/libXext/man/Makefile.am
@@ -1,111 +1,76 @@
-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 \
- 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@)
-
-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) > $@
-
-# Rules for generating files using the C pre-processor
-# (Replaces CppFileTarget from Imake)
-
-SED = sed
-
-SUFFIXES = .$(LIB_MAN_SUFFIX) .man
-
-# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
-# to cpp, because that trick does not work on all ANSI C preprocessors.
-# Delete line numbers from the cpp output (-P is not portable, I guess).
-# Allow XCOMM to be preceded by whitespace and provide a means of generating
-# output lines with trailing backslashes.
-# Allow XHASH to always be substituted, even in cases where XCOMM isn't.
-
-CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
- -e '/^\#line *[0-9][0-9]* *.*$$/d' \
- -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \
- -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
- -e '/^[ ]*XHASH/s/XHASH/\#/' \
- -e '/\@\@$$/s/\@\@$$/\\/'
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
- XSERVERNAME = Xorg
-
-MANDEFS = \
- -D__vendorversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
- -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" \
- -D__appmansuffix__=$(APP_MAN_SUFFIX) \
- -D__filemansuffix__=$(FILE_MAN_SUFFIX) \
- -D__libmansuffix__=$(LIB_MAN_SUFFIX) \
- -D__miscmansuffix__=$(MISC_MAN_SUFFIX) \
- -D__drivermansuffix__=$(DRIVER_MAN_SUFFIX) \
- -D__adminmansuffix__=$(ADMIN_MAN_SUFFIX) \
- -D__projectroot__=$(prefix)
-
-.man.$(LIB_MAN_SUFFIX):
- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
-
+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 \
+ 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@)
+
+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
+.man.$(LIB_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@