From 35bea3386143323ec2c2da51877fd78e098bdc56 Mon Sep 17 00:00:00 2001 From: bangerth Date: Mon, 25 Oct 2010 22:29:30 +0000 Subject: [PATCH] Re-arrange files into a more uniform directory structure that has top-level include/ and source/ directories. Re-write the build infrastructure in such a way that it builds only a single library for debug and optimized mode each, rather than the 5 we have so far. git-svn-id: https://svn.dealii.org/trunk@22478 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/Makefile | 2 +- tests/Makefile.rules | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index d93a955daa..dcea3d384c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -24,7 +24,7 @@ nofail-dirs = a-framework \ $(if $(USE_CONTRIB_UMFPACK:no=), umfpack,) \ $(if $(USE_CONTRIB_METIS:no=), metis,) \ $(if $(USE_CONTRIB_HSL:no=), hsl,) \ - $(shell if grep -q 'define HAVE_LIBLAPACK' $D/base/include/base/config.h ;\ + $(shell if grep -q 'define HAVE_LIBLAPACK' $D/include/deal.II/base/config.h ;\ then echo lapack ; fi) # now define the targets that actually do something diff --git a/tests/Makefile.rules b/tests/Makefile.rules index 925a1bee7b..9c0d7ae926 100644 --- a/tests/Makefile.rules +++ b/tests/Makefile.rules @@ -216,16 +216,8 @@ endif ############################################################ # link with all libraries: -libraries = $(lib-deal2-1d.g) \ - $(lib-deal2-2d.g) \ - $(lib-deal2-3d.g) \ - $(lib-lac.g) \ - $(lib-base.g) -libraries_o = $(lib-deal2-1d.o) \ - $(lib-deal2-2d.o) \ - $(lib-deal2-3d.o) \ - $(lib-lac.o) \ - $(lib-base.o) +libraries = $(lib-deal2.g) +libraries_o = $(lib-deal2.o) ############################################################ # After all these general rules, here is the target to be -- 2.39.5