Update to libXt 1.0.9. No functional change.

1 files changed, 344 insertions, 588 deletions

diff --git a/lib/libXt/man/Makefile.in b/lib/libXt/man/Makefile.in
index 73999c7c1..c39c99836 100644
--- a/lib/libXt/man/Makefile.in
+++ b/lib/libXt/man/Makefile.in
@@ -39,7 +39,7 @@ host_triplet = @host@
 subdir = man
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
@@ -121,6 +121,7 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
+MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
 NMEDIT = @NMEDIT@
@@ -134,12 +135,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
-RAWCPP = @RAWCPP@
-RAWCPPFLAGS = @RAWCPPFLAGS@
-
-# Rules for generating files using the C pre-processor
-# (Replaces CppFileTarget from Imake)
-SED = sed
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRINGSABIOPTIONS = @STRINGSABIOPTIONS@
@@ -147,6 +143,7 @@ STRIP = @STRIP@
 VERSION = @VERSION@
 XFILESEARCHPATHDEFAULT = @XFILESEARCHPATHDEFAULT@
 XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
 XT_CFLAGS = @XT_CFLAGS@
 XT_LIBS = @XT_LIBS@
@@ -199,593 +196,489 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 libmandir = $(LIB_MAN_DIR)
-LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
 libman_PRE = \
-	XtAddActions.man \
-	XtAddCallback.man \
-	XtAddEventHandler.man \
-	XtAddExposureToRegion.man \
-	XtAddGrab.man \
-	XtAddInput.man \
-	XtAllocateGC.man \
-	XtAppAddActionHook.man \
-	XtAppAddActions.man \
-	XtAppAddBlockHook.man \
-	XtAppAddConverter.man \
-	XtAppAddInput.man \
-	XtAppAddSignal.man \
-	XtAppAddTimeOut.man \
-	XtAppAddWorkProc.man \
-	XtAppCreateShell.man \
-	XtAppError.man \
-	XtAppErrorMsg.man \
-	XtAppGetErrorDatabase.man \
-	XtAppGetSelectionTimeout.man \
-	XtAppInitialize.man \
-	XtAppLock.man \
-	XtAppNextEvent.man \
-	XtAppReleaseCacheRefs.man \
-	XtAppSetExitFlag.man \
-	XtAppSetFallbackResources.man \
-	XtAppSetTypeConverter.man \
-	XtBuildEventMask.man \
-	XtCallAcceptFocus.man \
-	XtCallActionProc.man \
-	XtCallCallbacks.man \
-	XtClass.man \
-	XtConfigureWidget.man \
-	XtConvert.man \
-	XtConvertAndStore.man \
-	XtCreateApplicationContext.man \
-	XtCreateApplicationShell.man \
-	XtCreatePopupShell.man \
-	XtCreateSelectionRequest.man \
-	XtCreateWidget.man \
-	XtCreateWindow.man \
-	XtDisplay.man \
-	XtDisplayInitialize.man \
-	XtDisplayStringConversionWarning.man \
-	XtDisplayToApplicationContext.man \
-	XtError.man \
-	XtErrorMsg.man \
-	XtFindFile.man \
-	XtGetActionKeysym.man \
-	XtGetActionList.man \
-	XtGetApplicationNameAndClass.man \
-	XtGetApplicationResources.man \
-	XtGetClassExtension.man \
-	XtGetDisplays.man \
-	XtGetErrorDatabase.man \
-	XtGetGC.man \
-	XtGetKeyboardFocusWidget.man \
-	XtGetKeysymTable.man \
-	XtGetResourceList.man \
-	XtGetSelectionParameters.man \
-	XtGetSelectionRequest.man \
-	XtGetSelectionTimeout.man \
-	XtGetSelectionValue.man \
-	XtGetSelectionValueIncremental.man \
-	XtGetSubresources.man \
-	XtGrabKey.man \
-	XtHooksOfDisplay.man \
-	XtInitialize.man \
-	XtInitializeWidgetClass.man \
-	XtInsertEventTypeHandler.man \
-	XtLastEventProcessed.man \
-	XtMakeGeometryRequest.man \
-	XtMalloc.man \
-	XtManageChildren.man \
-	XtMapWidget.man \
-	XtName.man \
-	XtNameToWidget.man \
-	XtNextEvent.man \
-	XtOffset.man \
-	XtOpenApplication.man \
-	XtOwnSelection.man \
-	XtParent.man \
-	XtParseAcceleratorTable.man \
-	XtParseTranslationTable.man \
-	XtPopdown.man \
-	XtPopup.man \
-	XtProcessLock.man \
-	XtQueryGeometry.man \
-	XtRealizeWidget.man \
-	XtRegisterDrawable.man \
-	XtRegisterGrabAction.man \
-	XtReservePropertyAtom.man \
-	XtResolvePathname.man \
-	XtSessionGetToken.man \
-	XtSetArg.man \
-	XtSetKeyTranslator.man \
-	XtSetKeyboardFocus.man \
-	XtSetLanguageProc.man \
-	XtSetMultiClickTime.man \
-	XtSetSelectionParameters.man \
-	XtSetSensitive.man \
-	XtSetValues.man \
-	XtSetWMColormapWindows.man \
-	XtStringConversionWarning.man \
-	XtToolkitThreadInitialize.man \
-	XtTranslateCoords.man \
+	$(all_shadows:=.man)			\
+	XtAddActions.man			\
+	XtAddCallback.man			\
+	XtAddEventHandler.man			\
+	XtAddExposureToRegion.man		\
+	XtAddGrab.man				\
+	XtAddInput.man				\
+	XtAllocateGC.man			\
+	XtAppAddActionHook.man			\
+	XtAppAddActions.man			\
+	XtAppAddBlockHook.man			\
+	XtAppAddConverter.man			\
+	XtAppAddInput.man			\
+	XtAppAddSignal.man			\
+	XtAppAddTimeOut.man			\
+	XtAppAddWorkProc.man			\
+	XtAppCreateShell.man			\
+	XtAppError.man				\
+	XtAppErrorMsg.man			\
+	XtAppGetErrorDatabase.man		\
+	XtAppGetSelectionTimeout.man		\
+	XtAppInitialize.man			\
+	XtAppLock.man				\
+	XtAppNextEvent.man			\
+	XtAppReleaseCacheRefs.man		\
+	XtAppSetExitFlag.man			\
+	XtAppSetFallbackResources.man		\
+	XtAppSetTypeConverter.man		\
+	XtBuildEventMask.man			\
+	XtCallAcceptFocus.man			\
+	XtCallActionProc.man			\
+	XtCallCallbacks.man			\
+	XtClass.man				\
+	XtConfigureWidget.man			\
+	XtConvert.man				\
+	XtConvertAndStore.man			\
+	XtCreateApplicationContext.man		\
+	XtCreateApplicationShell.man		\
+	XtCreatePopupShell.man			\
+	XtCreateSelectionRequest.man		\
+	XtCreateWidget.man			\
+	XtCreateWindow.man			\
+	XtDisplay.man				\
+	XtDisplayInitialize.man			\
+	XtDisplayStringConversionWarning.man	\
+	XtDisplayToApplicationContext.man	\
+	XtError.man				\
+	XtErrorMsg.man				\
+	XtFindFile.man				\
+	XtGetActionKeysym.man			\
+	XtGetActionList.man			\
+	XtGetApplicationNameAndClass.man	\
+	XtGetApplicationResources.man		\
+	XtGetClassExtension.man			\
+	XtGetDisplays.man			\
+	XtGetErrorDatabase.man			\
+	XtGetGC.man				\
+	XtGetKeyboardFocusWidget.man		\
+	XtGetKeysymTable.man			\
+	XtGetResourceList.man			\
+	XtGetSelectionParameters.man		\
+	XtGetSelectionRequest.man		\
+	XtGetSelectionTimeout.man		\
+	XtGetSelectionValue.man			\
+	XtGetSelectionValueIncremental.man	\
+	XtGetSubresources.man			\
+	XtGrabKey.man				\
+	XtHooksOfDisplay.man			\
+	XtInitialize.man			\
+	XtInitializeWidgetClass.man		\
+	XtInsertEventTypeHandler.man		\
+	XtLastEventProcessed.man		\
+	XtMakeGeometryRequest.man		\
+	XtMalloc.man				\
+	XtManageChildren.man			\
+	XtMapWidget.man				\
+	XtName.man				\
+	XtNameToWidget.man			\
+	XtNextEvent.man				\
+	XtOffset.man				\
+	XtOpenApplication.man			\
+	XtOwnSelection.man			\
+	XtParent.man				\
+	XtParseAcceleratorTable.man		\
+	XtParseTranslationTable.man		\
+	XtPopdown.man				\
+	XtPopup.man				\
+	XtProcessLock.man			\
+	XtQueryGeometry.man			\
+	XtRealizeWidget.man			\
+	XtRegisterDrawable.man			\
+	XtRegisterGrabAction.man		\
+	XtReservePropertyAtom.man		\
+	XtResolvePathname.man			\
+	XtSessionGetToken.man			\
+	XtSetArg.man				\
+	XtSetKeyTranslator.man			\
+	XtSetKeyboardFocus.man			\
+	XtSetLanguageProc.man			\
+	XtSetMultiClickTime.man			\
+	XtSetSelectionParameters.man		\
+	XtSetSensitive.man			\
+	XtSetValues.man				\
+	XtSetWMColormapWindows.man		\
+	XtStringConversionWarning.man		\
+	XtToolkitThreadInitialize.man		\
+	XtTranslateCoords.man			\
 	XtVaCreateArgsList.man
 
-libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
-	      $(all_shadows:=.@LIB_MAN_SUFFIX@)
-
+libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
 EXTRA_DIST = $(libman_PRE)
 CLEANFILES = $(libman_DATA)
 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)
-
-
-# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
 all_shadows = \
-    $(XtAddCallback_shadows)                 \
-    $(XtAddEventHandler_shadows)             \
-    $(XtAddGrab_shadows)                     \
-    $(XtAppAddConverter_shadows)             \
-    $(XtAppAddInput_shadows)                 \
-    $(XtAppAddTimeOut_shadows)               \
-    $(XtAppAddWorkProc_shadows)              \
-    $(XtAppCreateShell_shadows)              \
-    $(XtAppError_shadows)                    \
-    $(XtAppErrorMsg_shadows)                 \
-    $(XtAppGetErrorDatabase_shadows)         \
-    $(XtAppGetSelectionTimeout_shadows)      \
-    $(XtAppNextEvent_shadows)                \
-    $(XtNextEvent_shadows)                   \
-    $(XtCallCallbacks_shadows)               \
-    $(XtClass_shadows)                       \
-    $(XtConfigureWidget_shadows)             \
-    $(XtConvert_shadows)                     \
-    $(XtConvertAndStore_shadows)             \
-    $(XtCreateApplicationContext_shadows)    \
-    $(XtCreatePopupShell_shadows)            \
-    $(XtCreateWidget_shadows)                \
-    $(XtDisplay_shadows)                     \
-    $(XtDisplayInitialize_shadows)           \
-    $(XtGetGC_shadows)                       \
-    $(XtGetResourceList_shadows)             \
-    $(XtGetSelectionValue_shadows)           \
-    $(XtGetSubresources_shadows)             \
-    $(XtGetApplicationResources_shadows)     \
-    $(XtMakeGeometryRequest_shadows)         \
-    $(XtMalloc_shadows)                      \
-    $(XtManageChildren_shadows)              \
-    $(XtMapWidget_shadows)                   \
-    $(XtNameToWidget_shadows)                \
-    $(XtOffset_shadows)                      \
-    $(XtOwnSelection_shadows)                \
-    $(XtParseAcceleratorTable_shadows)       \
-    $(XtParseTranslationTable_shadows)       \
-    $(XtPopdown_shadows)                     \
-    $(XtPopup_shadows)                       \
-    $(XtRealizeWidget_shadows)               \
-    $(XtSetArg_shadows)                      \
-    $(XtSetKeyTranslator_shadows)            \
-    $(XtSetSensitive_shadows)                \
-    $(XtSetValues_shadows)                   \
-    $(XtGetKeysymTable_shadows)              \
-    $(XtAppSetTypeConverter_shadows)         \
-    $(XtAppAddActionHook_shadows)            \
-    $(XtSetMultiClickTime_shadows)           \
-    $(XtInsertEventTypeHandler_shadows)      \
-    $(XtLastEventProcessed_shadows)          \
-    $(XtAppAddSignal_shadows)                \
-    $(XtAddInput_shadows)                    \
-    $(XtAppAddBlockHook_shadows)             \
-    $(XtAppInitialize_shadows)               \
-    $(XtSessionGetToken_shadows)             \
-    $(XtErrorMsg_shadows)                    \
-    $(XtError_shadows)                       \
-    $(XtGetErrorDatabase_shadows)            \
-    $(XtGetSelectionValueIncremental_shadows) \
-    $(XtGetSelectionTimeout_shadows)         \
-    $(XtCreateSelectionRequest_shadows)      \
-    $(XtReservePropertyAtom_shadows)         \
-    $(XtGrabKey_shadows)                     \
-    $(XtRegisterDrawable_shadows)            \
-    $(XtAppSetExitFlag_shadows)              \
-    $(XtAppLock_shadows)                     \
-    $(XtProcessLock_shadows)                 \
-    $(XtOpenApplication_shadows)
+	$(XtAddCallback_shadows)		\
+	$(XtAddEventHandler_shadows)		\
+	$(XtAddGrab_shadows)			\
+	$(XtAppAddConverter_shadows)		\
+	$(XtAppAddInput_shadows)		\
+	$(XtAppAddTimeOut_shadows)		\
+	$(XtAppAddWorkProc_shadows)		\
+	$(XtAppCreateShell_shadows)		\
+	$(XtAppError_shadows)			\
+	$(XtAppErrorMsg_shadows)		\
+	$(XtAppGetErrorDatabase_shadows)	\
+	$(XtAppGetSelectionTimeout_shadows)	\
+	$(XtAppNextEvent_shadows)		\
+	$(XtNextEvent_shadows)			\
+	$(XtCallCallbacks_shadows)		\
+	$(XtClass_shadows)			\
+	$(XtConfigureWidget_shadows)		\
+	$(XtConvert_shadows)			\
+	$(XtConvertAndStore_shadows)		\
+	$(XtCreateApplicationContext_shadows)	\
+	$(XtCreatePopupShell_shadows)		\
+	$(XtCreateWidget_shadows)		\
+	$(XtDisplay_shadows)			\
+	$(XtDisplayInitialize_shadows)		\
+	$(XtGetGC_shadows)			\
+	$(XtGetResourceList_shadows)		\
+	$(XtGetSelectionValue_shadows)		\
+	$(XtGetSubresources_shadows)		\
+	$(XtGetApplicationResources_shadows)	\
+	$(XtMakeGeometryRequest_shadows)	\
+	$(XtMalloc_shadows)			\
+	$(XtManageChildren_shadows)		\
+	$(XtMapWidget_shadows)			\
+	$(XtNameToWidget_shadows)		\
+	$(XtOffset_shadows)			\
+	$(XtOwnSelection_shadows)		\
+	$(XtParseAcceleratorTable_shadows)	\
+	$(XtParseTranslationTable_shadows)	\
+	$(XtPopdown_shadows)			\
+	$(XtPopup_shadows)			\
+	$(XtRealizeWidget_shadows)		\
+	$(XtSetArg_shadows)			\
+	$(XtSetKeyTranslator_shadows)		\
+	$(XtSetSensitive_shadows)		\
+	$(XtSetValues_shadows)			\
+	$(XtGetKeysymTable_shadows)		\
+	$(XtAppSetTypeConverter_shadows)	\
+	$(XtAppAddActionHook_shadows)		\
+	$(XtSetMultiClickTime_shadows)		\
+	$(XtInsertEventTypeHandler_shadows)	\
+	$(XtLastEventProcessed_shadows)		\
+	$(XtAppAddSignal_shadows)		\
+	$(XtAddInput_shadows)			\
+	$(XtAppAddBlockHook_shadows)		\
+	$(XtAppInitialize_shadows)		\
+	$(XtSessionGetToken_shadows)		\
+	$(XtErrorMsg_shadows)			\
+	$(XtError_shadows)			\
+	$(XtGetErrorDatabase_shadows)		\
+	$(XtGetSelectionValueIncremental_shadows) \
+	$(XtGetSelectionTimeout_shadows)	\
+	$(XtCreateSelectionRequest_shadows)	\
+	$(XtReservePropertyAtom_shadows)	\
+	$(XtGrabKey_shadows)			\
+	$(XtRegisterDrawable_shadows)		\
+	$(XtAppSetExitFlag_shadows)		\
+	$(XtAppLock_shadows)			\
+	$(XtProcessLock_shadows)		\
+	$(XtOpenApplication_shadows)
 
 XtAddCallback_shadows = \
