]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Re-order dependencies. Previously, we got into trouble in case of parallel builds...
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 9 Aug 2006 22:31:28 +0000 (22:31 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 9 Aug 2006 22:31:28 +0000 (22:31 +0000)
git-svn-id: https://svn.dealii.org/trunk@13626 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/Makefile

index 218cab88acfb91725a7f35bb74620f2b9ae7a044..fb10fc8ba1275986367f4c524874e0226dad976b 100644 (file)
@@ -40,45 +40,45 @@ help:
        @echo "========================================================================"
 
 
+common/scripts/make_dependencies:
+       cd $D/common/scripts && $(MAKE) $(MAKEOPTIONS)
 
-baseg: contrib-functionparser
+deps: common/scripts/make_dependencies
+       cd $D/base && $(MAKE) $(MAKEOPTIONS) Makefile.dep
+       cd $D/lac && $(MAKE) $(MAKEOPTIONS) Makefile.dep
+       cd $D/deal.II && $(MAKE) $(MAKEOPTIONS) Makefile.dep
+       cd $D/lib && $(MAKE) $(MAKEOPTIONS) external-links
+
+baseg: deps contrib-functionparser
        cd $D/base && $(MAKE) $(MAKEOPTIONS) libg
 
-baseo: contrib-functionparser
+baseo: deps contrib-functionparser
        cd $D/base && $(MAKE) $(MAKEOPTIONS) libo
 
-lacg: baseg contrib
+lacg: deps baseg contrib
        cd $D/lac && $(MAKE) $(MAKEOPTIONS) libg
 
-laco: baseo contrib
+laco: deps baseo contrib
        cd $D/lac && $(MAKE) $(MAKEOPTIONS) libo
 
-1dg: baseg lacg
+1dg: deps baseg lacg
        cd $D/deal.II && $(MAKE) $(MAKEOPTIONS) 1dg
 
-2dg: baseg lacg
+2dg: deps baseg lacg
        cd $D/deal.II && $(MAKE) $(MAKEOPTIONS) 2dg
 
-3dg: baseg lacg
+3dg: deps baseg lacg
        cd $D/deal.II && $(MAKE) $(MAKEOPTIONS) 3dg
 
-1do:baseo laco
+1do: deps baseo laco
        cd $D/deal.II && $(MAKE) $(MAKEOPTIONS) 1d
 
-2do:baseo laco
+2do: deps baseo laco
        cd $D/deal.II && $(MAKE) $(MAKEOPTIONS) 2d
 
-3do: baseo laco
+3do: deps baseo laco
        cd $D/deal.II && $(MAKE) $(MAKEOPTIONS) 3d
 
-deps: common/scripts/make_dependencies
-       cd $D/base && $(MAKE) $(MAKEOPTIONS) Makefile.dep
-       cd $D/lac && $(MAKE) $(MAKEOPTIONS) Makefile.dep
-       cd $D/deal.II && $(MAKE) $(MAKEOPTIONS) Makefile.dep
-       cd $D/lib && $(MAKE) $(MAKEOPTIONS) external-links
-
-common/scripts/make_dependencies:
-       cd $D/common/scripts && $(MAKE) $(MAKEOPTIONS)
 
 base: baseg baseo
 lac: lacg laco
@@ -91,14 +91,10 @@ $(LIBDIR):
 
 baseg baseo base lacg laco lac 1dg 1do 1d 2dg 2do 2d 3dg 3do 3d all debug contrib -functionparser : $(LIBDIR) deps
 
-all: deps
-       $(MAKE) $(MAKEOPTIONS) contrib base lac 2d 1d 3d
-
-debug: deps
-       $(MAKE) $(MAKEOPTIONS) contrib baseg lacg 2dg 1dg 3dg
+all: debug optimized
+debug: contrib baseg lacg 2dg 1dg 3dg
+optimized: contrib baseo laco 2do 1do 3do
 
-optimized: deps
-       $(MAKE) $(MAKEOPTIONS) contrib baseo laco 2do 1do 3do
 
 # when HSL functions are used, we also compile the detached_ma27
 # program which itself uses the optimized base library; so add this to

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.