From eaa9b9b49917344378cfc5ed57f49ba92503a463 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 6 Apr 1998 17:33:34 +0000 Subject: [PATCH] Use newly installed gcc2.8 at new location. git-svn-id: https://svn.dealii.org/trunk@151 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/Attic/examples/Makefile | 10 ++-------- deal.II/deal.II/Attic/examples/poisson/Makefile | 6 +----- deal.II/deal.II/source/fe/Makefile | 5 +---- deal.II/deal.II/source/grid/Makefile | 5 +---- deal.II/deal.II/source/numerics/Makefile | 5 +---- deal.II/lac/source/Makefile | 6 +----- tests/big-tests/Makefile | 10 ++-------- tests/big-tests/poisson/Makefile | 6 +----- 8 files changed, 10 insertions(+), 43 deletions(-) diff --git a/deal.II/deal.II/Attic/examples/Makefile b/deal.II/deal.II/Attic/examples/Makefile index a8c6a1a107..a2081adda0 100644 --- a/deal.II/deal.II/Attic/examples/Makefile +++ b/deal.II/deal.II/Attic/examples/Makefile @@ -22,16 +22,10 @@ ifeq ($(shell uname),Linux) CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ endif - ifeq ($(shell uname),SunOS) -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) $(INCLUDE2.8) -CXXFLAGS.g:= $(CXXFLAGS.g) $(INCLUDE2.8) +CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ endif - cc-files = grid/grid_test.cc dof/dof_test.cc poisson/poisson.cc o-files = $(cc-files:.cc=.o) h-files = $(wildcard ../include/*.h) @@ -50,7 +44,7 @@ dof/dof_test: dof/dof_test.o $(LIBFILES.g) @echo ================= Linking $@ @$(CXX) $(CXXFLAGS.g) -o $@ $< $(LIBS.g) -lg++ -poisson/poisson: poisson/poisson.o $(LIBFILES.g) +poisson/poisson: @cd poisson ; make diff --git a/deal.II/deal.II/Attic/examples/poisson/Makefile b/deal.II/deal.II/Attic/examples/poisson/Makefile index 9e55405fbe..44ea89487b 100644 --- a/deal.II/deal.II/Attic/examples/poisson/Makefile +++ b/deal.II/deal.II/Attic/examples/poisson/Makefile @@ -15,11 +15,7 @@ CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ endif ifeq ($(shell uname),SunOS) -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) $(INCLUDE2.8) -CXXFLAGS.g:= $(CXXFLAGS.g) $(INCLUDE2.8) +CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ endif LIBPATH = -L../../lib -L../../../lac/lib diff --git a/deal.II/deal.II/source/fe/Makefile b/deal.II/deal.II/source/fe/Makefile index 812aa25180..09ead1b63a 100644 --- a/deal.II/deal.II/source/fe/Makefile +++ b/deal.II/deal.II/source/fe/Makefile @@ -15,10 +15,7 @@ CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ endif ifeq ($(shell uname),SunOS) -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) +CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ endif diff --git a/deal.II/deal.II/source/grid/Makefile b/deal.II/deal.II/source/grid/Makefile index 53551c0527..d2c8d84ce7 100644 --- a/deal.II/deal.II/source/grid/Makefile +++ b/deal.II/deal.II/source/grid/Makefile @@ -15,10 +15,7 @@ CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ endif ifeq ($(shell uname),SunOS) -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) +CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ endif diff --git a/deal.II/deal.II/source/numerics/Makefile b/deal.II/deal.II/source/numerics/Makefile index eb0c9a4bee..71aa9021f2 100644 --- a/deal.II/deal.II/source/numerics/Makefile +++ b/deal.II/deal.II/source/numerics/Makefile @@ -15,10 +15,7 @@ CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ endif ifeq ($(shell uname),SunOS) -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) +CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ endif diff --git a/deal.II/lac/source/Makefile b/deal.II/lac/source/Makefile index 3a6724b827..bfbba35198 100644 --- a/deal.II/lac/source/Makefile +++ b/deal.II/lac/source/Makefile @@ -14,14 +14,10 @@ CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ endif ifeq ($(shell uname),SunOS) -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) +CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ endif - cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) diff --git a/tests/big-tests/Makefile b/tests/big-tests/Makefile index a8c6a1a107..a2081adda0 100644 --- a/tests/big-tests/Makefile +++ b/tests/big-tests/Makefile @@ -22,16 +22,10 @@ ifeq ($(shell uname),Linux) CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ endif - ifeq ($(shell uname),SunOS) -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) $(INCLUDE2.8) -CXXFLAGS.g:= $(CXXFLAGS.g) $(INCLUDE2.8) +CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ endif - cc-files = grid/grid_test.cc dof/dof_test.cc poisson/poisson.cc o-files = $(cc-files:.cc=.o) h-files = $(wildcard ../include/*.h) @@ -50,7 +44,7 @@ dof/dof_test: dof/dof_test.o $(LIBFILES.g) @echo ================= Linking $@ @$(CXX) $(CXXFLAGS.g) -o $@ $< $(LIBS.g) -lg++ -poisson/poisson: poisson/poisson.o $(LIBFILES.g) +poisson/poisson: @cd poisson ; make diff --git a/tests/big-tests/poisson/Makefile b/tests/big-tests/poisson/Makefile index 9e55405fbe..44ea89487b 100644 --- a/tests/big-tests/poisson/Makefile +++ b/tests/big-tests/poisson/Makefile @@ -15,11 +15,7 @@ CXX = /home/wolf/bin/gcc-2.8.1/bin/c++ endif ifeq ($(shell uname),SunOS) -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) $(INCLUDE2.8) -CXXFLAGS.g:= $(CXXFLAGS.g) $(INCLUDE2.8) +CXX = /usr/local/gcc/gcc-2.8.1/bin/c++ endif LIBPATH = -L../../lib -L../../../lac/lib -- 2.39.5