]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
On some systems, we need to link liblac.so against libbase.so, and libdeal_II* agains...
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 24 Jan 2003 16:52:29 +0000 (16:52 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 24 Jan 2003 16:52:29 +0000 (16:52 +0000)
git-svn-id: https://svn.dealii.org/trunk@6960 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/Makefile
deal.II/deal.II/Makefile
deal.II/lac/Makefile

index 38e68cb9853fa56ba2cb0698a96b12c39d63b011..1168e4ae07e51b86943beaff24c95aa5b8d2c45d 100644 (file)
@@ -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: 
index f7baa92d41510351f96ad5a268738c442a0caced..d9eda1dc8dbb1bc8157f1b3308b71d939570a612 100644 (file)
@@ -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)
 
 
 
index e884462606523c164497c871ec42175faba0cab0..ac5f18fe4bdaf599feb6f4fa110a3ed6ac93c940 100644 (file)
@@ -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)
 
 
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.