From 6644229575030c2de52c39b57966ad9d4aa099b2 Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 4 Aug 1999 15:15:34 +0000 Subject: [PATCH] Remove the Make.global_options file from the deal.II directory and use the similar one in /common. Update the latter. git-svn-id: https://svn.dealii.org/trunk@1624 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/source/Makefile | 4 ++-- deal.II/common/Make.global_options | 19 ++++++++++--------- deal.II/deal.II/Make.global_options | 26 -------------------------- deal.II/deal.II/source/Makefile | 12 ++++++------ deal.II/lac/source/Makefile | 4 ++-- 5 files changed, 20 insertions(+), 45 deletions(-) delete mode 100644 deal.II/deal.II/Make.global_options diff --git a/deal.II/base/source/Makefile b/deal.II/base/source/Makefile index 09d1cb94a0..c48d13c346 100644 --- a/deal.II/base/source/Makefile +++ b/deal.II/base/source/Makefile @@ -19,7 +19,7 @@ h-files = $(wildcard ../include/*/*.h) forward-declarations = $D/base/include/base/forward-declarations.h -include $D/deal.II/Make.global_options +include $D/common/Make.global_options # urgh, this is a weird hack, since this function uses the $@ variable @@ -50,7 +50,7 @@ maybe-define-dimension = $(patsubst %,-Ddata_out_dimension=%,$(maybe-define-dim ../lib/o/%.o : @echo =================== Compiling with optimization: $< \ " " $(patsubst -Ddata_out_dimension=%,dimension=%,$(maybe-define-dimension)) - @$(CXX) $(CXXFLAGS) $(maybe-define-dimension) -c $< -o $@ + @$(CXX) $(CXXFLAGS.o) $(maybe-define-dimension) -c $< -o $@ lib: ../lib/libbase.g.a ../lib/libbase.a diff --git a/deal.II/common/Make.global_options b/deal.II/common/Make.global_options index d8a27b5424..88d519046a 100644 --- a/deal.II/common/Make.global_options +++ b/deal.II/common/Make.global_options @@ -13,20 +13,21 @@ vpath %.a $D/deal.II/lib CXX = c++ INCLUDE = -I$D/deal.II/include -I$D/lac/include \ -I$D/base/include -CXXFLAGS.g= -DDEBUG -ggdb -Wall -W -Wconversion \ +CXXFLAGS.g= -ansi -DDEBUG -ggdb -Wall -W -Wconversion \ -Winline -Woverloaded-virtual -fno-builtin\ - -fno-vtable-thunks \ + -fno-vtable-thunks -ftemplate-depth-32\ $(INCLUDE) CXXFLAGS.o= -O2 -Wuninitialized -ffast-math \ -felide-constructors -fnonnull-objects \ - -fno-vtable-thunks \ + -fno-vtable-thunks -ftemplate-depth-32\ $(INCLUDE) -%.go : %.cc #Makefile - @echo =====debug========= $< - @$(CXX) $(flags) -c $< -o $@ -%.o : %.cc #Makefile - @echo =====optimized===== $< - @$(CXX) $(flags) -c $< -o $@ +#%.go : %.cc #Makefile +# @echo =====debug========= $< +# @$(CXX) $(flags) -c $< -o $@ +#%.o : %.cc #Makefile +# @echo =====optimized===== $< +# @$(CXX) $(flags) -c $< -o $@ + diff --git a/deal.II/deal.II/Make.global_options b/deal.II/deal.II/Make.global_options deleted file mode 100644 index 2196b97753..0000000000 --- a/deal.II/deal.II/Make.global_options +++ /dev/null @@ -1,26 +0,0 @@ -# $Id$ -# Copyright W. Bangerth, G. Kanschat, University of Heidelberg, 1998, 1999 - -# This file uses the variable $D, which is the deal home directory, -# that is, the parent directory of this directory. -# -# Please set $D to the right path before including this file! - -vpath %.a $D/base/lib -vpath %.a $D/lac/lib -vpath %.a $D/deal.II/lib - -CXX = c++ -INCLUDE = -I$D/deal.II/include -I$D/lac/include \ - -I$D/base/include -CXXFLAGS.g= -ansi -DDEBUG -ggdb -Wall -W -Wconversion \ - -Winline -Woverloaded-virtual -fno-builtin\ - -fno-vtable-thunks -ftemplate-depth-32\ - $(INCLUDE) -CXXFLAGS =-O2 -Wuninitialized -ffast-math \ - -felide-constructors -fnonnull-objects \ - -fno-vtable-thunks -ftemplate-depth-32\ - $(INCLUDE) - - - diff --git a/deal.II/deal.II/source/Makefile b/deal.II/deal.II/source/Makefile index 96063a22a6..82f164b3a7 100644 --- a/deal.II/deal.II/source/Makefile +++ b/deal.II/deal.II/source/Makefile @@ -17,7 +17,7 @@ h-files = $(wildcard ../include/*/*.h) forward-declarations = $D/deal.II/include/basic/forward-declarations.h -include $D/deal.II/Make.global_options +include $D/common/Make.global_options @@ -66,26 +66,26 @@ debug: 2dg 1dg 3dg @$(CXX) $(CXXFLAGS.g) -Ddeal_II_dimension=1 -c $< -o $@ ../lib/1d/o/%.o : @echo ==============1d======optimized========= $< - @$(CXX) $(CXXFLAGS) -Ddeal_II_dimension=1 -c $< -o $@ + @$(CXX) $(CXXFLAGS.o) -Ddeal_II_dimension=1 -c $< -o $@ ../lib/2d/go/%.go : @echo ==============2d======debug============= $< @$(CXX) $(CXXFLAGS.g) -Ddeal_II_dimension=2 -c $< -o $@ ../lib/2d/o/%.o : @echo ==============2d======optimized========= $< - @$(CXX) $(CXXFLAGS) -Ddeal_II_dimension=2 -c $< -o $@ + @$(CXX) $(CXXFLAGS.o) -Ddeal_II_dimension=2 -c $< -o $@ ../lib/3d/go/%.go : @echo ==============3d======debug============= $< @$(CXX) $(CXXFLAGS.g) -Ddeal_II_dimension=3 -c $< -o $@ ../lib/3d/o/%.o : @echo ==============3d======optimized========= $< - @$(CXX) $(CXXFLAGS) -Ddeal_II_dimension=3 -c $< -o $@ + @$(CXX) $(CXXFLAGS.o) -Ddeal_II_dimension=3 -c $< -o $@ # special rules for exceptional files ../lib/3d/o/q1_mapping_jacobians_3d.o: @echo "==============3d======opt==(special)====" $< - @$(CXX) $(filter-out -O2 -Wuninitialized,$(CXXFLAGS)) -Ddeal_II_dimension=3 -c $< -o $@ + @$(CXX) $(filter-out -O2 -Wuninitialized,$(CXXFLAGS.o)) -Ddeal_II_dimension=3 -c $< -o $@ @@ -163,7 +163,7 @@ clean: #Makefile.dep, which this rule won't see, so we end up #generating it twice. therefore: do nothing if in a nested #make -../lib/Makefile.dep: $(cc-files) $(h-files) $(forward-declarations) Makefile ../Make.global_options +../lib/Makefile.dep: $(cc-files) $(h-files) $(forward-declarations) Makefile ../../common/Make.global_options ifneq (1,${recursive-make-fwd-decl}) @echo ============================ Remaking Makefile @echo "# This Makefile was automatically generated by ../source/Makefile" \ diff --git a/deal.II/lac/source/Makefile b/deal.II/lac/source/Makefile index 1e318a4907..19aaf3aecc 100644 --- a/deal.II/lac/source/Makefile +++ b/deal.II/lac/source/Makefile @@ -9,7 +9,7 @@ h-files = $(wildcard ../include/*/*.h) forward-declarations = $D/lac/include/lac/forward-declarations.h -include $D/deal.II/Make.global_options +include $D/common/Make.global_options ../lib/go/%.go : @@ -17,7 +17,7 @@ include $D/deal.II/Make.global_options @$(CXX) $(CXXFLAGS.g) -c $< -o $@ ../lib/o/%.o : @echo ============================ Compiling with optimization: $< - @$(CXX) $(CXXFLAGS) -c $< -o $@ + @$(CXX) $(CXXFLAGS.o) -c $< -o $@ lib: ../lib/liblac.g.a ../lib/liblac.a -- 2.39.5