]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Add an intermediate build_examples step
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 1 Mar 2013 22:02:46 +0000 (22:02 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 1 Mar 2013 22:02:46 +0000 (22:02 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@28706 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/GNUmakefile
deal.II/examples/GNUmakefile

index 138b419ff2fd4331d2cf824b757bfd936877fc30..4bf5eb25df61c835852bec1eb95f8ab10dd64e24 100644 (file)
@@ -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)
index 827a7037c48fa19400676fc9adf38ba0b54ee9f9..f5a198973297677af4ef8fe63a1b19b0e8600b29 100644 (file)
@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.