From 1eee0becdabab735c9548dc99806ec7da5ee2591 Mon Sep 17 00:00:00 2001 From: wolf Date: Mon, 11 Feb 2002 09:26:15 +0000 Subject: [PATCH] Name object files .g.o instead of .go. git-svn-id: https://svn.dealii.org/trunk@5489 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/Makefile | 6 +++--- deal.II/common/scripts/make_dependencies.pl | 4 ++-- deal.II/deal.II/Makefile | 14 +++++++------- deal.II/doc/news/2002/c-3-3.html | 9 +++++++++ deal.II/lac/Makefile | 4 ++-- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/deal.II/base/Makefile b/deal.II/base/Makefile index d70ff1cdf3..0941593811 100644 --- a/deal.II/base/Makefile +++ b/deal.II/base/Makefile @@ -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)== $( Makefile.dep diff --git a/deal.II/common/scripts/make_dependencies.pl b/deal.II/common/scripts/make_dependencies.pl index 17fe473b8c..fdcdb08891 100644 --- a/deal.II/common/scripts/make_dependencies.pl +++ b/deal.II/common/scripts/make_dependencies.pl @@ -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"; diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile index 4a69fe06fa..a9d0634b34 100644 --- a/deal.II/deal.II/Makefile +++ b/deal.II/deal.II/Makefile @@ -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 diff --git a/deal.II/doc/news/2002/c-3-3.html b/deal.II/doc/news/2002/c-3-3.html index 3798092656..13b4b3d3c8 100644 --- a/deal.II/doc/news/2002/c-3-3.html +++ b/deal.II/doc/news/2002/c-3-3.html @@ -26,6 +26,15 @@ documentation, etc.

General

    +
  1. Changed: The build system was entirely revised. Object + files in debug more now have the suffix .g.o + instead of .go. All object files from the + subdirectories are now placed into the /lib + top-level directory, rather than in library directories in the + individual subdirs. +
    + (WB 2002/02/1) +

diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile index 951ab6b68b..2fd841f0cf 100644 --- a/deal.II/lac/Makefile +++ b/deal.II/lac/Makefile @@ -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)== $(