]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Add _2d or whatever to the base file name of each object file. The reason for this...
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 11 Dec 1998 09:29:22 +0000 (09:29 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 11 Dec 1998 09:29:22 +0000 (09:29 +0000)
git-svn-id: https://svn.dealii.org/trunk@696 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/source/Makefile

index bf93ecfe4a91f31bf918cd7734973100e9731c96..83ea91ab97d55316a61f82bf07b081f1b7d58089 100644 (file)
@@ -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
 
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.