From: wolf Date: Tue, 16 Nov 1999 14:26:37 +0000 (+0000) Subject: Follow Makefile conventions; will allow to use modern 'make -jN' with X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22fc1f90e0c5a893fc7e89670d76c65559420680;p=dealii-svn.git Follow Makefile conventions; will allow to use modern 'make -jN' with 'N' passed to sub-makes as well. git-svn-id: https://svn.dealii.org/trunk@1857 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/Makefile b/deal.II/base/Makefile index 2a0171d473..298de6ded2 100644 --- a/deal.II/base/Makefile +++ b/deal.II/base/Makefile @@ -7,11 +7,11 @@ clean: source-clean rm -f *~ include/*~ include/*/*~ lib/lib* lib/o/*.o lib/go/*.go include/base/forward-declarations.h* lac: - cd source ; make + cd source ; $(MAKE) source-clean: - cd source ; make clean + cd source ; $(MAKE) clean -.PHONY: all deal.II +.PHONY: all .PHONY: clean source-clean diff --git a/deal.II/common/scripts/forward_declarations b/deal.II/common/scripts/forward_declarations index daea0cfa65..7ab7940174 100644 --- a/deal.II/common/scripts/forward_declarations +++ b/deal.II/common/scripts/forward_declarations @@ -31,7 +31,7 @@ ifneq (1,${recursive-make-fwd-decl}) @touch $@.old -@cp $@ $@.old > /dev/null 2>&1 @perl $D/common/scripts/Make_forward_declarations.pl $(filter-out %forward-declarations.h,$(h-files)) > $@.new - @make --silent recursive-make-fwd-decl=1 $@ + @$(MAKE) --silent recursive-make-fwd-decl=1 $@ @rm $@.old $@.new else ifneq (,$(shell diff $(forward-declarations).old $(forward-declarations).new)) diff --git a/deal.II/deal.II/Attic/examples/Makefile b/deal.II/deal.II/Attic/examples/Makefile index 452c446d48..3c406115c7 100644 --- a/deal.II/deal.II/Attic/examples/Makefile +++ b/deal.II/deal.II/Attic/examples/Makefile @@ -22,10 +22,10 @@ clean : $(clean) # define the action of the targets for the specific subdirectories $(compile) : - cd $(@:.compile=) ; make + cd $(@:.compile=) ; $(MAKE) $(run) : - cd $(@:.run=) ; make run + cd $(@:.run=) ; $(MAKE) run $(clean) : - -cd $(@:.clean=) ; make clean + -cd $(@:.clean=) ; $(MAKE) clean diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile index 00b4a1c077..97a0eb3fb5 100644 --- a/deal.II/deal.II/Makefile +++ b/deal.II/deal.II/Makefile @@ -8,20 +8,21 @@ clean: source-clean examples-clean lib-clean deal.II: - cd source ; make + cd source ; $(MAKE) examples: - cd examples ; make + cd examples ; $(MAKE) lib-clean: -rm -f *~ include/*~ include/*/*~ include/basic/forward-declarations.h* - cd lib ; make clean + cd lib ; $(MAKE) clean examples-clean: - cd examples ; make clean + cd examples ; $(MAKE) clean source-clean: - cd source ; make clean + cd source ; $(MAKE) clean + TAGS: etags include/*/*.h source/*/*.cc diff --git a/tests/big-tests/Makefile b/tests/big-tests/Makefile index 452c446d48..3c406115c7 100644 --- a/tests/big-tests/Makefile +++ b/tests/big-tests/Makefile @@ -22,10 +22,10 @@ clean : $(clean) # define the action of the targets for the specific subdirectories $(compile) : - cd $(@:.compile=) ; make + cd $(@:.compile=) ; $(MAKE) $(run) : - cd $(@:.run=) ; make run + cd $(@:.run=) ; $(MAKE) run $(clean) : - -cd $(@:.clean=) ; make clean + -cd $(@:.clean=) ; $(MAKE) clean