-    XtAddCallbacks                          \
-    XtRemoveCallback                        \
-    XtRemoveCallbacks                       \
-    XtRemoveAllCallbacks
+	XtAddCallbacks				\
+	XtRemoveCallback			\
+	XtRemoveCallbacks			\
+	XtRemoveAllCallbacks
 
 XtAddEventHandler_shadows = \
-    XtAddRawEventHandler                    \
-    XtRemoveEventHandler                    \
-    XtRemoveRawEventHandler                 \
-    XtInsertEventHandler                    \
-    XtInsertRawEventHandler
+	XtAddRawEventHandler			\
+	XtRemoveEventHandler			\
+	XtRemoveRawEventHandler			\
+	XtInsertEventHandler			\
+	XtInsertRawEventHandler
 
 XtAddGrab_shadows = \
-    XtRemoveGrab
+	XtRemoveGrab
 
 XtAppAddConverter_shadows = \
-    XtAddConverter
+	XtAddConverter
 
 XtAppAddInput_shadows = \
-    XtRemoveInput
+	XtRemoveInput
 
 XtAppAddTimeOut_shadows = \
-    XtRemoveTimeOut
+	XtRemoveTimeOut
 
 XtAppAddWorkProc_shadows = \
-    XtRemoveWorkProc
+	XtRemoveWorkProc
 
 XtAppCreateShell_shadows = \
