From: bangerth Date: Wed, 9 Aug 2006 22:31:28 +0000 (+0000) Subject: Re-order dependencies. Previously, we got into trouble in case of parallel builds... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcaa462be07f8db5812413e4f5f71c42c356988b;p=dealii-svn.git Re-order dependencies. Previously, we got into trouble in case of parallel builds if we did something like 'make -j4 debug all', since we would start two concurrent makes with the same targets. We need to leave things like this up to make itself. git-svn-id: https://svn.dealii.org/trunk@13626 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/Makefile b/deal.II/Makefile index 218cab88ac..fb10fc8ba1 100644 --- a/deal.II/Makefile +++ b/deal.II/Makefile @@ -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