From ebbec4932af41264b5793f23706952f226bedde5 Mon Sep 17 00:00:00 2001 From: wolf Date: Fri, 11 Dec 1998 09:29:22 +0000 Subject: [PATCH] Add _2d or whatever to the base file name of each object file. The reason for this is that we may sometimes want to use 2d *and* 3d libraries at the same time, but then there would be object files in them with the same name but different contents. This way, we can avoid such problems. git-svn-id: https://svn.dealii.org/trunk@696 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/deal.II/deal.II/source/Makefile b/deal.II/deal.II/source/Makefile index bf93ecfe4a..83ea91ab97 100644 --- a/deal.II/deal.II/source/Makefile +++ b/deal.II/deal.II/source/Makefile @@ -23,8 +23,8 @@ h-files = $(wildcard ../include/*/*.h) # would be the same for both debug and non-debug versions, if we # don't care about different directories tmp1 = $(notdir $(cc-files)) -o-files = $(addprefix ../lib/$(deal_II_dimension)d/o/, $(tmp1:.cc=.o) ) -go-files = $(addprefix ../lib/$(deal_II_dimension)d/go/, $(tmp1:.cc=.go)) +o-files = $(addprefix ../lib/$(deal_II_dimension)d/o/, $(tmp1:.cc=_$(deal_II_dimension)d.o) ) +go-files = $(addprefix ../lib/$(deal_II_dimension)d/go/, $(tmp1:.cc=_$(deal_II_dimension)d.go)) CXX = c++ @@ -89,11 +89,19 @@ clean: #we don't change the script but rather pipe its #result through another perl script to get what we #want. +# +#Next addition: replace .g?o by _2d.g?o or whatever +#the dimension is, because we want to have unique +#object file names in the libraries in order to write +#programs which use the 2d *and* the 3d library; +#if the files within these libraries had the same names, +#we may get into trouble. ../lib/Makefile.dep: $(cc-files) $(h-files) Makefile ../Make.global_options @echo ============================ Remaking Makefile @perl ../Make_dep.pl ../lib/libgrid $(INCLUDE) $(cc-files) \ | perl -p -e 's!^.*\(.*/(.*)\):!../lib/$(deal_II_dimension)d/$$1:!g;' \ | perl -pe 's!(/[^/]+\.(o|go)):!/$$2$$1:!g;' \ + | perl -pe 's!(\.g?o)!_$(deal_II_dimension)d$$1!g;' \ > ../lib/Makefile.dep -- 2.39.5