-    XtVaAppCreateShell
+	XtVaAppCreateShell
 
 XtAppError_shadows = \
-    XtAppSetErrorHandler                    \
-    XtAppSetWarningHandler                  \
-    XtAppWarning
+	XtAppSetErrorHandler			\
+	XtAppSetWarningHandler			\
+	XtAppWarning
 
 XtAppErrorMsg_shadows = \
-    XtAppSetErrorMsgHandler                 \
-    XtAppSetWarningMsgHandler               \
-    XtAppWarningMsg
+	XtAppSetErrorMsgHandler			\
+	XtAppSetWarningMsgHandler		\
+	XtAppWarningMsg
 
 XtAppGetErrorDatabase_shadows = \
-    XtAppGetErrorDatabaseText
+	XtAppGetErrorDatabaseText
 
 XtAppGetSelectionTimeout_shadows = \
-    XtAppSetSelectionTimeout
+	XtAppSetSelectionTimeout
 
 XtAppNextEvent_shadows = \
-    XtAppPending                            \
-    XtAppPeekEvent                          \
-    XtAppProcessEvent                       \
-    XtDispatchEvent                         \
-    XtAppMainLoop
+	XtAppPending				\
+	XtAppPeekEvent				\
+	XtAppProcessEvent			\
+	XtDispatchEvent				\
+	XtAppMainLoop
 
 XtNextEvent_shadows = \
-    XtPending                               \
-    XtPeekEvent                             \
-    XtProcessEvent                          \
-    XtMainLoop
+	XtPending				\
+	XtPeekEvent				\
+	XtProcessEvent				\
+	XtMainLoop
 
 XtCallCallbacks_shadows = \
-    XtCallCallbackList                      \
-    XtHasCallbacks
+	XtCallCallbackList			\
+	XtHasCallbacks
 
 XtClass_shadows = \
-    XtSuperclass                            \
-    XtIsSubclass                            \
-    XtCheckSubclass                         \
-    XtIsObject                              \
-    XtIsRectObj                             \
-    XtIsWidget                              \
-    XtIsComposite                           \
-    XtIsConstraint                          \
-    XtIsShell                               \
-    XtIsOverrideShell                       \
-    XtIsWMShell                             \
-    XtIsVendorShell                         \
-    XtIsTransientShell                      \
-    XtIsTopLevelShell                       \
-    XtIsApplicationShell                    \
-    XtIsSessionShell
+	XtSuperclass				\
+	XtIsSubclass				\
+	XtCheckSubclass				\
+	XtIsObject				\
+	XtIsRectObj				\
+	XtIsWidget				\
+	XtIsComposite				\
+	XtIsConstraint				\
+	XtIsShell				\
+	XtIsOverrideShell			\
+	XtIsWMShell				\
+	XtIsVendorShell				\
+	XtIsTransientShell			\
+	XtIsTopLevelShell			\
+	XtIsApplicationShell			\
+	XtIsSessionShell
 
 XtConfigureWidget_shadows = \
-    XtMoveWidget                            \
-    XtResizeWidget
+	XtMoveWidget				\
+	XtResizeWidget
 
 XtConvert_shadows = \
-    XtDirectConvert
+	XtDirectConvert
 
 XtConvertAndStore_shadows = \
-    XtCallConverter
+	XtCallConverter
 
 XtCreateApplicationContext_shadows = \
-    XtDestroyApplicationContext             \
-    XtWidgetToApplicationContext            \
-    XtToolkitInitialize
+	XtDestroyApplicationContext		\
+	XtWidgetToApplicationContext		\
+	XtToolkitInitialize
 
 XtCreatePopupShell_shadows = \
-    XtVaCreatePopupShell
+	XtVaCreatePopupShell
 
 XtCreateWidget_shadows = \
-    XtVaCreateWidget                        \
-    XtCreateManagedWidget                   \
-    XtVaCreateManagedWidget                 \
-    XtDestroyWidget
+	XtVaCreateWidget			\
+	XtCreateManagedWidget			\
+	XtVaCreateManagedWidget			\
+	XtDestroyWidget
 
 XtDisplay_shadows = \
-                                            \
-    XtDisplayOfObject                       \
-    XtScreen                                \
-    XtScreenOfObject                        \
-    XtWindow                                \
-    XtWindowOfObject
+	XtDisplayOfObject			\
+	XtScreen				\
+	XtScreenOfObject			\
+	XtWindow				\
+	XtWindowOfObject
 
 XtDisplayInitialize_shadows = \
-    XtOpenDisplay                           \
-    XtCloseDisplay                          \
-    XtDatabase                              \
-    XtScreenDatabase
+	XtOpenDisplay				\
+	XtCloseDisplay				\
+	XtDatabase				\
+	XtScreenDatabase
 
 XtGetGC_shadows = \
-    XtReleaseGC
+	XtReleaseGC
 
 XtGetResourceList_shadows = \
-    XtGetConstraintResourceList
+	XtGetConstraintResourceList
 
 XtGetSelectionValue_shadows = \
-    XtGetSelectionValues
+	XtGetSelectionValues
 
 XtGetSubresources_shadows = \
-    XtVaGetSubresources
+	XtVaGetSubresources
 
 XtGetApplicationResources_shadows = \
