From: wolf Date: Thu, 6 May 1999 18:32:20 +0000 (+0000) Subject: Split .o/.go files into two directories. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9547a01489e82d664c362a13521f2e9d8e6d295;p=dealii-svn.git Split .o/.go files into two directories. git-svn-id: https://svn.dealii.org/trunk@1289 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/source/Makefile b/deal.II/base/source/Makefile index d917203adf..d7c575ca9f 100644 --- a/deal.II/base/source/Makefile +++ b/deal.II/base/source/Makefile @@ -4,7 +4,7 @@ D=../.. cc-files = $(wildcard *.cc) o-files = $(addprefix ../lib/o/, $(cc-files:.cc=.o)) -go-files = $(addprefix ../lib/o/, $(cc-files:.cc=.go)) +go-files = $(addprefix ../lib/go/, $(cc-files:.cc=.go)) h-files = $(wildcard ../include/*/*.h) forward-declarations = $D/base/include/base/forward-declarations.h @@ -13,7 +13,7 @@ include $D/deal.II/Make.global_options -../lib/o/%.go : +../lib/go/%.go : @echo ============================ Compiling with debugging information: $< @$(CXX) $(CXXFLAGS.g) -c $< -o $@ ../lib/o/%.o : @@ -25,9 +25,11 @@ lib: ../lib/libbase.g.a ../lib/libbase.a ../lib/libbase.a: $(forward-declarations) $(o-files) + @echo ======================================== Updating library: $@ @ar ruv $@ $(o-files) ../lib/libbase.g.a: $(forward-declarations) $(go-files) + @echo ======================================== Updating library: $@ @ar ruv $@ $(go-files) clean: @@ -50,7 +52,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;' \ + | perl -p -e 's!^.*\((.*\.(g?o))\):!../lib/$$2/$$1:!g;' \ > ../lib/Makefile.dep else @echo ============================ Not remaking Makefile since in nested mode