libman_ref are all the refpages that are just links to the actual man page (e.g. XIUngrabButton.man is a refpage to XIGrabButton.man).
This patch forces the all actual man pages to be complete before the refpages target can be started. Previously, some ref pages could have started parallel to the man pages still being generated. The ref pages rely on their respective man pages but they may not have existed yet, leading to build errors. Signed-off-by: Peter Hutterer <[email protected]> --- I think this should be the correct approach to address the parallel build errors we see in libXi, at least I can't reproduce it anymore with different -j settings. Any comments? man/Makefile.am | 32 +------------------------------- 1 files changed, 1 insertions(+), 31 deletions(-) diff --git a/man/Makefile.am b/man/Makefile.am index 2a6c60e..ed53b04 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -122,36 +122,6 @@ EXTRA_DIST = $(libman_txt) $(libman_pre) CLEANFILES = $(nodist_libman_DATA) *.libmansuffix MAINTAINERCLEANFILES = $(libman_pre) *.xml -# prerequisites for the side effect pages -XGetDeviceDontPropagateList.man: XChangeDeviceDontPropagateList.man -XChangeDeviceControl.man: XGetDeviceControl.man -XChangeDeviceKeyMapping.man: XGetDeviceKeyMapping.man -XSetDeviceModifierMapping.man: XGetDeviceModifierMapping.man -XDeviceTimeCoord: XGetDeviceMotionEvents.man -XChangeFeedbackControl.man: XGetFeedbackControl.man -XUngrabDeviceButton.man: XGrabDeviceButton.man -XUngrabDeviceKey.man: XGrabDeviceKey.man -XUngrabDevice.man: XGrabDevice.man -XFreeDeviceList.man: XListInputDevices.man -XCloseDevice.man: XOpenDevice.man -XGetSelectedExtensionEvents.man: XSelectExtensionEvent.man -XGetDeviceButtonMapping.man: XSetDeviceButtonMapping.man -XGetDeviceFocus.man: XSetDeviceFocus.man -XChangeDeviceProperty.man: XGetDeviceProperty.man -XDeleteDeviceProperty.man: XGetDeviceProperty.man - -# XI2 prereqs -XIUndefineCursor: XIDefineCursor.man -XIUngrabButton.man XIGrabKeycode.man XIUngrabKeycode.man: XIGrabButton.man -XIGetClientPointer.man: XISetClientPointer.man -XIGetFocus.man: XISetFocus.man -XIUngrabDevice.man: XIGrabDevice.man -XIGetProperty.man: XIChangeProperty.man -XIDeleteProperty.man: XIChangeProperty.man -XIUngrabEnter.man XIGrabFocusIn.man XIUngrabFocusIn.man: XIGrabEnter.man -XIGetSelectedEvents.man: XISelectEvents.man -XIFreeDeviceInfo.man: XIQueryDevice.man - # Strings to replace in man pages XORGRELSTRING = $(PACKAGE_STRING) XORGMANNAME = X Version 11 @@ -177,7 +147,7 @@ SUFFIXES += .txt .xml mv -f $(@:.man=.libmansuffix) $@ # need to force asciidoc/xmlto to run if necessary for side effect pages -$(libman_ref): +$(libman_ref): $(libman_txt:.txt=.man) @if test ! -f $(@:.man=.libmansuffix); then \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $< || exit 1; \ -- 1.6.3.rc1.2.g0164.dirty _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
