From: wolf Date: Fri, 24 Jan 2003 16:52:29 +0000 (+0000) Subject: On some systems, we need to link liblac.so against libbase.so, and libdeal_II* agains... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae5e1857bf8db1593897220105ea8e4d22f0fd5c;p=dealii-svn.git On some systems, we need to link liblac.so against libbase.so, and libdeal_II* against both of them (notably, this system is AIX). On other systems, this shouldn't hurt either. For this, we also have to serialize creation of libraries. git-svn-id: https://svn.dealii.org/trunk@6960 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/Makefile b/deal.II/Makefile index 38e68cb985..1168e4ae07 100644 --- a/deal.II/Makefile +++ b/deal.II/Makefile @@ -41,28 +41,28 @@ baseg: baseo: cd $D/base ; $(MAKE) $(MAKEOPTIONS) libo -lacg: +lacg: baseg contrib cd $D/lac ; $(MAKE) $(MAKEOPTIONS) libg -laco: +laco: baseo contrib cd $D/lac ; $(MAKE) $(MAKEOPTIONS) libo -1dg: +1dg: baseg lacg cd $D/deal.II ; $(MAKE) $(MAKEOPTIONS) 1dg -2dg: +2dg: baseg lacg cd $D/deal.II ; $(MAKE) $(MAKEOPTIONS) 2dg -3dg: +3dg: baseg lacg cd $D/deal.II ; $(MAKE) $(MAKEOPTIONS) 3dg -1do: +1do:baseo laco cd $D/deal.II ; $(MAKE) $(MAKEOPTIONS) 1d -2do: +2do:baseo laco cd $D/deal.II ; $(MAKE) $(MAKEOPTIONS) 2d -3do: +3do: baseo laco cd $D/deal.II ; $(MAKE) $(MAKEOPTIONS) 3d deps: diff --git a/deal.II/deal.II/Makefile b/deal.II/deal.II/Makefile index f7baa92d41..d9eda1dc8d 100644 --- a/deal.II/deal.II/Makefile +++ b/deal.II/deal.II/Makefile @@ -121,29 +121,29 @@ $(LIBDIR)/libdeal_II_3d.a: $(o-files-3d) $(LIBDIR)/libdeal_II_1d.g.so: $(go-files-1d) @echo "=====deal.II====1d====debug======$(MT)== Linking library: $(@F)" - @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(go-files-1d) + @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(go-files-1d) $(lib-lac.g) $(lib-base.g) $(LIBDIR)/libdeal_II_1d.so: $(o-files-1d) @echo "=====deal.II====1d====optimized==$(MT)== Linking library: $(@F)" - @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(o-files-1d) + @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(o-files-1d) $(lib-lac.o) $(lib-base.o) $(LIBDIR)/libdeal_II_2d.g.so: $(go-files-2d) @echo "=====deal.II====2d====debug======$(MT)== Linking library: $(@F)" - @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(go-files-2d) + @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(go-files-2d) $(lib-lac.g) $(lib-base.g) $(LIBDIR)/libdeal_II_2d.so: $(o-files-2d) @echo "=====deal.II====2d====optimized==$(MT)== Linking library: $(@F)" - @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(o-files-2d) + @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(o-files-2d) $(lib-lac.o) $(lib-base.o) $(LIBDIR)/libdeal_II_3d.g.so: $(go-files-3d) @echo "=====deal.II====3d====debug======$(MT)== Linking library: $(@F)" - @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(go-files-3d) + @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(go-files-3d) $(lib-lac.g) $(lib-base.g) $(LIBDIR)/libdeal_II_3d.so: $(o-files-3d) @echo "=====deal.II====3d====optimized==$(MT)== Linking library: $(@F)" - @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(o-files-3d) + @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(o-files-3d) $(lib-lac.o) $(lib-base.o) diff --git a/deal.II/lac/Makefile b/deal.II/lac/Makefile index e884462606..ac5f18fe4b 100644 --- a/deal.II/lac/Makefile +++ b/deal.II/lac/Makefile @@ -43,6 +43,14 @@ else libo: $(LIBDIR)/liblac.a endif +# if we use HSL, then we need to link against libhsl.so. if we don't, then +# don't set this variable +ifeq ($(USE_CONTRIB_HSL),yes) + LIBHSL=$(lib-contrib-hsl) +else + LIBHSL= +endif + $(LIBDIR)/liblac.a: $(o-files) @echo "=====lac==============optimized==$(MT)== Linking library: $(@F)" @ar ru $@ $(o-files) @@ -56,11 +64,11 @@ $(LIBDIR)/liblac.g.a: $(go-files) $(LIBDIR)/liblac.so: $(o-files) @echo "=====lac==============optimized==$(MT)== Linking library: $(@F)" - @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(o-files) + @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(o-files) $(lib-base.o) $(LIBHSL) $(LIBDIR)/liblac.g.so: $(go-files) @echo "=====lac==============debug======$(MT)== Linking library: $(@F)" - @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(go-files) + @$(SHLIBLD) $(LDFLAGS) -shared -o $@ $(go-files) $(lib-base.g) $(LIBHSL)