From 236bfc8079008a0b073995d6da69a756e9e43d48 Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 10 Feb 2012 00:11:20 +0000 Subject: [PATCH] Bugfix: Fix a possible race condition introduced with revision 25023 git-svn-id: https://svn.dealii.org/trunk@25027 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/Makefile | 4 ++++ deal.II/source/Makefile | 13 +++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/deal.II/Makefile b/deal.II/Makefile index 15d4089a3c..824b3a5435 100644 --- a/deal.II/Makefile +++ b/deal.II/Makefile @@ -33,6 +33,10 @@ deps: config.log then : ;\ else rm Makefile.dep && $(MAKE) $(MAKEOPTIONS) Makefile.dep; fi @cd lib && $(MAKE) $(MAKEOPTIONS) external-links + @mkdir -p lib/debug + @mkdir -p lib/optimized + @echo Created lib/debug and lib/optimized directories. + all: debug optimized diff --git a/deal.II/source/Makefile b/deal.II/source/Makefile index cb1da1a0f1..4f77885a1d 100644 --- a/deal.II/source/Makefile +++ b/deal.II/source/Makefile @@ -30,18 +30,10 @@ o-files := $(addprefix $(LIBDIR)/optimized/, $(tmp1:.cc=.$(OBJEXT)) ) go-files := $(addprefix $(LIBDIR)/debug/, $(tmp1:.cc=.$(OBJEXT))) -debug: mkdir-debug $(LIBDIR)/libdeal_II.g$(lib-suffix) -optimized: mkdir-optimized $(LIBDIR)/libdeal_II$(lib-suffix) +debug: $(LIBDIR)/libdeal_II.g$(lib-suffix) +optimized: $(LIBDIR)/libdeal_II$(lib-suffix) -mkdir-debug: - @mkdir -p "$(LIBDIR)/debug/" - @echo Created $(LIBDIR)/debug directory. - -mkdir-optimized: - @mkdir -p "$(LIBDIR)/optimized/" - @echo Created $(LIBDIR)/optimized directory. - # rules how to generate object files from source files. $(LIBDIR)/debug/%.$(OBJEXT) : @@ -240,6 +232,7 @@ include $(addsuffix /Makefile.dep, $(all-dirs)) endif + ################### some clean-up rules clean: -- 2.39.5