[qmtest] PATCH: Do not build documentation when running 'make check'

[Mark Mitchell]

On Mon, 2003-11-10 at 00:15, Mark Mitchell wrote:
> It makes sense to have "make check" to rebuild QMTest before running
> tests in order to avoid using a stale version of QMTest for testing. 
> However, it does not make sense to rebuild the documentation at that
> point; that's inordinately time-consuming.
> 
> This patch implements this idea.

Oops!  Wrong patch.  Here's the correct one.

-- 
Mark Mitchell <mark at codesourcery.com>
CodeSourcery, LLC
-------------- next part --------------
2003-11-09  Mark Mitchell  <mark at codesourcery.com>

	* GNUmakefile.in (.PHONY): Add build and doc.
	(build): New target.
	(doc): Likewise.
	(check-serial): Depend on build, not all.
	(check-threads): Likewise.
	(check-processes): Likewise.
	(check-rsh): Likewise.

Index: GNUmakefile.in
===================================================================
RCS file: /home/sc/Repository/qm/GNUmakefile.in,v
retrieving revision 1.31
diff -c -5 -p -r1.31 GNUmakefile.in
*** GNUmakefile.in	10 Nov 2003 07:52:55 -0000	1.31
--- GNUmakefile.in	10 Nov 2003 08:08:06 -0000
*************** bindir		= @bindir@
*** 46,62 ****
  
  ########################################################################
  # Build Rules
  ########################################################################
  
! .PHONY: all
! all:
  ifeq ($(DOCUMENTATION),1)
! 	$(PYTHON) ./setup.py build_doc
  endif
  	$(PYTHON) ./setup.py build
  
  # Build internal documentation.
  ifneq ($(HAPPYDOC),)
  doc-python:
  	$(PYTHON) $(HAPPYDOC) qm
  else
--- 46,72 ----
  
  ########################################################################
  # Build Rules
  ########################################################################
  
! # Do not want "make all" to build the documentation if the user did
! # not request documentation at configure-time.
  ifeq ($(DOCUMENTATION),1)
! maybe_doc=doc
! else
! maybe_doc=
  endif
+ 
+ .PHONY: all build doc
+ all: build $(maybe_doc)
+ 
+ build:
  	$(PYTHON) ./setup.py build
  
+ doc:
+ 	$(PYTHON) ./setup.py build_doc
+ 
  # Build internal documentation.
  ifneq ($(HAPPYDOC),)
  doc-python:
  	$(PYTHON) $(HAPPYDOC) qm
  else
*************** install: all
*** 98,132 ****
  
  # The check-rsh target is not included here because it requires
  # networking support.
  check: check-serial check-threads check-processes
  
! check-serial: all
  	qm/test/qmtest -D tests run $(QMTESTFLAGS) \
  		-c qmtest_path=qm/test/qmtest
  
! check-threads: all
  	rm -f tests/QMTest/thread_target
  	qm/test/qmtest -D tests create-target -a threads=4 \
  		-T tests/QMTest/thread_target \
  		thread thread_target.ThreadTarget
  	qm/test/qmtest -D tests run -T tests/QMTest/thread_target \
  		$(QMTESTFLAGS) \
  		-c qmtest_path=qm/test/qmtest \
  		-c qmtest_target=tests/QMTest/thread_target
  
! check-processes: all
  	rm -f tests/QMTest/process_target
  	qm/test/qmtest -D tests create-target -a processes=4 \
  		-T tests/QMTest/process_target \
  		process process_target.ProcessTarget
  	qm/test/qmtest -D tests run -T tests/QMTest/process_target \
  		$(QMTESTFLAGS) \
  		-c qmtest_path=qm/test/qmtest \
  		-c qmtest_target=tests/QMTest/process_target
  
! check-rsh: all
  	rm -f tests/QMTest/rsh_target
  	qm/test/qmtest -D tests create-target \
                  -a host=localhost -a remote_shell=ssh \
  		-T tests/QMTest/rsh_target \
  		rsh rsh_target.RSHTarget
--- 108,142 ----
  
  # The check-rsh target is not included here because it requires
  # networking support.
  check: check-serial check-threads check-processes
  
! check-serial: build
  	qm/test/qmtest -D tests run $(QMTESTFLAGS) \
  		-c qmtest_path=qm/test/qmtest
  
! check-threads: build
  	rm -f tests/QMTest/thread_target
  	qm/test/qmtest -D tests create-target -a threads=4 \
  		-T tests/QMTest/thread_target \
  		thread thread_target.ThreadTarget
  	qm/test/qmtest -D tests run -T tests/QMTest/thread_target \
  		$(QMTESTFLAGS) \
  		-c qmtest_path=qm/test/qmtest \
  		-c qmtest_target=tests/QMTest/thread_target
  
! check-processes: build
  	rm -f tests/QMTest/process_target
  	qm/test/qmtest -D tests create-target -a processes=4 \
  		-T tests/QMTest/process_target \
  		process process_target.ProcessTarget
  	qm/test/qmtest -D tests run -T tests/QMTest/process_target \
  		$(QMTESTFLAGS) \
  		-c qmtest_path=qm/test/qmtest \
  		-c qmtest_target=tests/QMTest/process_target
  
! check-rsh: build
  	rm -f tests/QMTest/rsh_target
  	qm/test/qmtest -D tests create-target \
                  -a host=localhost -a remote_shell=ssh \
  		-T tests/QMTest/rsh_target \
  		rsh rsh_target.RSHTarget