From: wolf Date: Mon, 22 Nov 1999 07:09:59 +0000 (+0000) Subject: Manually expand dependencies, since there were problems with parallel X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fd995961d8d423eb5abedc01815cc2a16e00b09;p=dealii-svn.git Manually expand dependencies, since there were problems with parallel builds when forward-declarations.h-files needed by one thread were not alreday available or were presently written by another thread. git-svn-id: https://svn.dealii.org/trunk@1913 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/Makefile b/deal.II/Makefile index 095c5878f6..26673985d3 100644 --- a/deal.II/Makefile +++ b/deal.II/Makefile @@ -35,34 +35,50 @@ MAKEOPTIONS = $(PAR) baseg: cd ../base ; $(MAKE) $(MAKEOPTIONS) libg -base: baseg - cd ../base ; $(MAKE) $(MAKEOPTIONS) libg lib +base: + cd ../base ; $(MAKE) $(MAKEOPTIONS) libg + cd ../base ; $(MAKE) $(MAKEOPTIONS) lib -lacg: baseg +lacg: cd ../lac ; $(MAKE) $(MAKEOPTIONS) libg -lac: base lacg - cd ../lac ; $(MAKE) $(MAKEOPTIONS) libg lib +lac: + cd ../lac ; $(MAKE) $(MAKEOPTIONS) libg + cd ../lac ; $(MAKE) $(MAKEOPTIONS) lib -1dg: baseg lacg +1dg: cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 1dg -2dg: baseg lacg +2dg: cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 2dg -3dg: baseg lacg +3dg: cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 3dg -1d: baseg lacg base lac 1dg +1d: + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 1dg cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 1d -2d: baseg lacg base lac 2dg +2d: + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 2dg cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 2d -3d: baseg lacg base lac 3dg +3d: + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 3dg + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 3d + +all: + cd ../base ; $(MAKE) $(MAKEOPTIONS) libg + cd ../base ; $(MAKE) $(MAKEOPTIONS) lib + cd ../lac ; $(MAKE) $(MAKEOPTIONS) libg + cd ../lac ; $(MAKE) $(MAKEOPTIONS) lib + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 1dg + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 1d + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 2dg + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 2d + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 3dg cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 3d -all: base lac 2d 1d 3d online-doc: cd ../doc/auto ; $(MAKE) diff --git a/deal.II/common/Makefile b/deal.II/common/Makefile index 095c5878f6..26673985d3 100644 --- a/deal.II/common/Makefile +++ b/deal.II/common/Makefile @@ -35,34 +35,50 @@ MAKEOPTIONS = $(PAR) baseg: cd ../base ; $(MAKE) $(MAKEOPTIONS) libg -base: baseg - cd ../base ; $(MAKE) $(MAKEOPTIONS) libg lib +base: + cd ../base ; $(MAKE) $(MAKEOPTIONS) libg + cd ../base ; $(MAKE) $(MAKEOPTIONS) lib -lacg: baseg +lacg: cd ../lac ; $(MAKE) $(MAKEOPTIONS) libg -lac: base lacg - cd ../lac ; $(MAKE) $(MAKEOPTIONS) libg lib +lac: + cd ../lac ; $(MAKE) $(MAKEOPTIONS) libg + cd ../lac ; $(MAKE) $(MAKEOPTIONS) lib -1dg: baseg lacg +1dg: cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 1dg -2dg: baseg lacg +2dg: cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 2dg -3dg: baseg lacg +3dg: cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 3dg -1d: baseg lacg base lac 1dg +1d: + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 1dg cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 1d -2d: baseg lacg base lac 2dg +2d: + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 2dg cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 2d -3d: baseg lacg base lac 3dg +3d: + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 3dg + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 3d + +all: + cd ../base ; $(MAKE) $(MAKEOPTIONS) libg + cd ../base ; $(MAKE) $(MAKEOPTIONS) lib + cd ../lac ; $(MAKE) $(MAKEOPTIONS) libg + cd ../lac ; $(MAKE) $(MAKEOPTIONS) lib + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 1dg + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 1d + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 2dg + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 2d + cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 3dg cd ../deal.II ; $(MAKE) $(MAKEOPTIONS) 3d -all: base lac 2d 1d 3d online-doc: cd ../doc/auto ; $(MAKE)