-    XtVaGetApplicationResources
+	XtVaGetApplicationResources
 
 XtMakeGeometryRequest_shadows = \
-    XtMakeResizeRequest
+	XtMakeResizeRequest
 
 XtMalloc_shadows = \
-    XtCalloc                                \
-    XtRealloc                               \
-    XtFree                                  \
-    XtNew                                   \
-    XtNewString
+	XtCalloc				\
+	XtRealloc				\
+	XtFree					\
+	XtNew					\
+	XtNewString
 
 XtManageChildren_shadows = \
-    XtManageChild                           \
-    XtUnmanageChildren                      \
-    XtUnmanageChild                         \
-    XtIsManaged                             \
-    XtChangeManagedSet
+	XtManageChild				\
+	XtUnmanageChildren			\
+	XtUnmanageChild				\
+	XtIsManaged				\
+	XtChangeManagedSet
 
 XtMapWidget_shadows = \
-    XtSetMappedWhenManaged                  \
-    XtUnmapWidget
+	XtSetMappedWhenManaged			\
+	XtUnmapWidget
 
 XtNameToWidget_shadows = \
-    XtWindowToWidget
+	XtWindowToWidget
 
 XtOffset_shadows = \
-    XtOffsetOf                              \
-    XtNumber
+	XtOffsetOf				\
+	XtNumber
 
 XtOwnSelection_shadows = \
-    XtOwnSelectionIncremental               \
-    XtDisownSelection
+	XtOwnSelectionIncremental		\
+	XtDisownSelection
 
 XtParseAcceleratorTable_shadows = \
-    XtInstallAccelerators                   \
-    XtInstallAllAccelerators
+	XtInstallAccelerators			\
+	XtInstallAllAccelerators
 
 XtParseTranslationTable_shadows = \
-    XtAugmentTranslations                   \
-    XtOverrideTranslations                  \
-    XtUninstallTranslations
+	XtAugmentTranslations			\
+	XtOverrideTranslations			\
+	XtUninstallTranslations
 
 XtPopdown_shadows = \
-    XtCallbackPopdown                       \
-    MenuPopdown
+	XtCallbackPopdown			\
+	MenuPopdown
 
 XtPopup_shadows = \
-    XtPopupSpringLoaded                     \
-    XtCallbackNone                          \
-    XtCallbackNonexclusive                  \
-    XtCallbackExclusive                     \
-    MenuPopup
+	XtPopupSpringLoaded			\
+	XtCallbackNone				\
+	XtCallbackNonexclusive			\
+	XtCallbackExclusive			\
+	MenuPopup
 
 XtRealizeWidget_shadows = \
-    XtIsRealized                            \
-    XtUnrealizeWidget
+	XtIsRealized				\
+	XtUnrealizeWidget
 
 XtSetArg_shadows = \
-    XtMergeArgLists
+	XtMergeArgLists
 
 XtSetKeyTranslator_shadows = \
-    XtTranslateKeycode                      \
-    XtRegisterCaseConverter                 \
-    XtConvertCase
+	XtTranslateKeycode			\
+	XtRegisterCaseConverter			\
+	XtConvertCase
 
 XtSetSensitive_shadows = \
-    XtIsSensitive
+	XtIsSensitive
 
 XtSetValues_shadows = \
-    XtVaSetValues                           \
-    XtSetSubvalues                          \
-    XtGetValues                             \
-    XtVaGetValues                           \
-    XtGetSubvalues                          \
-    XtVaGetSubvalues                        \
-    XtVaSetSubvalues
+	XtVaSetValues				\
+	XtSetSubvalues				\
+	XtGetValues				\
+	XtVaGetValues				\
+	XtGetSubvalues				\
+	XtVaGetSubvalues			\
+	XtVaSetSubvalues
 
 XtGetKeysymTable_shadows = \
-    XtKeysymToKeycodeList
+	XtKeysymToKeycodeList
 
 XtAppSetTypeConverter_shadows = \
-    XtSetTypeConverter
+	XtSetTypeConverter
 
 XtAppAddActionHook_shadows = \
-    XtRemoveActionHook
+	XtRemoveActionHook
 
 XtSetMultiClickTime_shadows = \
-    XtGetMultiClickTime
+	XtGetMultiClickTime
 
 XtInsertEventTypeHandler_shadows = \
-    XtRemoveEventTypeHandler                \
-    XtRegisterExtensionSelector             \
-    XtSetEventDispatcher                    \
-    XtDispatchEventToWidget
+	XtRemoveEventTypeHandler		\
+	XtRegisterExtensionSelector		\
+	XtSetEventDispatcher			\
+	XtDispatchEventToWidget
 
 XtLastEventProcessed_shadows = \
-    XtLastTimestampProcessed
+	XtLastTimestampProcessed
 
 XtAppAddSignal_shadows = \
-    XtNoticeSignal                          \
-    XtRemoveSignal
+	XtNoticeSignal				\
+	XtRemoveSignal
 
 XtAddInput_shadows = \
-    XtAddTimeOut                            \
-    XtAddWorkProc
+	XtAddTimeOut				\
+	XtAddWorkProc
 
 XtAppAddBlockHook_shadows = \
-    XtRemoveBlockHook
+	XtRemoveBlockHook
 
 XtAppInitialize_shadows = \
-    XtVaAppInitialize
+	XtVaAppInitialize
 
 XtSessionGetToken_shadows = \
-    XtSessionReturnToken
+	XtSessionReturnToken
 
 XtErrorMsg_shadows = \
-    XtSetErrorMsgHandler                    \
-    XtSetWarningMsgHandler                  \
-    XtWarningMsg
+	XtSetErrorMsgHandler			\
+	XtSetWarningMsgHandler			\
+	XtWarningMsg
 
 XtError_shadows = \
-    XtSetErrorHandler                       \
-    XtSetWarningHandler                     \
-    XtWarning
+	XtSetErrorHandler			\
+	XtSetWarningHandler			\
+	XtWarning
 
 XtGetErrorDatabase_shadows = \
