]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Only relink PETSc libraries if necessary.
authorRalf Hartmann <Ralf.Hartmann@dlr.de>
Thu, 15 Sep 2005 15:31:47 +0000 (15:31 +0000)
committerRalf Hartmann <Ralf.Hartmann@dlr.de>
Thu, 15 Sep 2005 15:31:47 +0000 (15:31 +0000)
git-svn-id: https://svn.dealii.org/trunk@11455 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lib/Makefile

index dfcef753dbc81f9a82d4e71215521270cd30001a..679c51b4723d3ba137d433faa1a014a0399e2fcd 100644 (file)
@@ -55,22 +55,28 @@ endif
            $(lib-contrib-petsc-path.o)/libpetscvec$(lib-suffix) \
            $(lib-contrib-petsc-path.o)/libpetsc$(lib-suffix)
 
-  ifeq ($(enable-shared),yes)
-    external-links-petsc:
-       @echo Setting up libraries for PETSc
+ifeq ($(enable-shared),yes)
+
+  external-links-petsc: libpetsc.g$(shared-lib-suffix) libpetsc$(shared-lib-suffix)
+
+  libpetsc.g$(shared-lib-suffix): $(xlib.g)
        @echo "======================debug============= Linking library:   libpetsc.g$(shared-lib-suffix)"
        @$(CXX) -shared -o libpetsc.g$(shared-lib-suffix) \
                -Wl,-rpath,$(lib-contrib-petsc-path.g) $(xlib.g)
+
+  libpetsc$(shared-lib-suffix): $(xlib.o)
        @echo "======================optimized========= Linking library:   libpetsc$(shared-lib-suffix)"
        @$(CXX) -shared -o libpetsc$(shared-lib-suffix) \
                -Wl,-rpath,$(lib-contrib-petsc-path.o) $(xlib.o)
+
 else
 
+  external-links-petsc: libpetsc.g$(static-lib-suffix) libpetsc$(static-lib-suffix)
+
   # As I don't know how to merge archives, here's a workaround: Extract each of
   # the archives and append the object files to the libpetsc archive. Do the
   # same for debug and optimized mode.
-  external-links-petsc:
-       @echo Setting up libraries for PETSc
+  libpetsc.g$(static-lib-suffix): $(xlib.g)
        @echo "======================debug============= Linking library:   libpetsc.g$(static-lib-suffix)"
        @rm -f libpetsc.g$(static-lib-suffix)
        @mkdir ar_tmp; cd ar_tmp; \
@@ -82,6 +88,8 @@ else
        @cd ..
        @rm -r ar_tmp
        @$(RANLIB) libpetsc.g$(static-lib-suffix)
+
+  libpetsc$(static-lib-suffix): $(xlib.o)
        @echo "======================optimized========= Linking library:   libpetsc$(static-lib-suffix)"
        @rm -f libpetsc$(static-lib-suffix)
        @mkdir ar_tmp; cd ar_tmp; \

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.