]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Follow Makefile conventions; will allow to use modern 'make -jN' with
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 16 Nov 1999 14:26:37 +0000 (14:26 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 16 Nov 1999 14:26:37 +0000 (14:26 +0000)
'N' passed to sub-makes as well.

git-svn-id: https://svn.dealii.org/trunk@1857 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/Makefile
deal.II/common/scripts/forward_declarations
deal.II/deal.II/Attic/examples/Makefile
deal.II/deal.II/Makefile
tests/big-tests/Makefile

index 2a0171d47396f26a5d8caa3aaa760e7371036e2b..298de6ded2a8b23022da5bdebd4f39ecf7ab36ff 100644 (file)
@@ -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
index daea0cfa65ea17e4dcad573ae81cbd8077e30d9b..7ab7940174cddd86270c66790c368ae422407bd9 100644 (file)
@@ -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))
index 452c446d48548bd94d9ccb9234c0df9c850c924e..3c406115c71311fdb6e3d60f8b49f05215da98ec 100644 (file)
@@ -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
index 00b4a1c077b6c78051394e81ac7081f541a1089b..97a0eb3fb5ac9499f9951de25f029dfc257f00a7 100644 (file)
@@ -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
 
index 452c446d48548bd94d9ccb9234c0df9c850c924e..3c406115c71311fdb6e3d60f8b49f05215da98ec 100644 (file)
@@ -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

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.