]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Name object files .g.o instead of .go.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 11 Feb 2002 09:26:15 +0000 (09:26 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 11 Feb 2002 09:26:15 +0000 (09:26 +0000)
git-svn-id: https://svn.dealii.org/trunk@5489 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/base/Makefile
deal.II/common/scripts/make_dependencies.pl
deal.II/deal.II/Makefile
deal.II/doc/news/2002/c-3-3.html
deal.II/lac/Makefile

index d70ff1cdf301931643d498e068aeeacfaa836a20..09415938116f7032b5148444b874b0fca740610e 100644 (file)
@@ -19,7 +19,7 @@ o-files-base2= $(filter-out %data_out_base.o, $(o-files-base1)) \
                $(patsubst %.o,%_4d.o,$(filter %data_out_base.o, $(o-files-base1)))
 o-files-base3= $(sort $(o-files-base2))
 o-files      = $(o-files-base3)
-go-files     = $(o-files-base3:.o=.go)
+go-files     = $(o-files-base3:.o=.g.o)
 h-files      = $(sort $(shell echo include/base/*.h))
 
 forward-declarations = $D/base/include/base/forward_declarations.h
@@ -55,7 +55,7 @@ else
   MT = ==
 endif
 
-$(LIBDIR)/base/%.go :
+$(LIBDIR)/base/%.g.o :
        @echo =====base=============debug======$(MT)== $(<F) \
              "   " $(patsubst -Ddata_out_dimension=%,dimension=%,$(maybe-define-dimension))
        @$(CXX) $(CXXFLAGS.g) $(maybe-define-dimension) -c $< -o $@
@@ -113,7 +113,7 @@ clean:
 Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile
        @echo ============================ Remaking Makefile
        @$(PERL) $D/common/scripts/make_dependencies.pl $(INCLUDE) "-B\$$(LIBDIR)/base" $(cc-files) \
-               | $(PERL) -p -e 's!(.*/base/data_out_base)(.g?o)!$$1_1d$$2 $$1_2d$$2 $$1_3d$$2 $$1_4d$$2!g;' \
+               | $(PERL) -p -e 's!(.*/base/data_out_base)((.g)?.o)!$$1_1d$$2 $$1_2d$$2 $$1_3d$$2 $$1_4d$$2!g;' \
                > Makefile.dep
 
 
index 17fe473b8c98cf7910f7ab6504f045d3e5fcb1a8..fdcdb08891c2e42132f8ba55363c8b1edc8b9981 100644 (file)
@@ -11,7 +11,7 @@
 #number of pathes). The output looks like this:
 #
 #lib/o/.o-file: file included_files
-#lib/go/.go-file: file included_files
+#lib/go/.g.o-file: file included_files
 
 #Author: Wolfgang Bangerth, 1998, 1999, 2000, 2001, 2002
 
@@ -81,7 +81,7 @@ foreach $file (@input_files) {
     print "\n";
 
     # write rule for the .go file
-    print "$basepath/$basename.go:";
+    print "$basepath/$basename.g.o:";
     print "\\\n    $file";
     foreach $f (@include_file_list) {
        print "\\\n    $f";
index 4a69fe06fadb3a88416c4b8a9058e770bfcebf6e..a9d0634b34d441301d2bf2d83d115519e93fe9a5 100644 (file)
@@ -48,11 +48,11 @@ forward-declarations = $D/deal.II/include/grid/forward_declarations.h
 # don't care about different directories
 tmp1        = $(notdir $(cc-files))
 o-files-1d  = $(addprefix $(LIBDIR)/1d/, $(tmp1:.cc=_1d.o) )
-go-files-1d = $(addprefix $(LIBDIR)/1d/, $(tmp1:.cc=_1d.go))
+go-files-1d = $(addprefix $(LIBDIR)/1d/, $(tmp1:.cc=_1d.g.o))
 o-files-2d  = $(addprefix $(LIBDIR)/2d/, $(tmp1:.cc=_2d.o) )
-go-files-2d = $(addprefix $(LIBDIR)/2d/, $(tmp1:.cc=_2d.go))
+go-files-2d = $(addprefix $(LIBDIR)/2d/, $(tmp1:.cc=_2d.g.o))
 o-files-3d  = $(addprefix $(LIBDIR)/3d/, $(tmp1:.cc=_3d.o) )
-go-files-3d = $(addprefix $(LIBDIR)/3d/, $(tmp1:.cc=_3d.go))
+go-files-3d = $(addprefix $(LIBDIR)/3d/, $(tmp1:.cc=_3d.g.o))
 
 o-files  = $(o-files-1d)  $(o-files-2d)  $(o-files-3d)
 go-files = $(go-files-1d) $(go-files-2d) $(go-files-3d)
@@ -67,21 +67,21 @@ else
   MT = ==
 endif
 
-$(LIBDIR)/1d/%.go :
+$(LIBDIR)/1d/%.g.o :
        @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/%=%)
        @$(CXX) $(CXXFLAGS.o) -Ddeal_II_dimension=1 -c $< -o $@
 
-$(LIBDIR)/2d/%.go :
+$(LIBDIR)/2d/%.g.o :
        @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/%=%)
        @$(CXX) $(CXXFLAGS.o) -Ddeal_II_dimension=2 -c $< -o $@
 
-$(LIBDIR)/3d/%.go :
+$(LIBDIR)/3d/%.g.o :
        @echo =====deal.II====3d====debug======$(MT)== $(<:source/%=%)
        @$(CXX) $(CXXFLAGS.g) -Ddeal_II_dimension=3 -c $< -o $@
 $(LIBDIR)/3d/%.o :
@@ -155,7 +155,7 @@ Makefile.dep: $(cc-files) $(forward-declarations) $(h-files) Makefile
        @echo ============================ Remaking 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;' \
+               | $(PERL) -pe 's!((\.g)?.o):!_DIM_PLACEHOLDER$$1:!g;' \
                | $(PERL) -pe 's!^(.*)/DIM_PLACEHOLDER/(.*)_DIM_PLACEHOLDER(\..*):!$$1/1d/$$2_1d$$3 $$1/2d/$$2_2d$$3 $$1/3d/$$2_3d$$3:!g;'\
                > Makefile.dep
 
index 3798092656d87a79e07de0579a9c109258333890..13b4b3d3c87b967f79d3138a527070177922b997 100644 (file)
@@ -26,6 +26,15 @@ documentation, etc</a>.
 <h3>General</h3>
 
 <ol>
+  <li> <p> Changed: The build system was entirely revised. Object
+       files in debug more now have the suffix <code>.g.o</code>
+       instead of <code>.go</code>. All object files from the
+       subdirectories are now placed into the <code>/lib</code>
+       top-level directory, rather than in library directories in the
+       individual subdirs.
+       <br>
+       (WB 2002/02/1)
+       </p>
 </ol>
 
 
index 951ab6b68b3777e5133a674b98a02a5c82e02923..2fd841f0cfa8b925c729b782fc12f83e0043179d 100644 (file)
@@ -14,7 +14,7 @@ o-files-base1= $(addprefix $(LIBDIR)/lac/, $(patsubst source/%,%,$(cc-files:.cc=
 o-files-base2= $(filter-out %data_out_base.o, $(o-files-base1))
 o-files-base3= $(sort $(o-files-base2))
 o-files      = $(o-files-base3)
-go-files     = $(o-files-base3:.o=.go)
+go-files     = $(o-files-base3:.o=.g.o)
 h-files      = $(sort $(shell echo include/lac/*.h))
 
 forward-declarations = $D/lac/include/lac/forward_declarations.h
@@ -30,7 +30,7 @@ else
   MT = ==
 endif
 
-$(LIBDIR)/lac/%.go :
+$(LIBDIR)/lac/%.g.o :
        @echo =====lac==============debug======$(MT)== $(<F)
        @$(CXX) $(CXXFLAGS.g) -c $< -o $@
 $(LIBDIR)/lac/%.o :

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.