From c29b45c2569e282e6cb6f0baa6aaa9efb38de0d4 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 6 Apr 1998 09:04:56 +0000 Subject: [PATCH] Makefile update. git-svn-id: https://svn.dealii.org/trunk@140 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/fe/Makefile | 23 +++++++++++++---------- deal.II/deal.II/source/grid/Makefile | 23 +++++++++++++---------- deal.II/deal.II/source/numerics/Makefile | 23 +++++++++++++---------- 3 files changed, 39 insertions(+), 30 deletions(-) diff --git a/deal.II/deal.II/source/fe/Makefile b/deal.II/deal.II/source/fe/Makefile index 354115c466..812aa25180 100644 --- a/deal.II/deal.II/source/fe/Makefile +++ b/deal.II/deal.II/source/fe/Makefile @@ -3,19 +3,22 @@ CXX = c++ INCLUDE = -I../../include -I../../../lac/include \ -I../../../base/include -I../../../mia/include -CXXFLAGS.g= -DDEBUG -g -Wall -pedantic -Wconversion \ - -Winline -Woverloaded-virtual $(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 $(INCLUDE) + -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) -#CXXFLAGS := -V2.7.2.3 $(CXXFLAGS) -#CXXFLAGS.g:= -V2.7.2.3 $(CXXFLAGS.g) -INCLUDE2.8 = -I/usr/local/source/libstdc++-2.8.0/libstdc++ \ - -I/usr/local/source/libstdc++-2.8.0/libstdc++/stl \ - -I/usr/local/source/libstdc++-2.8.0/libio -CXXFLAGS := $(CXXFLAGS) -fno-rtti -fno-exceptions $(INCLUDE2.8) -CXXFLAGS.g:= $(CXXFLAGS.g) -W -fno-rtti -fno-exceptions $(INCLUDE2.8) +INCLUDE2.8= -I/usr/local/source/libstdc++-2.8.0/libstdc++ \ + -I/usr/local/source/libstdc++-2.8.0/libio +CXXFLAGS := $(CXXFLAGS) $(INCLUDE2.8) +CXXFLAGS.g:= $(CXXFLAGS.g) $(INCLUDE2.8) endif diff --git a/deal.II/deal.II/source/grid/Makefile b/deal.II/deal.II/source/grid/Makefile index f6e9cdc473..53551c0527 100644 --- a/deal.II/deal.II/source/grid/Makefile +++ b/deal.II/deal.II/source/grid/Makefile @@ -3,19 +3,22 @@ CXX = c++ INCLUDE = -I../../include -I../../../lac/include \ -I../../../base/include -I../../../mia/include -CXXFLAGS.g= -DDEBUG -g -Wall -pedantic -Wconversion \ - -Winline -Woverloaded-virtual $(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 $(INCLUDE) + -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) -#CXXFLAGS := -V2.7.2.3 $(CXXFLAGS) -#CXXFLAGS.g:= -V2.7.2.3 $(CXXFLAGS.g) -INCLUDE2.8 = -I/usr/local/source/libstdc++-2.8.0/libstdc++ \ - -I/usr/local/source/libstdc++-2.8.0/libstdc++/stl \ - -I/usr/local/source/libstdc++-2.8.0/libio -CXXFLAGS := $(CXXFLAGS) -fno-rtti -fno-exceptions $(INCLUDE2.8) -CXXFLAGS.g:= $(CXXFLAGS.g) -W -fno-rtti -fno-exceptions $(INCLUDE2.8) +INCLUDE2.8= -I/usr/local/source/libstdc++-2.8.0/libstdc++ \ + -I/usr/local/source/libstdc++-2.8.0/libio +CXXFLAGS := $(CXXFLAGS) $(INCLUDE2.8) +CXXFLAGS.g:= $(CXXFLAGS.g) $(INCLUDE2.8) endif diff --git a/deal.II/deal.II/source/numerics/Makefile b/deal.II/deal.II/source/numerics/Makefile index 0d09b34614..eb0c9a4bee 100644 --- a/deal.II/deal.II/source/numerics/Makefile +++ b/deal.II/deal.II/source/numerics/Makefile @@ -3,19 +3,22 @@ CXX = c++ INCLUDE = -I../../include -I../../../lac/include \ -I../../../base/include -I../../../mia/include -CXXFLAGS.g= -DDEBUG -g -Wall -pedantic -Wconversion \ - -Winline -Woverloaded-virtual $(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 $(INCLUDE) + -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) -#CXXFLAGS := -V2.7.2.3 $(CXXFLAGS) -#CXXFLAGS.g:= -V2.7.2.3 $(CXXFLAGS.g) -INCLUDE2.8 = -I/usr/local/source/libstdc++-2.8.0/libstdc++ \ - -I/usr/local/source/libstdc++-2.8.0/libstdc++/stl \ - -I/usr/local/source/libstdc++-2.8.0/libio -CXXFLAGS := $(CXXFLAGS) -fno-rtti -fno-exceptions $(INCLUDE2.8) -CXXFLAGS.g:= $(CXXFLAGS.g) -W -fno-rtti -fno-exceptions $(INCLUDE2.8) +INCLUDE2.8= -I/usr/local/source/libstdc++-2.8.0/libstdc++ \ + -I/usr/local/source/libstdc++-2.8.0/libio +CXXFLAGS := $(CXXFLAGS) $(INCLUDE2.8) +CXXFLAGS.g:= $(CXXFLAGS.g) $(INCLUDE2.8) endif -- 2.39.5