From b52ad36237fa04cd3cb37b9c977479a9d619b40f Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 28 May 2002 08:10:58 +0000 Subject: [PATCH] Output =====deal.II====3d====debug========== multigrid/multigrid.all_dimensions.cc and alike lines atomically, if possible. This avoids screen clutter if compiling with -jN, since otherwise the different parts of a line are printed one after the other, and these different parts may be intercepted by output from other make threads. git-svn-id: https://svn.dealii.org/trunk@5896 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/Makefile | 8 ++++---- deal.II/deal.II/Makefile | 38 +++++++++++++++++++------------------- deal.II/lac/Makefile | 12 ++++++------ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/deal.II/base/Makefile b/deal.II/base/Makefile index ff632974ba..56361fb0d4 100644 --- a/deal.II/base/Makefile +++ b/deal.II/base/Makefile @@ -79,20 +79,20 @@ endif forward: $(forward-declarations) $(LIBDIR)/libbase.a: $(o-files) - @echo =====base=============optimized==$(MT)== Linking library: $(@F) + @echo "=====base=============optimized==$(MT)== Linking library: $(@F)" @ar ru $@ $(o-files) $(LIBDIR)/libbase.g.a: $(go-files) - @echo =====base=============debug======$(MT)== Linking library: $(@F) + @echo "=====base=============debug======$(MT)== Linking library: $(@F)" @ar ru $@ $(go-files) $(LIBDIR)/libbase.so: $(o-files) - @echo =====base=============optimized==$(MT)== Linking library: $(@F) + @echo "=====base=============optimized==$(MT)== Linking library: $(@F)" @$(CC) $(LDFLAGS) -shared -o $@ $(o-files) $(LIBDIR)/libbase.g.so: $(go-files) - @echo =====base=============debug======$(MT)== Linking library: $(@F) + @echo "=====base=============debug======$(MT)== Linking library: $(@F)" @$(CC) $(LDFLAGS) -shared -o $@ $(go-files) diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile index 205b507300..87fb48a1f8 100644 --- a/deal.II/deal.II/Makefile +++ b/deal.II/deal.II/Makefile @@ -69,24 +69,24 @@ else endif $(LIBDIR)/1d/%.g.o : - @echo =====deal.II====1d====debug======$(MT)== $(<:source/%=%) + @echo "=====deal.II====1d====debug======$(MT)== $(<:source/%=%)" @$(CXX) $(CXXFLAGS.g) -Ddeal_II_dimension=1 -c $< -o $@ $(LIBDIR)/1d/%.o : - @echo =====deal.II====1d====optimized==$(MT)== $(<:source/%=%) + @echo "=====deal.II====1d====optimized==$(MT)== $(<:source/%=%)" @$(CXX) $(CXXFLAGS.o) -Ddeal_II_dimension=1 -c $< -o $@ $(LIBDIR)/2d/%.g.o : - @echo =====deal.II====2d====debug======$(MT)== $(<:source/%=%) + @echo "=====deal.II====2d====debug======$(MT)== $(<:source/%=%)" @$(CXX) $(CXXFLAGS.g) -Ddeal_II_dimension=2 -c $< -o $@ $(LIBDIR)/2d/%.o : - @echo =====deal.II====2d====optimized==$(MT)== $(<:source/%=%) + @echo "=====deal.II====2d====optimized==$(MT)== $(<:source/%=%)" @$(CXX) $(CXXFLAGS.o) -Ddeal_II_dimension=2 -c $< -o $@ $(LIBDIR)/3d/%.g.o : - @echo =====deal.II====3d====debug======$(MT)== $(<:source/%=%) + @echo "=====deal.II====3d====debug======$(MT)== $(<:source/%=%)" @$(CXX) $(CXXFLAGS.g) -Ddeal_II_dimension=3 -c $< -o $@ $(LIBDIR)/3d/%.o : - @echo =====deal.II====3d====optimized==$(MT)== $(<:source/%=%) + @echo "=====deal.II====3d====optimized==$(MT)== $(<:source/%=%)" @$(CXX) $(CXXFLAGS.o) -Ddeal_II_dimension=3 -c $< -o $@ @@ -94,53 +94,53 @@ $(LIBDIR)/3d/%.o : # rules how to make the libraries themselves $(LIBDIR)/libdeal_II_1d.g.a: $(go-files-1d) - @echo =====deal.II====1d====debug======$(MT)== Linking library: $(@F) + @echo "=====deal.II====1d====debug======$(MT)== Linking library: $(@F)" @ar ru $@ $(go-files-1d) $(LIBDIR)/libdeal_II_1d.a: $(o-files-1d) - @echo =====deal.II====1d====optimized==$(MT)== Linking library: $(@F) + @echo "=====deal.II====1d====optimized==$(MT)== Linking library: $(@F)" @ar ru $@ $(o-files-1d) $(LIBDIR)/libdeal_II_2d.g.a: $(go-files-2d) - @echo =====deal.II====2d====debug======$(MT)== Linking library: $(@F) + @echo "=====deal.II====2d====debug======$(MT)== Linking library: $(@F)" @ar ru $@ $(go-files-2d) $(LIBDIR)/libdeal_II_2d.a: $(o-files-2d) - @echo =====deal.II====2d====optimized==$(MT)== Linking library: $(@F) + @echo "=====deal.II====2d====optimized==$(MT)== Linking library: $(@F)" @ar ru $@ $(o-files-2d) $(LIBDIR)/libdeal_II_3d.g.a: $(go-files-3d) - @echo =====deal.II====3d====debug======$(MT)== Linking library: $(@F) + @echo "=====deal.II====3d====debug======$(MT)== Linking library: $(@F)" @ar ru $@ $(go-files-3d) $(LIBDIR)/libdeal_II_3d.a: $(o-files-3d) - @echo =====deal.II====3d====optimized==$(MT)== Linking library: $(@F) + @echo "=====deal.II====3d====optimized==$(MT)== Linking library: $(@F)" @ar ru $@ $(o-files-3d) $(LIBDIR)/libdeal_II_1d.g.so: $(go-files-1d) - @echo =====deal.II====1d====debug======$(MT)== Linking library: $(@F) + @echo "=====deal.II====1d====debug======$(MT)== Linking library: $(@F)" @$(CC) $(LDFLAGS) -shared -o $@ $(go-files-1d) $(LIBDIR)/libdeal_II_1d.so: $(o-files-1d) - @echo =====deal.II====1d====optimized==$(MT)== Linking library: $(@F) + @echo "=====deal.II====1d====optimized==$(MT)== Linking library: $(@F)" @$(CC) $(LDFLAGS) -shared -o $@ $(o-files-1d) $(LIBDIR)/libdeal_II_2d.g.so: $(go-files-2d) - @echo =====deal.II====2d====debug======$(MT)== Linking library: $(@F) + @echo "=====deal.II====2d====debug======$(MT)== Linking library: $(@F)" @$(CC) $(LDFLAGS) -shared -o $@ $(go-files-2d) $(LIBDIR)/libdeal_II_2d.so: $(o-files-2d) - @echo =====deal.II====2d====optimized==$(MT)== Linking library: $(@F) + @echo "=====deal.II====2d====optimized==$(MT)== Linking library: $(@F)" @$(CC) $(LDFLAGS) -shared -o $@ $(o-files-2d) $(LIBDIR)/libdeal_II_3d.g.so: $(go-files-3d) - @echo =====deal.II====3d====debug======$(MT)== Linking library: $(@F) + @echo "=====deal.II====3d====debug======$(MT)== Linking library: $(@F)" @$(CC) $(LDFLAGS) -shared -o $@ $(go-files-3d) $(LIBDIR)/libdeal_II_3d.so: $(o-files-3d) - @echo =====deal.II====3d====optimized==$(MT)== Linking library: $(@F) + @echo "=====deal.II====3d====optimized==$(MT)== Linking library: $(@F)" @$(CC) $(LDFLAGS) -shared -o $@ $(o-files-3d) @@ -153,7 +153,7 @@ $(LIBDIR)/libdeal_II_3d.so: $(o-files-3d) #to remake this file upon inclusion at the bottom #of this file. Makefile.dep: $(cc-files) $(h-files) Makefile - @echo ============================ Remaking deal.II/Makefile + @echo "============================ Remaking deal.II/Makefile" @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) "-B\$$(LIBDIR)" $(cc-files) \ | $(PERL) -p -e 's!LIBDIR\)/(.*):!LIBDIR)/DIM_PLACEHOLDER/$$1:!g;' \ | $(PERL) -pe 's!((\.g)?.o):!_DIM_PLACEHOLDER$$1:!g;' \ diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile index da0f778eef..30f5aa6f6c 100644 --- a/deal.II/lac/Makefile +++ b/deal.II/lac/Makefile @@ -31,10 +31,10 @@ else endif $(LIBDIR)/lac/%.g.o : - @echo =====lac==============debug======$(MT)== $(