From 92b360e2e25c0020c29bc3c441ad636265b14796 Mon Sep 17 00:00:00 2001 From: wolf Date: Wed, 26 Jan 2000 17:00:46 +0000 Subject: [PATCH] Support shared libs. git-svn-id: https://svn.dealii.org/trunk@2273 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/base/Makefile | 6 ++++-- tests/deal.II/Makefile | 17 +++++++++++------ tests/lac/Makefile | 6 ++++-- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/tests/base/Makefile b/tests/base/Makefile index 2e2546c191..ccbb50b683 100644 --- a/tests/base/Makefile +++ b/tests/base/Makefile @@ -23,8 +23,10 @@ debug-mode = on # Define library names ############################################################ -libs = -llac -lbase -libs.g = -llac.g -lbase.g +libs.g = $(lib-lac.g) \ + $(lib-base.g) +libs = $(lib-lac.o) \ + $(lib-base.o) ############################################################ diff --git a/tests/deal.II/Makefile b/tests/deal.II/Makefile index 8f58c66c2a..d687e7f451 100644 --- a/tests/deal.II/Makefile +++ b/tests/deal.II/Makefile @@ -23,8 +23,13 @@ debug-mode = on # Define library names ############################################################ -libs = -ldeal_II_2d -llac -lbase -libs.g = -ldeal_II_2d.g -llac.g -lbase.g +libs.g = $(lib-deal2-2d.g) \ + $(lib-lac.g) \ + $(lib-base.g) +libs = $(lib-deal2-2d.o) \ + $(lib-lac.o) \ + $(lib-base.o) + ############################################################ # Select compiler flags according to debug-mode @@ -32,15 +37,15 @@ libs.g = -ldeal_II_2d.g -llac.g -lbase.g ifeq ($(debug-mode),on) libraries = $(libs.g) -libdeal3d = -ldeal_II_3d.g -libdeal1d = -ldeal_II_1d.g +libdeal3d = $(lib-deal2-3d.g) +libdeal1d = $(lib-deal2-1d.g) flags = $(CXXFLAGS.g) $(CXXFLAGS) endif ifeq ($(debug-mode),off) libraries = $(libs) -libdeal3d = -ldeal_II_3d -libdeal1d = -ldeal_II_1d +libdeal3d = $(lib-deal2-3d.o) +libdeal1d = $(lib-deal2-1d.o) flags = $(CXXFLAGS.o) $(CXXFLAGS) endif diff --git a/tests/lac/Makefile b/tests/lac/Makefile index 363f156f50..b5ff9fffcf 100644 --- a/tests/lac/Makefile +++ b/tests/lac/Makefile @@ -23,8 +23,10 @@ debug-mode = on # Define library names ############################################################ -libs = -llac -lbase -libs.g = -llac.g -lbase.g +libs.g = $(lib-lac.g) \ + $(lib-base.g) +libs = $(lib-lac.o) \ + $(lib-base.o) ############################################################ -- 2.39.5