From 9de9e302f5c8f5b14ea8ace3effc662f99f8d7cb Mon Sep 17 00:00:00 2001 From: wolf Date: Fri, 19 Nov 1999 08:26:41 +0000 Subject: [PATCH] Somehow sequencialize the order in which the libraries will be made, since in -jN mode, we will get into trouble sometimes otherwise. git-svn-id: https://svn.dealii.org/trunk@1894 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/Makefile | 22 +++++++++++----------- deal.II/common/Makefile | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/deal.II/Makefile b/deal.II/Makefile index ff0ee04d95..cacf3a64b4 100644 --- a/deal.II/Makefile +++ b/deal.II/Makefile @@ -35,24 +35,15 @@ MAKEOPTIONS = $(PAR) baseg: cd ../base/source ; $(MAKE) $(MAKEOPTIONS) libg -base: +base: baseg cd ../base/source ; $(MAKE) $(MAKEOPTIONS) libg lib lacg: baseg cd ../lac/source ; $(MAKE) $(MAKEOPTIONS) libg -lac: base +lac: base lacg cd ../lac/source ; $(MAKE) $(MAKEOPTIONS) libg lib -1d: baseg lacg base lac - cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 1d - -2d: baseg lacg base lac - cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 2d - -3d: baseg lacg base lac - cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 3d - 1dg: baseg lacg cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 1dg @@ -62,6 +53,15 @@ lac: base 3dg: baseg lacg cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 3dg +1d: baseg lacg base lac 1dg + cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 1d + +2d: baseg lacg base lac 2dg + cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 2d + +3d: baseg lacg base lac 3dg + cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 3d + all: base lac 2d 1d 3d online-doc: diff --git a/deal.II/common/Makefile b/deal.II/common/Makefile index ff0ee04d95..cacf3a64b4 100644 --- a/deal.II/common/Makefile +++ b/deal.II/common/Makefile @@ -35,24 +35,15 @@ MAKEOPTIONS = $(PAR) baseg: cd ../base/source ; $(MAKE) $(MAKEOPTIONS) libg -base: +base: baseg cd ../base/source ; $(MAKE) $(MAKEOPTIONS) libg lib lacg: baseg cd ../lac/source ; $(MAKE) $(MAKEOPTIONS) libg -lac: base +lac: base lacg cd ../lac/source ; $(MAKE) $(MAKEOPTIONS) libg lib -1d: baseg lacg base lac - cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 1d - -2d: baseg lacg base lac - cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 2d - -3d: baseg lacg base lac - cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 3d - 1dg: baseg lacg cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 1dg @@ -62,6 +53,15 @@ lac: base 3dg: baseg lacg cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 3dg +1d: baseg lacg base lac 1dg + cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 1d + +2d: baseg lacg base lac 2dg + cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 2d + +3d: baseg lacg base lac 3dg + cd ../deal.II/source ; $(MAKE) $(MAKEOPTIONS) 3d + all: base lac 2d 1d 3d online-doc: -- 2.39.5