-    XtGetErrorDatabaseText
+	XtGetErrorDatabaseText
 
 XtGetSelectionValueIncremental_shadows = \
-    XtGetSelectionValuesIncremental
+	XtGetSelectionValuesIncremental
 
 XtGetSelectionTimeout_shadows = \
-    XtSetSelectionTimeout
+	XtSetSelectionTimeout
 
 XtCreateSelectionRequest_shadows = \
-    XtSendSelectionRequest                  \
-    XtCancelSelectionRequest
+	XtSendSelectionRequest			\
+	XtCancelSelectionRequest
 
 XtReservePropertyAtom_shadows = \
-    XtReleasePropertyAtom
+	XtReleasePropertyAtom
 
 XtGrabKey_shadows = \
-    XtUngrabKey                             \
-    XtGrabKeyboard                          \
-    XtUngrabKeyboard                        \
-    XtGrabButton                            \
-    XtUngrabButton                          \
-    XtGrabPointer                           \
-    XtUngrabPointer
+	XtUngrabKey				\
+	XtGrabKeyboard				\
+	XtUngrabKeyboard			\
+	XtGrabButton				\
+	XtUngrabButton				\
+	XtGrabPointer				\
+	XtUngrabPointer
 
 XtRegisterDrawable_shadows = \
-    XtUnregisterDrawable
+	XtUnregisterDrawable
 
 XtAppSetExitFlag_shadows = \
-    XtAppGetExitFlag
+	XtAppGetExitFlag
 
 XtAppLock_shadows = \
-    XtAppUnlock
+	XtAppUnlock
 
 XtProcessLock_shadows = \
-    XtProcessUnlock
+	XtProcessUnlock
 
 XtOpenApplication_shadows = \
