From 709c43873748586baf1a81c630cc863ac8c65341 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 1 Mar 2013 22:02:46 +0000 Subject: [PATCH] Add an intermediate build_examples step git-svn-id: https://svn.dealii.org/branches/branch_cmake@28706 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/GNUmakefile | 3 +++ deal.II/examples/GNUmakefile | 16 +++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/deal.II/GNUmakefile b/deal.II/GNUmakefile index 138b419ff2..4bf5eb25df 100644 --- a/deal.II/GNUmakefile +++ b/deal.II/GNUmakefile @@ -97,6 +97,9 @@ build_test: @echo "BEGIN BUILD INSTALL OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile) cd $(builddir) && make $(MAKEOPTS) install >>$(logfile) 2>&1 @echo "END BUILD INSTALL OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile) + @echo "BEGIN BUILD EXAMPLES OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile) + cd $(installdir)/examples && make $(MAKEOPTS) build_examples >>$(logfile) 2>&1 + @echo "END BUILD EXAMPLES OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile) @echo "BEGIN RUN EXAMPLES OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile) cd $(installdir)/examples && make $(MAKEOPTS) run_examples >>$(logfile) 2>&1 @echo "END RUN EXAMPLES OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile) diff --git a/deal.II/examples/GNUmakefile b/deal.II/examples/GNUmakefile index 827a7037c4..f5a1989732 100644 --- a/deal.II/examples/GNUmakefile +++ b/deal.II/examples/GNUmakefile @@ -9,17 +9,23 @@ else default: endif - steps:= $(wildcard step-*) +%/Makefile: + -cd $(@D) && cmake . > configure.log 2>&1 + .PHONY: configure_examples configure_examples: $(steps:%=%/Makefile) -%/Makefile: - -cd $(@D) && cmake . > configure.log 2>&1 +%/%: %/Makefile + cd $(@D) && if [ -f Makefile ]; then (make > build.log 2>&1); fi + +.PHONY: build_examples +build_examples: $(steps:%=%/%) + +%/OK: %/% + cd $(@D) && if [ -f Makefile ]; then (make run > run.log 2>&1); fi && touch OK .PHONY: run_examples run_examples: $(steps:%=%/OK) -%/OK: %/Makefile - cd $(@D) && if [ -f Makefile ]; then (make run > run.log 2>&1); fi && touch OK -- 2.39.5