From 52953279836ec5f6925c98203a250f282a62eb6c Mon Sep 17 00:00:00 2001 From: guido Date: Wed, 21 Oct 1998 14:01:10 +0000 Subject: [PATCH] Compilerpfade in Makefiles git-svn-id: https://svn.dealii.org/trunk@615 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/source/Makefile | 9 --------- deal.II/deal.II/Attic/examples/convergence/Makefile | 2 +- deal.II/deal.II/Make.global_options | 4 ---- deal.II/deal.II/source/Makefile | 9 --------- deal.II/lac/source/Makefile | 9 --------- tests/big-tests/convergence/Makefile | 2 +- 6 files changed, 2 insertions(+), 33 deletions(-) diff --git a/deal.II/base/source/Makefile b/deal.II/base/source/Makefile index 7e5862387b..50c4512b75 100644 --- a/deal.II/base/source/Makefile +++ b/deal.II/base/source/Makefile @@ -9,15 +9,6 @@ CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ -funroll-loops -felide-constructors -fnonnull-objects \ -fno-rtti $(INCLUDE) -ifeq ($(shell uname),Linux) -CXX = /home/wolf/bin/gcc/bin/c++ -endif - -ifeq ($(shell uname),SunOS) -CXX = c++ -endif - - cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) diff --git a/deal.II/deal.II/Attic/examples/convergence/Makefile b/deal.II/deal.II/Attic/examples/convergence/Makefile index eac73ec729..9a73077e3e 100644 --- a/deal.II/deal.II/Attic/examples/convergence/Makefile +++ b/deal.II/deal.II/Attic/examples/convergence/Makefile @@ -39,7 +39,7 @@ delete-files = *gnuplot *.eps *ucd *history #deal include base path D = ../../.. -include ../../Make.global_options +include $D/deal.II/Make.global_options # get lists of files we need cc-files = $(wildcard *.cc) diff --git a/deal.II/deal.II/Make.global_options b/deal.II/deal.II/Make.global_options index 62a222aa30..5cff23d40f 100644 --- a/deal.II/deal.II/Make.global_options +++ b/deal.II/deal.II/Make.global_options @@ -26,10 +26,6 @@ CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ -fno-rtti $(INCLUDE) \ -Ddeal_II_dimension=$(deal_II_dimension) -ifeq ($(shell uname),Linux) -CXX = /home/wolf/bin/gcc/bin/c++ -endif - %.go : %.cc Makefile @echo "======================== Compiling (DEBUG):" $< @$(CXX) $(CXXFLAGS.g) -c $< -o $@ diff --git a/deal.II/deal.II/source/Makefile b/deal.II/deal.II/source/Makefile index 2b523ca3a7..26d2c82244 100644 --- a/deal.II/deal.II/source/Makefile +++ b/deal.II/deal.II/source/Makefile @@ -37,15 +37,6 @@ CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ -fno-rtti $(INCLUDE) \ -Ddeal_II_dimension=$(deal_II_dimension) -ifeq ($(shell uname),Linux) -CXX = /home/wolf/bin/gcc/bin/c++ -endif - -ifeq ($(shell uname),SunOS) -CXX = g++ -endif - - %.go : @echo ============================ Compiling with debugging information: $< @$(CXX) $(CXXFLAGS.g) -c $< -o $@ diff --git a/deal.II/lac/source/Makefile b/deal.II/lac/source/Makefile index 00a238d75a..54379dc7a2 100644 --- a/deal.II/lac/source/Makefile +++ b/deal.II/lac/source/Makefile @@ -9,15 +9,6 @@ CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ -funroll-loops -felide-constructors -fnonnull-objects \ -fno-rtti $(INCLUDE) -ifeq ($(shell uname),Linux) -CXX = /home/wolf/bin/gcc/bin/c++ -endif - -ifeq ($(shell uname),SunOS) -CXX = g++ -endif - - cc-files = $(wildcard *.cc) o-files = $(cc-files:.cc=.o) go-files = $(cc-files:.cc=.go) diff --git a/tests/big-tests/convergence/Makefile b/tests/big-tests/convergence/Makefile index eac73ec729..9a73077e3e 100644 --- a/tests/big-tests/convergence/Makefile +++ b/tests/big-tests/convergence/Makefile @@ -39,7 +39,7 @@ delete-files = *gnuplot *.eps *ucd *history #deal include base path D = ../../.. -include ../../Make.global_options +include $D/deal.II/Make.global_options # get lists of files we need cc-files = $(wildcard *.cc) -- 2.39.5