From: Wolfgang Bangerth Date: Sun, 24 May 1998 21:01:32 +0000 (+0000) Subject: Make Makefile use better suited paths to my local compiler. X-Git-Tag: v8.0.0~22917 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=392eb3fb905a6b0fc992b52ec16999e0c6e8da58;p=dealii.git Make Makefile use better suited paths to my local compiler. git-svn-id: https://svn.dealii.org/trunk@337 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/fe/Makefile b/deal.II/deal.II/source/fe/Makefile index 09ead1b63a..deac366808 100644 --- a/deal.II/deal.II/source/fe/Makefile +++ b/deal.II/deal.II/source/fe/Makefile @@ -1,22 +1,6 @@ # $Id$ -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) - -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 cc-files = $(wildcard *.cc) diff --git a/deal.II/deal.II/source/grid/Makefile b/deal.II/deal.II/source/grid/Makefile index d2c8d84ce7..b4793b6e2d 100644 --- a/deal.II/deal.II/source/grid/Makefile +++ b/deal.II/deal.II/source/grid/Makefile @@ -1,22 +1,6 @@ # $Id$ -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) - -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 cc-files = $(wildcard *.cc) diff --git a/deal.II/deal.II/source/numerics/Makefile b/deal.II/deal.II/source/numerics/Makefile index 71aa9021f2..150e4287ff 100644 --- a/deal.II/deal.II/source/numerics/Makefile +++ b/deal.II/deal.II/source/numerics/Makefile @@ -1,22 +1,6 @@ # $Id$ -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) - -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 cc-files = $(wildcard *.cc) diff --git a/deal.II/lac/source/Makefile b/deal.II/lac/source/Makefile index bfbba35198..6dc445564c 100644 --- a/deal.II/lac/source/Makefile +++ b/deal.II/lac/source/Makefile @@ -10,7 +10,7 @@ CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ -fno-rtti -fno-exceptions $(INCLUDE) ifeq ($(shell uname),Linux) -CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ +CXX = /home/wolf/bin/gcc/bin/c++ endif ifeq ($(shell uname),SunOS)