From: wolf Date: Thu, 6 May 1999 09:07:53 +0000 (+0000) Subject: Enable make to use more than one process when creating the libraries in these directo... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cfa9bbb76d2c2fac8f22c9cca63d15ab926991e;p=dealii-svn.git Enable make to use more than one process when creating the libraries in these directories as well (has been done for /deal.II a long time ago, but I never got to the other directories). git-svn-id: https://svn.dealii.org/trunk@1283 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/source/Makefile b/deal.II/base/source/Makefile index 0378f77d32..d917203adf 100644 --- a/deal.II/base/source/Makefile +++ b/deal.II/base/source/Makefile @@ -3,8 +3,8 @@ D=../.. cc-files = $(wildcard *.cc) -o-files = $(cc-files:.cc=.o) -go-files = $(cc-files:.cc=.go) +o-files = $(addprefix ../lib/o/, $(cc-files:.cc=.o)) +go-files = $(addprefix ../lib/o/, $(cc-files:.cc=.go)) h-files = $(wildcard ../include/*/*.h) forward-declarations = $D/base/include/base/forward-declarations.h @@ -13,23 +13,25 @@ include $D/deal.II/Make.global_options -%.go : %.cc Makefile - @echo ======== DEBUG =================== $< +../lib/o/%.go : + @echo ============================ Compiling with debugging information: $< @$(CXX) $(CXXFLAGS.g) -c $< -o $@ -%.o : %.cc Makefile - @echo ======== OPTIMIZE ================ $< +../lib/o/%.o : + @echo ============================ Compiling with optimization: $< @$(CXX) $(CXXFLAGS) -c $< -o $@ -lib: lib.g.a lib.a +lib: ../lib/libbase.g.a ../lib/libbase.a -lib.a: $(forward-declarations) ../lib/libbase.a($(o-files)) +../lib/libbase.a: $(forward-declarations) $(o-files) + @ar ruv $@ $(o-files) -lib.g.a: $(forward-declarations) ../lib/libbase.g.a($(go-files)) +../lib/libbase.g.a: $(forward-declarations) $(go-files) + @ar ruv $@ $(go-files) clean: - rm -f *.o *.go *~ Makefile.dep ../lib/lib* + rm -f ../lib/o/*.o ../lib/o/*.go *~ ../lib/Makefile.dep ../lib/lib* @@ -48,6 +50,7 @@ clean: ifneq (1,${recursive-make-fwd-decl}) @echo ============================ Remaking Makefile @perl ../Make_dep.pl ../lib/libbase $(INCLUDE) $(cc-files) \ + | perl -p -e 's!^.*\((.*)\):!../lib/o/$$1:!g;' \ > ../lib/Makefile.dep else @echo ============================ Not remaking Makefile since in nested mode diff --git a/deal.II/lac/source/Makefile b/deal.II/lac/source/Makefile index f9d7608a1c..d59ead60ed 100644 --- a/deal.II/lac/source/Makefile +++ b/deal.II/lac/source/Makefile @@ -3,8 +3,8 @@ D=../.. cc-files = $(wildcard *.cc) -o-files = $(cc-files:.cc=.o) -go-files = $(cc-files:.cc=.go) +o-files = $(addprefix ../lib/o/, $(cc-files:.cc=.o)) +go-files = $(addprefix ../lib/o/, $(cc-files:.cc=.go)) h-files = $(wildcard ../include/*/*.h) forward-declarations = $D/lac/include/lac/forward-declarations.h @@ -12,23 +12,25 @@ forward-declarations = $D/lac/include/lac/forward-declarations.h include $D/deal.II/Make.global_options -%.go : %.cc Makefile +../lib/o/%.go : @echo ============================ Compiling with debugging information: $< - @$(CXX) $(CXXFLAGS.g) -c $< -o $@ -%.o : %.cc Makefile + $(CXX) $(CXXFLAGS.g) -c $< -o $@ +../lib/o/%.o : @echo ============================ Compiling with optimization: $< @$(CXX) $(CXXFLAGS) -c $< -o $@ -lib: lib.g.a lib.a +lib: ../lib/liblac.g.a ../lib/liblac.a -lib.a: $(forward-declarations) ../lib/liblac.a($(o-files)) +../lib/liblac.a: $(forward-declarations) $(o-files) + @ar ruv $@ $(o-files) -lib.g.a: $(forward-declarations) ../lib/liblac.g.a($(go-files)) +../lib/liblac.g.a: $(forward-declarations) $(go-files) + @ar ruv $@ $(go-files) clean: - rm -f *.o *.go *~ Makefile.dep ../lib/lib* + rm -f ../lib/o/*.o ../lib/o/*.go *~ Makefile.dep ../lib/lib* @@ -48,7 +50,8 @@ clean: ../lib/Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile ifneq (1,${recursive-make-fwd-decl}) @echo ============================ Remaking Makefile - @perl ../Make_dep.pl ../lib/liblac $(INCLUDE) $(cc-files) \ + @perl ../Make_dep.pl ../lib/liblac $(INCLUDE) $(cc-files) \ + | perl -p -e 's!^.*\((.*)\):!../lib/o/$$1:!g;' \ > ../lib/Makefile.dep else @echo ============================ Not remaking Makefile since in nested mode