From: Wolfgang Bangerth Date: Sun, 24 May 1998 21:13:30 +0000 (+0000) Subject: Externalize compiler options out of subdirectories into a central repository. X-Git-Tag: v8.0.0~22908 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6485282a59d9be4427d64e32e2c4d129a86bb89;p=dealii.git Externalize compiler options out of subdirectories into a central repository. git-svn-id: https://svn.dealii.org/trunk@346 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/Attic/examples/convergence/Makefile b/deal.II/deal.II/Attic/examples/convergence/Makefile index 17bc9597f5..5361794214 100644 --- a/deal.II/deal.II/Attic/examples/convergence/Makefile +++ b/deal.II/deal.II/Attic/examples/convergence/Makefile @@ -36,25 +36,7 @@ delete-files = gnuplot* *.eps ############################################################################### # Internals -CXX = c++ -INCLUDE = -I../../include -I../../../lac/include \ - -I../../../base/include -I../../../mia/include -CXXFLAGS.g= -DDEBUG -g -Wall -W -pedantic -Wconversion \ - -Winline -Woverloaded-virtual -fno-rtti -fno-exceptions \ - $(INCLUDE) -CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ - -funroll-loops -felide-constructors -fnonnull-objects \ - -fno-rtti -fno-exceptions $(INCLUDE) - - -# if on specific systems, change compiler path -ifeq ($(shell uname),Linux) -CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ -endif - -ifeq ($(shell uname),SunOS) -CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ -endif +include ../../Make.global_options # get lists of files we need diff --git a/deal.II/deal.II/Attic/examples/dof/Makefile b/deal.II/deal.II/Attic/examples/dof/Makefile index d9e9c6c501..5c2be0e318 100644 --- a/deal.II/deal.II/Attic/examples/dof/Makefile +++ b/deal.II/deal.II/Attic/examples/dof/Makefile @@ -36,25 +36,7 @@ delete-files = grid* sparsity* *.eps ############################################################################### # Internals -CXX = c++ -INCLUDE = -I../../include -I../../../lac/include \ - -I../../../base/include -I../../../mia/include -CXXFLAGS.g= -DDEBUG -g -Wall -W -pedantic -Wconversion \ - -Winline -Woverloaded-virtual -fno-rtti -fno-exceptions \ - $(INCLUDE) -CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ - -funroll-loops -felide-constructors -fnonnull-objects \ - -fno-rtti -fno-exceptions $(INCLUDE) - - -# if on specific systems, change compiler path -ifeq ($(shell uname),Linux) -CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ -endif - -ifeq ($(shell uname),SunOS) -CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ -endif +include ../../Make.global_options # get lists of files we need diff --git a/deal.II/deal.II/Attic/examples/error-estimation/Makefile b/deal.II/deal.II/Attic/examples/error-estimation/Makefile index 3a85970222..d821180ebf 100644 --- a/deal.II/deal.II/Attic/examples/error-estimation/Makefile +++ b/deal.II/deal.II/Attic/examples/error-estimation/Makefile @@ -41,25 +41,7 @@ delete-files = data-*/* ############################################################################### # Internals -CXX = c++ -INCLUDE = -I../../include -I../../../lac/include \ - -I../../../base/include -I../../../mia/include -CXXFLAGS.g= -DDEBUG -g -Wall -W -pedantic -Wconversion \ - -Winline -Woverloaded-virtual -fno-rtti -fno-exceptions \ - $(INCLUDE) -CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ - -funroll-loops -felide-constructors -fnonnull-objects \ - -fno-rtti -fno-exceptions $(INCLUDE) - - -# if on specific systems, change compiler path -ifeq ($(shell uname),Linux) -CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ -endif - -ifeq ($(shell uname),SunOS) -CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ -endif +include ../../Make.global_options # get lists of files we need diff --git a/deal.II/deal.II/Attic/examples/grid/Makefile b/deal.II/deal.II/Attic/examples/grid/Makefile index e342a03c41..a16569986e 100644 --- a/deal.II/deal.II/Attic/examples/grid/Makefile +++ b/deal.II/deal.II/Attic/examples/grid/Makefile @@ -36,25 +36,7 @@ delete-files = grid.? *.eps ############################################################################### # Internals -CXX = c++ -INCLUDE = -I../../include -I../../../lac/include \ - -I../../../base/include -I../../../mia/include -CXXFLAGS.g= -DDEBUG -g -Wall -W -pedantic -Wconversion \ - -Winline -Woverloaded-virtual -fno-rtti -fno-exceptions \ - $(INCLUDE) -CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ - -funroll-loops -felide-constructors -fnonnull-objects \ - -fno-rtti -fno-exceptions $(INCLUDE) - - -# if on specific systems, change compiler path -ifeq ($(shell uname),Linux) -CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ -endif - -ifeq ($(shell uname),SunOS) -CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ -endif +include ../../Make.global_options # get lists of files we need diff --git a/deal.II/deal.II/Attic/examples/poisson/Makefile b/deal.II/deal.II/Attic/examples/poisson/Makefile index 1093926d2c..6c3cbc83fb 100644 --- a/deal.II/deal.II/Attic/examples/poisson/Makefile +++ b/deal.II/deal.II/Attic/examples/poisson/Makefile @@ -36,25 +36,7 @@ delete-files = gnuplot* *.eps ############################################################################### # Internals -CXX = c++ -INCLUDE = -I../../include -I../../../lac/include \ - -I../../../base/include -I../../../mia/include -CXXFLAGS.g= -DDEBUG -g -Wall -W -pedantic -Wconversion \ - -Winline -Woverloaded-virtual -fno-rtti -fno-exceptions \ - $(INCLUDE) -CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ - -funroll-loops -felide-constructors -fnonnull-objects \ - -fno-rtti -fno-exceptions $(INCLUDE) - - -# if on specific systems, change compiler path -ifeq ($(shell uname),Linux) -CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ -endif - -ifeq ($(shell uname),SunOS) -CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ -endif +include ../../Make.global_options # get lists of files we need diff --git a/deal.II/deal.II/Make.global_options b/deal.II/deal.II/Make.global_options new file mode 100644 index 0000000000..482794363a --- /dev/null +++ b/deal.II/deal.II/Make.global_options @@ -0,0 +1,21 @@ +# $Id$ +# Global options for all compilations + + +CXX = c++ +INCLUDE = -I../../include -I../../../lac/include \ + -I../../../base/include -I../../../mia/include +CXXFLAGS.g= -DDEBUG -g -Wall -W -pedantic -Wconversion \ + -Winline -Woverloaded-virtual -fno-rtti -fno-exceptions \ + $(INCLUDE) +CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ + -funroll-loops -felide-constructors -fnonnull-objects \ + -pg -fno-rtti -fno-exceptions $(INCLUDE) + +ifeq ($(shell uname),Linux) +CXX = /home/wolf/bin/gcc/bin/c++ +endif + +ifeq ($(shell uname),SunOS) +CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ +endif diff --git a/tests/big-tests/convergence/Makefile b/tests/big-tests/convergence/Makefile index 17bc9597f5..5361794214 100644 --- a/tests/big-tests/convergence/Makefile +++ b/tests/big-tests/convergence/Makefile @@ -36,25 +36,7 @@ delete-files = gnuplot* *.eps ############################################################################### # Internals -CXX = c++ -INCLUDE = -I../../include -I../../../lac/include \ - -I../../../base/include -I../../../mia/include -CXXFLAGS.g= -DDEBUG -g -Wall -W -pedantic -Wconversion \ - -Winline -Woverloaded-virtual -fno-rtti -fno-exceptions \ - $(INCLUDE) -CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ - -funroll-loops -felide-constructors -fnonnull-objects \ - -fno-rtti -fno-exceptions $(INCLUDE) - - -# if on specific systems, change compiler path -ifeq ($(shell uname),Linux) -CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ -endif - -ifeq ($(shell uname),SunOS) -CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ -endif +include ../../Make.global_options # get lists of files we need diff --git a/tests/big-tests/dof/Makefile b/tests/big-tests/dof/Makefile index d9e9c6c501..5c2be0e318 100644 --- a/tests/big-tests/dof/Makefile +++ b/tests/big-tests/dof/Makefile @@ -36,25 +36,7 @@ delete-files = grid* sparsity* *.eps ############################################################################### # Internals -CXX = c++ -INCLUDE = -I../../include -I../../../lac/include \ - -I../../../base/include -I../../../mia/include -CXXFLAGS.g= -DDEBUG -g -Wall -W -pedantic -Wconversion \ - -Winline -Woverloaded-virtual -fno-rtti -fno-exceptions \ - $(INCLUDE) -CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ - -funroll-loops -felide-constructors -fnonnull-objects \ - -fno-rtti -fno-exceptions $(INCLUDE) - - -# if on specific systems, change compiler path -ifeq ($(shell uname),Linux) -CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ -endif - -ifeq ($(shell uname),SunOS) -CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ -endif +include ../../Make.global_options # get lists of files we need diff --git a/tests/big-tests/error-estimation/Makefile b/tests/big-tests/error-estimation/Makefile index 3a85970222..d821180ebf 100644 --- a/tests/big-tests/error-estimation/Makefile +++ b/tests/big-tests/error-estimation/Makefile @@ -41,25 +41,7 @@ delete-files = data-*/* ############################################################################### # Internals -CXX = c++ -INCLUDE = -I../../include -I../../../lac/include \ - -I../../../base/include -I../../../mia/include -CXXFLAGS.g= -DDEBUG -g -Wall -W -pedantic -Wconversion \ - -Winline -Woverloaded-virtual -fno-rtti -fno-exceptions \ - $(INCLUDE) -CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ - -funroll-loops -felide-constructors -fnonnull-objects \ - -fno-rtti -fno-exceptions $(INCLUDE) - - -# if on specific systems, change compiler path -ifeq ($(shell uname),Linux) -CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ -endif - -ifeq ($(shell uname),SunOS) -CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ -endif +include ../../Make.global_options # get lists of files we need diff --git a/tests/big-tests/grid/Makefile b/tests/big-tests/grid/Makefile index e342a03c41..a16569986e 100644 --- a/tests/big-tests/grid/Makefile +++ b/tests/big-tests/grid/Makefile @@ -36,25 +36,7 @@ delete-files = grid.? *.eps ############################################################################### # Internals -CXX = c++ -INCLUDE = -I../../include -I../../../lac/include \ - -I../../../base/include -I../../../mia/include -CXXFLAGS.g= -DDEBUG -g -Wall -W -pedantic -Wconversion \ - -Winline -Woverloaded-virtual -fno-rtti -fno-exceptions \ - $(INCLUDE) -CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ - -funroll-loops -felide-constructors -fnonnull-objects \ - -fno-rtti -fno-exceptions $(INCLUDE) - - -# if on specific systems, change compiler path -ifeq ($(shell uname),Linux) -CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ -endif - -ifeq ($(shell uname),SunOS) -CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ -endif +include ../../Make.global_options # get lists of files we need diff --git a/tests/big-tests/poisson/Makefile b/tests/big-tests/poisson/Makefile index 1093926d2c..6c3cbc83fb 100644 --- a/tests/big-tests/poisson/Makefile +++ b/tests/big-tests/poisson/Makefile @@ -36,25 +36,7 @@ delete-files = gnuplot* *.eps ############################################################################### # Internals -CXX = c++ -INCLUDE = -I../../include -I../../../lac/include \ - -I../../../base/include -I../../../mia/include -CXXFLAGS.g= -DDEBUG -g -Wall -W -pedantic -Wconversion \ - -Winline -Woverloaded-virtual -fno-rtti -fno-exceptions \ - $(INCLUDE) -CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ - -funroll-loops -felide-constructors -fnonnull-objects \ - -fno-rtti -fno-exceptions $(INCLUDE) - - -# if on specific systems, change compiler path -ifeq ($(shell uname),Linux) -CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ -endif - -ifeq ($(shell uname),SunOS) -CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ -endif +include ../../Make.global_options # get lists of files we need