From 5613ba693f3abc7a1096d16f5b61a822ab550f4f Mon Sep 17 00:00:00 2001 From: guido Date: Fri, 5 Feb 1999 19:28:24 +0000 Subject: [PATCH] Finally uses deal.II/Make.global_options again git-svn-id: https://svn.dealii.org/trunk@759 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/Makefile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/deal.II/deal.II/source/Makefile b/deal.II/deal.II/source/Makefile index e8c0f1440f..6f091bcf94 100644 --- a/deal.II/deal.II/source/Makefile +++ b/deal.II/deal.II/source/Makefile @@ -10,7 +10,9 @@ #I think I have removed any non-supported cross-references, so you #should be able to compile with an arbitrary number of processes. +D=../.. +include $D/deal.II/Make.global_options cc-files = $(wildcard */*.cc) h-files = $(wildcard ../include/*/*.h) @@ -29,17 +31,6 @@ go-files-2d = $(addprefix ../lib/2d/go/, $(tmp1:.cc=_2d.go)) o-files-3d = $(addprefix ../lib/3d/o/, $(tmp1:.cc=_3d.o) ) go-files-3d = $(addprefix ../lib/3d/go/, $(tmp1:.cc=_3d.go)) - -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 \ - $(INCLUDE) -CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ - -felide-constructors -fnonnull-objects \ - $(INCLUDE) - ../lib/1d/go/%.go : @echo ==============1d======debug============= $< @$(CXX) $(CXXFLAGS.g) -Ddeal_II_dimension=1 -c $< -o $@ -- 2.39.5