-    XtVaOpenApplication
-
-XtAddCallback_shadowmen = $(XtAddCallback_shadows:=.@LIB_MAN_SUFFIX@)
-XtAddEventHandler_shadowmen = $(XtAddEventHandler_shadows:=.@LIB_MAN_SUFFIX@)
-XtAddGrab_shadowmen = $(XtAddGrab_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppAddConverter_shadowmen = $(XtAppAddConverter_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppAddInput_shadowmen = $(XtAppAddInput_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppAddTimeOut_shadowmen = $(XtAppAddTimeOut_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppAddWorkProc_shadowmen = $(XtAppAddWorkProc_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppCreateShell_shadowmen = $(XtAppCreateShell_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppError_shadowmen = $(XtAppError_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppErrorMsg_shadowmen = $(XtAppErrorMsg_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppGetErrorDatabase_shadowmen = $(XtAppGetErrorDatabase_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppGetSelectionTimeout_shadowmen = $(XtAppGetSelectionTimeout_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppNextEvent_shadowmen = $(XtAppNextEvent_shadows:=.@LIB_MAN_SUFFIX@)
-XtNextEvent_shadowmen = $(XtNextEvent_shadows:=.@LIB_MAN_SUFFIX@)
-XtCallCallbacks_shadowmen = $(XtCallCallbacks_shadows:=.@LIB_MAN_SUFFIX@)
-XtClass_shadowmen = $(XtClass_shadows:=.@LIB_MAN_SUFFIX@)
-XtConfigureWidget_shadowmen = $(XtConfigureWidget_shadows:=.@LIB_MAN_SUFFIX@)
-XtConvert_shadowmen = $(XtConvert_shadows:=.@LIB_MAN_SUFFIX@)
-XtConvertAndStore_shadowmen = $(XtConvertAndStore_shadows:=.@LIB_MAN_SUFFIX@)
-XtCreateApplicationContext_shadowmen = $(XtCreateApplicationContext_shadows:=.@LIB_MAN_SUFFIX@)
-XtCreatePopupShell_shadowmen = $(XtCreatePopupShell_shadows:=.@LIB_MAN_SUFFIX@)
-XtCreateWidget_shadowmen = $(XtCreateWidget_shadows:=.@LIB_MAN_SUFFIX@)
-XtDisplay_shadowmen = $(XtDisplay_shadows:=.@LIB_MAN_SUFFIX@)
-XtDisplayInitialize_shadowmen = $(XtDisplayInitialize_shadows:=.@LIB_MAN_SUFFIX@)
-XtGetGC_shadowmen = $(XtGetGC_shadows:=.@LIB_MAN_SUFFIX@)
-XtGetResourceList_shadowmen = $(XtGetResourceList_shadows:=.@LIB_MAN_SUFFIX@)
-XtGetSelectionValue_shadowmen = $(XtGetSelectionValue_shadows:=.@LIB_MAN_SUFFIX@)
-XtGetSubresources_shadowmen = $(XtGetSubresources_shadows:=.@LIB_MAN_SUFFIX@)
-XtGetApplicationResources_shadowmen = $(XtGetApplicationResources_shadows:=.@LIB_MAN_SUFFIX@)
-XtMakeGeometryRequest_shadowmen = $(XtMakeGeometryRequest_shadows:=.@LIB_MAN_SUFFIX@)
-XtMalloc_shadowmen = $(XtMalloc_shadows:=.@LIB_MAN_SUFFIX@)
-XtManageChildren_shadowmen = $(XtManageChildren_shadows:=.@LIB_MAN_SUFFIX@)
-XtMapWidget_shadowmen = $(XtMapWidget_shadows:=.@LIB_MAN_SUFFIX@)
-XtNameToWidget_shadowmen = $(XtNameToWidget_shadows:=.@LIB_MAN_SUFFIX@)
-XtOffset_shadowmen = $(XtOffset_shadows:=.@LIB_MAN_SUFFIX@)
-XtOwnSelection_shadowmen = $(XtOwnSelection_shadows:=.@LIB_MAN_SUFFIX@)
-XtParseAcceleratorTable_shadowmen = $(XtParseAcceleratorTable_shadows:=.@LIB_MAN_SUFFIX@)
-XtParseTranslationTable_shadowmen = $(XtParseTranslationTable_shadows:=.@LIB_MAN_SUFFIX@)
-XtPopdown_shadowmen = $(XtPopdown_shadows:=.@LIB_MAN_SUFFIX@)
-XtPopup_shadowmen = $(XtPopup_shadows:=.@LIB_MAN_SUFFIX@)
-XtRealizeWidget_shadowmen = $(XtRealizeWidget_shadows:=.@LIB_MAN_SUFFIX@)
-XtSetArg_shadowmen = $(XtSetArg_shadows:=.@LIB_MAN_SUFFIX@)
-XtSetKeyTranslator_shadowmen = $(XtSetKeyTranslator_shadows:=.@LIB_MAN_SUFFIX@)
-XtSetSensitive_shadowmen = $(XtSetSensitive_shadows:=.@LIB_MAN_SUFFIX@)
-XtSetValues_shadowmen = $(XtSetValues_shadows:=.@LIB_MAN_SUFFIX@)
-XtGetKeysymTable_shadowmen = $(XtGetKeysymTable_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppSetTypeConverter_shadowmen = $(XtAppSetTypeConverter_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppAddActionHook_shadowmen = $(XtAppAddActionHook_shadows:=.@LIB_MAN_SUFFIX@)
-XtSetMultiClickTime_shadowmen = $(XtSetMultiClickTime_shadows:=.@LIB_MAN_SUFFIX@)
-XtInsertEventTypeHandler_shadowmen = $(XtInsertEventTypeHandler_shadows:=.@LIB_MAN_SUFFIX@)
-XtLastEventProcessed_shadowmen = $(XtLastEventProcessed_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppAddSignal_shadowmen = $(XtAppAddSignal_shadows:=.@LIB_MAN_SUFFIX@)
-XtAddInput_shadowmen = $(XtAddInput_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppAddBlockHook_shadowmen = $(XtAppAddBlockHook_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppInitialize_shadowmen = $(XtAppInitialize_shadows:=.@LIB_MAN_SUFFIX@)
-XtSessionGetToken_shadowmen = $(XtSessionGetToken_shadows:=.@LIB_MAN_SUFFIX@)
-XtErrorMsg_shadowmen = $(XtErrorMsg_shadows:=.@LIB_MAN_SUFFIX@)
-XtError_shadowmen = $(XtError_shadows:=.@LIB_MAN_SUFFIX@)
-XtGetErrorDatabase_shadowmen = $(XtGetErrorDatabase_shadows:=.@LIB_MAN_SUFFIX@)
-XtGetSelectionValueIncremental_shadowmen = $(XtGetSelectionValueIncremental_shadows:=.@LIB_MAN_SUFFIX@)
-XtGetSelectionTimeout_shadowmen = $(XtGetSelectionTimeout_shadows:=.@LIB_MAN_SUFFIX@)
-XtCreateSelectionRequest_shadowmen = $(XtCreateSelectionRequest_shadows:=.@LIB_MAN_SUFFIX@)
-XtReservePropertyAtom_shadowmen = $(XtReservePropertyAtom_shadows:=.@LIB_MAN_SUFFIX@)
-XtGrabKey_shadowmen = $(XtGrabKey_shadows:=.@LIB_MAN_SUFFIX@)
-XtRegisterDrawable_shadowmen = $(XtRegisterDrawable_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppSetExitFlag_shadowmen = $(XtAppSetExitFlag_shadows:=.@LIB_MAN_SUFFIX@)
-XtAppLock_shadowmen = $(XtAppLock_shadows:=.@LIB_MAN_SUFFIX@)
-XtProcessLock_shadowmen = $(XtProcessLock_shadows:=.@LIB_MAN_SUFFIX@)
-XtOpenApplication_shadowmen = $(XtOpenApplication_shadows:=.@LIB_MAN_SUFFIX@)
+	XtVaOpenApplication
+
 all: all-am
 
 .SUFFIXES:
@@ -969,146 +862,9 @@ uninstall-am: uninstall-info-am uninstall-libmanDATA
 	uninstall uninstall-am uninstall-info-am uninstall-libmanDATA
 
 
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
 .man.$(LIB_MAN_SUFFIX):
-	$(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(MANDEFS) $(EXTRAMANDEFS) < $< | $(CPP_SED_MAGIC) > $@
-$(XtAddCallback_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAddCallback.$(LIB_MAN_SUFFIX) > $@
-$(XtAddEventHandler_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAddEventHandler.$(LIB_MAN_SUFFIX) > $@
-$(XtAddGrab_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAddGrab.$(LIB_MAN_SUFFIX) > $@
-$(XtAppAddConverter_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppAddConverter.$(LIB_MAN_SUFFIX) > $@
-$(XtAppAddInput_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppAddInput.$(LIB_MAN_SUFFIX) > $@
-$(XtAppAddTimeOut_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppAddTimeOut.$(LIB_MAN_SUFFIX) > $@
-$(XtAppAddWorkProc_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppAddWorkProc.$(LIB_MAN_SUFFIX) > $@
-$(XtAppCreateShell_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppCreateShell.$(LIB_MAN_SUFFIX) > $@
-$(XtAppError_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppError.$(LIB_MAN_SUFFIX) > $@
-$(XtAppErrorMsg_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppErrorMsg.$(LIB_MAN_SUFFIX) > $@
-$(XtAppGetErrorDatabase_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppGetErrorDatabase.$(LIB_MAN_SUFFIX) > $@
-$(XtAppGetSelectionTimeout_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppGetSelectionTimeout.$(LIB_MAN_SUFFIX) > $@
-$(XtAppNextEvent_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppNextEvent.$(LIB_MAN_SUFFIX) > $@
-$(XtNextEvent_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtNextEvent.$(LIB_MAN_SUFFIX) > $@
-$(XtCallCallbacks_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtCallCallbacks.$(LIB_MAN_SUFFIX) > $@
-$(XtClass_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtClass.$(LIB_MAN_SUFFIX) > $@
-$(XtConfigureWidget_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtConfigureWidget.$(LIB_MAN_SUFFIX) > $@
-$(XtConvert_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtConvert.$(LIB_MAN_SUFFIX) > $@
-$(XtConvertAndStore_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtConvertAndStore.$(LIB_MAN_SUFFIX) > $@
-$(XtCreateApplicationContext_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtCreateApplicationContext.$(LIB_MAN_SUFFIX) > $@
-$(XtCreatePopupShell_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtCreatePopupShell.$(LIB_MAN_SUFFIX) > $@
-$(XtCreateWidget_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtCreateWidget.$(LIB_MAN_SUFFIX) > $@
-$(XtDisplay_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtDisplay.$(LIB_MAN_SUFFIX) > $@
-$(XtDisplayInitialize_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtDisplayInitialize.$(LIB_MAN_SUFFIX) > $@
-$(XtGetGC_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtGetGC.$(LIB_MAN_SUFFIX) > $@
-$(XtGetResourceList_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtGetResourceList.$(LIB_MAN_SUFFIX) > $@
-$(XtGetSelectionValue_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtGetSelectionValue.$(LIB_MAN_SUFFIX) > $@
-$(XtGetSubresources_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtGetSubresources.$(LIB_MAN_SUFFIX) > $@
-$(XtGetApplicationResources_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtGetApplicationResources.$(LIB_MAN_SUFFIX) > $@
-$(XtMakeGeometryRequest_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtMakeGeometryRequest.$(LIB_MAN_SUFFIX) > $@
-$(XtMalloc_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtMalloc.$(LIB_MAN_SUFFIX) > $@
-$(XtManageChildren_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtManageChildren.$(LIB_MAN_SUFFIX) > $@
-$(XtMapWidget_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtMapWidget.$(LIB_MAN_SUFFIX) > $@
-$(XtNameToWidget_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtNameToWidget.$(LIB_MAN_SUFFIX) > $@
-$(XtOffset_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtOffset.$(LIB_MAN_SUFFIX) > $@
-$(XtOwnSelection_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtOwnSelection.$(LIB_MAN_SUFFIX) > $@
-$(XtParseAcceleratorTable_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtParseAcceleratorTable.$(LIB_MAN_SUFFIX) > $@
-$(XtParseTranslationTable_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtParseTranslationTable.$(LIB_MAN_SUFFIX) > $@
-$(XtPopdown_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtPopdown.$(LIB_MAN_SUFFIX) > $@
-$(XtPopup_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtPopup.$(LIB_MAN_SUFFIX) > $@
-$(XtRealizeWidget_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtRealizeWidget.$(LIB_MAN_SUFFIX) > $@
-$(XtSetArg_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtSetArg.$(LIB_MAN_SUFFIX) > $@
-$(XtSetKeyTranslator_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtSetKeyTranslator.$(LIB_MAN_SUFFIX) > $@
-$(XtSetSensitive_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtSetSensitive.$(LIB_MAN_SUFFIX) > $@
-$(XtSetValues_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtSetValues.$(LIB_MAN_SUFFIX) > $@
-$(XtGetKeysymTable_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtGetKeysymTable.$(LIB_MAN_SUFFIX) > $@
-$(XtAppSetTypeConverter_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppSetTypeConverter.$(LIB_MAN_SUFFIX) > $@
-$(XtAppAddActionHook_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppAddActionHook.$(LIB_MAN_SUFFIX) > $@
-$(XtSetMultiClickTime_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtSetMultiClickTime.$(LIB_MAN_SUFFIX) > $@
-$(XtInsertEventTypeHandler_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtInsertEventTypeHandler.$(LIB_MAN_SUFFIX) > $@
-$(XtLastEventProcessed_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtLastEventProcessed.$(LIB_MAN_SUFFIX) > $@
-$(XtAppAddSignal_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppAddSignal.$(LIB_MAN_SUFFIX) > $@
-$(XtAddInput_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAddInput.$(LIB_MAN_SUFFIX) > $@
-$(XtAppAddBlockHook_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppAddBlockHook.$(LIB_MAN_SUFFIX) > $@
-$(XtAppInitialize_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppInitialize.$(LIB_MAN_SUFFIX) > $@
-$(XtSessionGetToken_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtSessionGetToken.$(LIB_MAN_SUFFIX) > $@
-$(XtErrorMsg_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtErrorMsg.$(LIB_MAN_SUFFIX) > $@
-$(XtError_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtError.$(LIB_MAN_SUFFIX) > $@
-$(XtGetErrorDatabase_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtGetErrorDatabase.$(LIB_MAN_SUFFIX) > $@
-$(XtGetSelectionValueIncremental_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtGetSelectionValueIncremental.$(LIB_MAN_SUFFIX) > $@
-$(XtGetSelectionTimeout_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtGetSelectionTimeout.$(LIB_MAN_SUFFIX) > $@
-$(XtCreateSelectionRequest_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtCreateSelectionRequest.$(LIB_MAN_SUFFIX) > $@
-$(XtReservePropertyAtom_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtReservePropertyAtom.$(LIB_MAN_SUFFIX) > $@
-$(XtGrabKey_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtGrabKey.$(LIB_MAN_SUFFIX) > $@
-$(XtRegisterDrawable_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtRegisterDrawable.$(LIB_MAN_SUFFIX) > $@
-$(XtAppSetExitFlag_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppSetExitFlag.$(LIB_MAN_SUFFIX) > $@
-$(XtAppLock_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtAppLock.$(LIB_MAN_SUFFIX) > $@
-$(XtProcessLock_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtProcessLock.$(LIB_MAN_SUFFIX) > $@
-$(XtOpenApplication_shadowmen):
-	 $(AM_V_GEN)echo .so man$(LIB_MAN_DIR_SUFFIX)/XtOpenApplication.$(LIB_MAN_SUFFIX) > $@
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: