[cig-commits] [commit] QA: build: Make changes to scotch build permanent. (d801758)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Jan 17 04:27:46 PST 2014
Repository : ssh://geoshell/specfem3d
On branch : QA
Link : https://github.com/geodynamics/specfem3d/compare/6c327a1cde359cefa65f66e5b7981bfe995f92e3...4359ed56c14ef8f87387f46c8b705a1d395a40ba
>---------------------------------------------------------------
commit d80175844ceb5444ffb69edc38e2e3cb6be5182d
Author: Elliott Sales de Andrade <esalesde at physics.utoronto.ca>
Date: Fri Jan 10 19:16:55 2014 -0500
build: Make changes to scotch build permanent.
Every time you configured with internal scotch, you'd get modifications
to its Makefiles which git would show as modified. This is troublesome
whenever you want to commit or change branches, because you'd have to
remember not to keep those changes.
The changes to the scotch Makefiles are independent of any options you
might pass to configure (except that they aren't done if you aren't
using internal scotch). We can just make them permanently in git,
especially because the changes have been made upstream in scotch as
well.
>---------------------------------------------------------------
d80175844ceb5444ffb69edc38e2e3cb6be5182d
configure | 148 ---------------------
configure.ac | 148 ---------------------
src/decompose_mesh/scotch_5.1.12b/.gitignore | 3 -
.../scotch_5.1.12b/src/libscotch/Makefile | 43 +++---
.../scotch_5.1.12b/src/libscotchmetis/Makefile | 24 +++-
.../scotch_5.1.12b/src/scotch/Makefile | 77 ++---------
6 files changed, 58 insertions(+), 385 deletions(-)
diff --git a/configure b/configure
index 07ed25a..f800e56 100755
--- a/configure
+++ b/configure
@@ -6781,154 +6781,6 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu
SCOTCH_DIR="scotch"
SCOTCH_LIBDIR="${SCOTCH_DIR}/lib"
SCOTCH_INCLUDEDIR="${SCOTCH_DIR}/include"
-
- # the following modifies the default scotch Makefile such that the package
- # will only be compiled once (no recompilation) when calling make
- #
- builddir=`pwd`
- cd src/decompose_mesh/${SCOTCH_DIR}/
-
- if test ! -f "src/scotch/Makefile.org"; then
-
- # no Makefile backup files yet
- # modifies Makefiles once
-
- # creates backup copies of original Makefiles
- # src/scotch/
- cp src/scotch/Makefile src/scotch/Makefile.org
- # src/libscotch/
- cp src/libscotch/Makefile src/libscotch/Makefile.org
- # src/libscotchmetis/
- cp src/libscotchmetis/Makefile src/libscotchmetis/Makefile.org
-
- fi
-
- # replacement text in the default scotch Makefiles
- cat > conftmp.scotch.cmd <<_ACEOF
-# scotch replacement text for install line
-\$(bindir)/acpl\$(EXE): acpl\$(EXE)
- -\$(CP) acpl\$(EXE) \$(bindir)/acpl\$(EXE)
-\$(bindir)/amk_ccc\$(EXE): amk_ccc\$(EXE)
- -\$(CP) amk_ccc\$(EXE) \$(bindir)/amk_ccc\$(EXE)
-\$(bindir)/amk_fft2\$(EXE): amk_fft2\$(EXE)
- -\$(CP) amk_fft2\$(EXE) \$(bindir)/amk_fft2\$(EXE)
-\$(bindir)/amk_grf\$(EXE): amk_grf\$(EXE)
- -\$(CP) amk_grf\$(EXE) \$(bindir)/amk_grf\$(EXE)
-\$(bindir)/amk_hy\$(EXE): amk_hy\$(EXE)
- -\$(CP) amk_hy\$(EXE) \$(bindir)/amk_hy\$(EXE)
-\$(bindir)/amk_m2\$(EXE): amk_m2\$(EXE)
- -\$(CP) amk_m2\$(EXE) \$(bindir)/amk_m2\$(EXE)
-\$(bindir)/amk_p2\$(EXE): amk_p2\$(EXE)
- -\$(CP) amk_p2\$(EXE) \$(bindir)/amk_p2\$(EXE)
-\$(bindir)/atst\$(EXE): atst\$(EXE)
- -\$(CP) atst\$(EXE) \$(bindir)/atst\$(EXE)
-\$(bindir)/gbase\$(EXE): gbase\$(EXE)
- -\$(CP) gbase\$(EXE) \$(bindir)/gbase\$(EXE)
-\$(bindir)/gcv\$(EXE): gcv\$(EXE)
- -\$(CP) gcv\$(EXE) \$(bindir)/gcv\$(EXE)
-\$(bindir)/gmap\$(EXE): gmap\$(EXE)
- -\$(CP) gmap\$(EXE) \$(bindir)/gmap\$(EXE)
-\$(bindir)/gmk_hy\$(EXE): gmk_hy\$(EXE)
- -\$(CP) gmk_hy\$(EXE) \$(bindir)/gmk_hy\$(EXE)
-\$(bindir)/gmk_m2\$(EXE): gmk_m2\$(EXE)
- -\$(CP) gmk_m2\$(EXE) \$(bindir)/gmk_m2\$(EXE)
-\$(bindir)/gmk_m3\$(EXE): gmk_m3\$(EXE)
- -\$(CP) gmk_m3\$(EXE) \$(bindir)/gmk_m3\$(EXE)
-\$(bindir)/gmk_msh\$(EXE): gmk_msh\$(EXE)
- -\$(CP) gmk_msh\$(EXE) \$(bindir)/gmk_msh\$(EXE)
-\$(bindir)/gmk_ub2\$(EXE): gmk_ub2\$(EXE)
- -\$(CP) gmk_ub2\$(EXE) \$(bindir)/gmk_ub2\$(EXE)
-\$(bindir)/gmtst\$(EXE): gmtst\$(EXE)
- -\$(CP) gmtst\$(EXE) \$(bindir)/gmtst\$(EXE)
-\$(bindir)/gord\$(EXE): gord\$(EXE)
- -\$(CP) gord\$(EXE) \$(bindir)/gord\$(EXE)
-\$(bindir)/gotst\$(EXE): gotst\$(EXE)
- -\$(CP) gotst\$(EXE) \$(bindir)/gotst\$(EXE)
-\$(bindir)/gout\$(EXE): gout\$(EXE)
- -\$(CP) gout\$(EXE) \$(bindir)/gout\$(EXE)
-\$(bindir)/gpart\$(EXE): \$(bindir)/gmap\$(EXE)
- -\$(RM) \$(bindir)/gpart\$(EXE)
- -\$(LN) \$(bindir)/gmap\$(EXE) \$(bindir)/gpart\$(EXE)
-\$(bindir)/gscat\$(EXE): gscat\$(EXE)
- -\$(CP) gscat\$(EXE) \$(bindir)/gscat\$(EXE)
-\$(bindir)/gtst\$(EXE): gtst\$(EXE)
- -\$(CP) gtst\$(EXE) \$(bindir)/gtst\$(EXE)
-\$(bindir)/mcv\$(EXE): mcv\$(EXE)
- -\$(CP) mcv\$(EXE) \$(bindir)/mcv\$(EXE)
-\$(bindir)/mmk_m2\$(EXE): mmk_m2\$(EXE)
- -\$(CP) mmk_m2\$(EXE) \$(bindir)/mmk_m2\$(EXE)
-\$(bindir)/mmk_m3\$(EXE): mmk_m3\$(EXE)
- -\$(CP) mmk_m3\$(EXE) \$(bindir)/mmk_m3\$(EXE)
-\$(bindir)/mord\$(EXE): mord\$(EXE)
- -\$(CP) mord\$(EXE) \$(bindir)/mord\$(EXE)
-\$(bindir)/mtst\$(EXE): mtst\$(EXE)
- -\$(CP) mtst\$(EXE) \$(bindir)/mtst\$(EXE)
-
-
-install : \$(bindir)/acpl\$(EXE) \$(bindir)/amk_ccc\$(EXE) \\
- \$(bindir)/amk_fft2\$(EXE) \$(bindir)/amk_grf\$(EXE) \\
- \$(bindir)/amk_hy\$(EXE) \$(bindir)/amk_m2\$(EXE) \\
- \$(bindir)/amk_p2\$(EXE) \$(bindir)/atst\$(EXE) \\
- \$(bindir)/gbase\$(EXE) \$(bindir)/gcv\$(EXE) \\
- \$(bindir)/gmap\$(EXE) \$(bindir)/gmk_hy\$(EXE) \\
- \$(bindir)/gmk_m2\$(EXE) \$(bindir)/gmk_m3\$(EXE) \\
- \$(bindir)/gmk_msh\$(EXE) \$(bindir)/gmk_ub2\$(EXE) \\
- \$(bindir)/gmtst\$(EXE) \$(bindir)/gord\$(EXE) \\
- \$(bindir)/gotst\$(EXE) \$(bindir)/gout\$(EXE) \\
- \$(bindir)/gpart\$(EXE) \$(bindir)/gscat\$(EXE) \\
- \$(bindir)/gtst\$(EXE) \$(bindir)/mcv\$(EXE) \\
- \$(bindir)/mmk_m2\$(EXE) \$(bindir)/mmk_m3\$(EXE) \\
- \$(bindir)/mord\$(EXE) \$(bindir)/mtst\$(EXE)
-
-_ACEOF
-
- # avoids lines between 98 to 101, containing install lines, and replaces them
- awk '{if(NR<98)print $0}' src/scotch/Makefile.org > src/scotch/Makefile
- cat conftmp.scotch.cmd >> src/scotch/Makefile
- awk '{if(NR>101)print $0}' src/scotch/Makefile.org >> src/scotch/Makefile
- rm -f conftmp.scotch.cmd
-
- # replacement text in the default libscotch Makefile
- cat > conftmp.libscotch.cmd <<_ACEOF
-# libscotch replacement text for install line
-\$(libdir)/libscotch\$(LIB): libscotch\$(LIB)
- -\$(CP) libscotch\$(LIB) \$(libdir)
-\$(libdir)/libscotcherr\$(LIB): libscotcherr\$(LIB)
- -\$(CP) libscotcherr\$(LIB) \$(libdir)
-\$(libdir)/libscotcherrexit\$(LIB): libscotcherrexit\$(LIB)
- -\$(CP) libscotcherrexit\$(LIB) \$(libdir)
-\$(includedir)/scotch.h: scotch.h
- -\$(CP) scotch.h \$(includedir)
-\$(includedir)/scotchf.h: scotchf.h
- -\$(CP) scotchf.h \$(includedir)
-
-install : \$(libdir)/libscotch\$(LIB) \$(libdir)/libscotcherr\$(LIB) \\
- \$(libdir)/libscotcherrexit\$(LIB) \\
- \$(includedir)/scotch.h \$(includedir)/scotchf.h
-
-_ACEOF
-
- # avoids lines between 71 to 73, containing install lines, and replaces them
- awk '{if(NR<71)print $0}' src/libscotch/Makefile.org > src/libscotch/Makefile
- cat conftmp.libscotch.cmd >> src/libscotch/Makefile
- awk '{if(NR>73)print $0}' src/libscotch/Makefile.org >> src/libscotch/Makefile
- rm -f conftmp.libscotch.cmd
-
- # replaces single scotch line in Makefiles
- # src/scotch/
- sed "s/^scotch.*clean/scotch : /" src/scotch/Makefile > conftmp.libscotch.mk
- mv conftmp.libscotch.mk src/scotch/Makefile
- # src/libscotch/
- sed "s/^scotch.*clean/scotch : /" src/libscotch/Makefile > conftmp.libscotch.mk
- mv conftmp.libscotch.mk src/libscotch/Makefile
- # src/libscotchmetis/
- sed "s/^scotch.*clean/scotch : /" src/libscotchmetis/Makefile > conftmp.libscotch.mk
- mv conftmp.libscotch.mk src/libscotchmetis/Makefile
-
- cd $builddir
-
- # done scotch Makefile modification
-
fi
LDFLAGS=${ac_save_ldflags}
diff --git a/configure.ac b/configure.ac
index 55694b2..8f2550e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,154 +205,6 @@ else
SCOTCH_DIR="scotch"
SCOTCH_LIBDIR="${SCOTCH_DIR}/lib"
SCOTCH_INCLUDEDIR="${SCOTCH_DIR}/include"
-
- # the following modifies the default scotch Makefile such that the package
- # will only be compiled once (no recompilation) when calling make
- #
- builddir=`pwd`
- cd src/decompose_mesh/${SCOTCH_DIR}/
-
- if test ! -f "src/scotch/Makefile.org"; then
-
- # no Makefile backup files yet
- # modifies Makefiles once
-
- # creates backup copies of original Makefiles
- # src/scotch/
- cp src/scotch/Makefile src/scotch/Makefile.org
- # src/libscotch/
- cp src/libscotch/Makefile src/libscotch/Makefile.org
- # src/libscotchmetis/
- cp src/libscotchmetis/Makefile src/libscotchmetis/Makefile.org
-
- fi
-
- # replacement text in the default scotch Makefiles
- cat > conftmp.scotch.cmd <<_ACEOF
-# scotch replacement text for install line
-\$(bindir)/acpl\$(EXE): acpl\$(EXE)
- -\$(CP) acpl\$(EXE) \$(bindir)/acpl\$(EXE)
-\$(bindir)/amk_ccc\$(EXE): amk_ccc\$(EXE)
- -\$(CP) amk_ccc\$(EXE) \$(bindir)/amk_ccc\$(EXE)
-\$(bindir)/amk_fft2\$(EXE): amk_fft2\$(EXE)
- -\$(CP) amk_fft2\$(EXE) \$(bindir)/amk_fft2\$(EXE)
-\$(bindir)/amk_grf\$(EXE): amk_grf\$(EXE)
- -\$(CP) amk_grf\$(EXE) \$(bindir)/amk_grf\$(EXE)
-\$(bindir)/amk_hy\$(EXE): amk_hy\$(EXE)
- -\$(CP) amk_hy\$(EXE) \$(bindir)/amk_hy\$(EXE)
-\$(bindir)/amk_m2\$(EXE): amk_m2\$(EXE)
- -\$(CP) amk_m2\$(EXE) \$(bindir)/amk_m2\$(EXE)
-\$(bindir)/amk_p2\$(EXE): amk_p2\$(EXE)
- -\$(CP) amk_p2\$(EXE) \$(bindir)/amk_p2\$(EXE)
-\$(bindir)/atst\$(EXE): atst\$(EXE)
- -\$(CP) atst\$(EXE) \$(bindir)/atst\$(EXE)
-\$(bindir)/gbase\$(EXE): gbase\$(EXE)
- -\$(CP) gbase\$(EXE) \$(bindir)/gbase\$(EXE)
-\$(bindir)/gcv\$(EXE): gcv\$(EXE)
- -\$(CP) gcv\$(EXE) \$(bindir)/gcv\$(EXE)
-\$(bindir)/gmap\$(EXE): gmap\$(EXE)
- -\$(CP) gmap\$(EXE) \$(bindir)/gmap\$(EXE)
-\$(bindir)/gmk_hy\$(EXE): gmk_hy\$(EXE)
- -\$(CP) gmk_hy\$(EXE) \$(bindir)/gmk_hy\$(EXE)
-\$(bindir)/gmk_m2\$(EXE): gmk_m2\$(EXE)
- -\$(CP) gmk_m2\$(EXE) \$(bindir)/gmk_m2\$(EXE)
-\$(bindir)/gmk_m3\$(EXE): gmk_m3\$(EXE)
- -\$(CP) gmk_m3\$(EXE) \$(bindir)/gmk_m3\$(EXE)
-\$(bindir)/gmk_msh\$(EXE): gmk_msh\$(EXE)
- -\$(CP) gmk_msh\$(EXE) \$(bindir)/gmk_msh\$(EXE)
-\$(bindir)/gmk_ub2\$(EXE): gmk_ub2\$(EXE)
- -\$(CP) gmk_ub2\$(EXE) \$(bindir)/gmk_ub2\$(EXE)
-\$(bindir)/gmtst\$(EXE): gmtst\$(EXE)
- -\$(CP) gmtst\$(EXE) \$(bindir)/gmtst\$(EXE)
-\$(bindir)/gord\$(EXE): gord\$(EXE)
- -\$(CP) gord\$(EXE) \$(bindir)/gord\$(EXE)
-\$(bindir)/gotst\$(EXE): gotst\$(EXE)
- -\$(CP) gotst\$(EXE) \$(bindir)/gotst\$(EXE)
-\$(bindir)/gout\$(EXE): gout\$(EXE)
- -\$(CP) gout\$(EXE) \$(bindir)/gout\$(EXE)
-\$(bindir)/gpart\$(EXE): \$(bindir)/gmap\$(EXE)
- -\$(RM) \$(bindir)/gpart\$(EXE)
- -\$(LN) \$(bindir)/gmap\$(EXE) \$(bindir)/gpart\$(EXE)
-\$(bindir)/gscat\$(EXE): gscat\$(EXE)
- -\$(CP) gscat\$(EXE) \$(bindir)/gscat\$(EXE)
-\$(bindir)/gtst\$(EXE): gtst\$(EXE)
- -\$(CP) gtst\$(EXE) \$(bindir)/gtst\$(EXE)
-\$(bindir)/mcv\$(EXE): mcv\$(EXE)
- -\$(CP) mcv\$(EXE) \$(bindir)/mcv\$(EXE)
-\$(bindir)/mmk_m2\$(EXE): mmk_m2\$(EXE)
- -\$(CP) mmk_m2\$(EXE) \$(bindir)/mmk_m2\$(EXE)
-\$(bindir)/mmk_m3\$(EXE): mmk_m3\$(EXE)
- -\$(CP) mmk_m3\$(EXE) \$(bindir)/mmk_m3\$(EXE)
-\$(bindir)/mord\$(EXE): mord\$(EXE)
- -\$(CP) mord\$(EXE) \$(bindir)/mord\$(EXE)
-\$(bindir)/mtst\$(EXE): mtst\$(EXE)
- -\$(CP) mtst\$(EXE) \$(bindir)/mtst\$(EXE)
-
-
-install : \$(bindir)/acpl\$(EXE) \$(bindir)/amk_ccc\$(EXE) \\
- \$(bindir)/amk_fft2\$(EXE) \$(bindir)/amk_grf\$(EXE) \\
- \$(bindir)/amk_hy\$(EXE) \$(bindir)/amk_m2\$(EXE) \\
- \$(bindir)/amk_p2\$(EXE) \$(bindir)/atst\$(EXE) \\
- \$(bindir)/gbase\$(EXE) \$(bindir)/gcv\$(EXE) \\
- \$(bindir)/gmap\$(EXE) \$(bindir)/gmk_hy\$(EXE) \\
- \$(bindir)/gmk_m2\$(EXE) \$(bindir)/gmk_m3\$(EXE) \\
- \$(bindir)/gmk_msh\$(EXE) \$(bindir)/gmk_ub2\$(EXE) \\
- \$(bindir)/gmtst\$(EXE) \$(bindir)/gord\$(EXE) \\
- \$(bindir)/gotst\$(EXE) \$(bindir)/gout\$(EXE) \\
- \$(bindir)/gpart\$(EXE) \$(bindir)/gscat\$(EXE) \\
- \$(bindir)/gtst\$(EXE) \$(bindir)/mcv\$(EXE) \\
- \$(bindir)/mmk_m2\$(EXE) \$(bindir)/mmk_m3\$(EXE) \\
- \$(bindir)/mord\$(EXE) \$(bindir)/mtst\$(EXE)
-
-_ACEOF
-
- # avoids lines between 98 to 101, containing install lines, and replaces them
- awk '{if(NR<98)print $0}' src/scotch/Makefile.org > src/scotch/Makefile
- cat conftmp.scotch.cmd >> src/scotch/Makefile
- awk '{if(NR>101)print $0}' src/scotch/Makefile.org >> src/scotch/Makefile
- rm -f conftmp.scotch.cmd
-
- # replacement text in the default libscotch Makefile
- cat > conftmp.libscotch.cmd <<_ACEOF
-# libscotch replacement text for install line
-\$(libdir)/libscotch\$(LIB): libscotch\$(LIB)
- -\$(CP) libscotch\$(LIB) \$(libdir)
-\$(libdir)/libscotcherr\$(LIB): libscotcherr\$(LIB)
- -\$(CP) libscotcherr\$(LIB) \$(libdir)
-\$(libdir)/libscotcherrexit\$(LIB): libscotcherrexit\$(LIB)
- -\$(CP) libscotcherrexit\$(LIB) \$(libdir)
-\$(includedir)/scotch.h: scotch.h
- -\$(CP) scotch.h \$(includedir)
-\$(includedir)/scotchf.h: scotchf.h
- -\$(CP) scotchf.h \$(includedir)
-
-install : \$(libdir)/libscotch\$(LIB) \$(libdir)/libscotcherr\$(LIB) \\
- \$(libdir)/libscotcherrexit\$(LIB) \\
- \$(includedir)/scotch.h \$(includedir)/scotchf.h
-
-_ACEOF
-
- # avoids lines between 71 to 73, containing install lines, and replaces them
- awk '{if(NR<71)print $0}' src/libscotch/Makefile.org > src/libscotch/Makefile
- cat conftmp.libscotch.cmd >> src/libscotch/Makefile
- awk '{if(NR>73)print $0}' src/libscotch/Makefile.org >> src/libscotch/Makefile
- rm -f conftmp.libscotch.cmd
-
- # replaces single scotch line in Makefiles
- # src/scotch/
- sed "s/^scotch.*clean/scotch : /" src/scotch/Makefile > conftmp.libscotch.mk
- mv conftmp.libscotch.mk src/scotch/Makefile
- # src/libscotch/
- sed "s/^scotch.*clean/scotch : /" src/libscotch/Makefile > conftmp.libscotch.mk
- mv conftmp.libscotch.mk src/libscotch/Makefile
- # src/libscotchmetis/
- sed "s/^scotch.*clean/scotch : /" src/libscotchmetis/Makefile > conftmp.libscotch.mk
- mv conftmp.libscotch.mk src/libscotchmetis/Makefile
-
- cd $builddir
-
- # done scotch Makefile modification
-
fi
LDFLAGS=${ac_save_ldflags}
diff --git a/src/decompose_mesh/scotch_5.1.12b/.gitignore b/src/decompose_mesh/scotch_5.1.12b/.gitignore
index 9b69e1d..023311e 100644
--- a/src/decompose_mesh/scotch_5.1.12b/.gitignore
+++ b/src/decompose_mesh/scotch_5.1.12b/.gitignore
@@ -1,8 +1,5 @@
# Configure time
src/Makefile.inc
-src/libscotch/Makefile.org
-src/libscotchmetis/Makefile.org
-src/scotch/Makefile.org
# Build time
include/
diff --git a/src/decompose_mesh/scotch_5.1.12b/src/libscotch/Makefile b/src/decompose_mesh/scotch_5.1.12b/src/libscotch/Makefile
index db64f78..2476631 100644
--- a/src/decompose_mesh/scotch_5.1.12b/src/libscotch/Makefile
+++ b/src/decompose_mesh/scotch_5.1.12b/src/libscotch/Makefile
@@ -59,7 +59,7 @@ scotch :
libscotcherr$(LIB) \
libscotcherrexit$(LIB)
-ptscotch : clean
+ptscotch :
$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC="$(CCP)" \
scotch.h \
scotchf.h \
@@ -68,22 +68,11 @@ ptscotch : clean
libptscotcherr$(LIB) \
libptscotcherrexit$(LIB)
-# libscotch replacement text for install line
-$(libdir)/libscotch$(LIB): libscotch$(LIB)
- -$(CP) libscotch$(LIB) $(libdir)
-$(libdir)/libscotcherr$(LIB): libscotcherr$(LIB)
- -$(CP) libscotcherr$(LIB) $(libdir)
-$(libdir)/libscotcherrexit$(LIB): libscotcherrexit$(LIB)
- -$(CP) libscotcherrexit$(LIB) $(libdir)
-$(includedir)/scotch.h: scotch.h
- -$(CP) scotch.h $(includedir)
-$(includedir)/scotchf.h: scotchf.h
- -$(CP) scotchf.h $(includedir)
-
-install : $(libdir)/libscotch$(LIB) $(libdir)/libscotcherr$(LIB) \
- $(libdir)/libscotcherrexit$(LIB) \
- $(includedir)/scotch.h $(includedir)/scotchf.h
-
+install : $(includedir)/scotch.h \
+ $(includedir)/scotchf.h \
+ $(libdir)/libscotch$(LIB) \
+ $(libdir)/libscotcherr$(LIB) \
+ $(libdir)/libscotcherrexit$(LIB)
ptinstall :
-$(CP) scotch.h $(includedir)/ptscotch.h
@@ -95,6 +84,26 @@ clean :
realclean : clean
+
+##
+## Installation dependencies.
+##
+
+$(includedir)/scotch.h : scotch.h
+ -$(CP) scotch.h $(includedir)
+
+$(includedir)/scotchf.h : scotchf.h
+ -$(CP) scotchf.h $(includedir)
+
+$(libdir)/libscotch$(LIB) : libscotch$(LIB)
+ -$(CP) libscotch$(LIB) $(libdir)
+
+$(libdir)/libscotcherr$(LIB) : libscotcherr$(LIB)
+ -$(CP) libscotcherr$(LIB) $(libdir)
+
+$(libdir)/libscotcherrexit$(LIB): libscotcherrexit$(LIB)
+ -$(CP) libscotcherrexit$(LIB) $(libdir)
+
##
## Library dependencies.
##
diff --git a/src/decompose_mesh/scotch_5.1.12b/src/libscotchmetis/Makefile b/src/decompose_mesh/scotch_5.1.12b/src/libscotchmetis/Makefile
index d81d02c..ebeaebb 100644
--- a/src/decompose_mesh/scotch_5.1.12b/src/libscotchmetis/Makefile
+++ b/src/decompose_mesh/scotch_5.1.12b/src/libscotchmetis/Makefile
@@ -60,13 +60,9 @@ ptscotch :
$(MAKE) CFLAGS="$(CFLAGS) -DSCOTCH_PTSCOTCH" CC="$(CCP)" SCOTCHLIB=ptscotch \
libptscotchparmetis$(LIB)
-install : scotch
- -$(CP) metis.h $(includedir)
- -$(CP) libscotchmetis$(LIB) $(libdir)
+install : scotch $(includedir)/metis.h $(libdir)/libscotchmetis$(LIB)
-ptinstall : ptscotch
- -$(CP) parmetis.h $(includedir)
- -$(CP) libptscotchparmetis$(LIB) $(libdir)
+ptinstall : ptscotch $(includedir)/parmetis.h $(libdir)/libptscotchparmetis$(LIB)
clean :
-$(RM) *~ *$(OBJ) lib*$(LIB)
@@ -74,6 +70,22 @@ clean :
realclean : clean
##
+## Installation dependencies.
+##
+
+$(includedir)/metis.h : metis.h
+ -$(CP) metis.h $(includedir)
+
+$(libdir)/libscotchmetis$(LIB) : libscotchmetis$(LIB)
+ -$(CP) libscotchmetis$(LIB) $(libdir)
+
+$(includedir)/parmetis.h : parmetis.h
+ -$(CP) parmetis.h $(includedir)
+
+$(libdir)/libptscotchparmetis$(LIB): libptscotchparmetis$(LIB)
+ -$(CP) libptscotchparmetis$(LIB) $(libdir)
+
+##
## Todo list.
##
diff --git a/src/decompose_mesh/scotch_5.1.12b/src/scotch/Makefile b/src/decompose_mesh/scotch_5.1.12b/src/scotch/Makefile
index 9840043..b091be4 100644
--- a/src/decompose_mesh/scotch_5.1.12b/src/scotch/Makefile
+++ b/src/decompose_mesh/scotch_5.1.12b/src/scotch/Makefile
@@ -86,7 +86,7 @@ scotch :
mord$(EXE) \
mtst$(EXE)
-ptscotch : clean
+ptscotch :
$(MAKE) CC="$(CCP)" SCOTCHLIB=ptscotch \
dggath$(EXE) \
dgmap$(EXE) \
@@ -95,67 +95,8 @@ ptscotch : clean
dgscat$(EXE) \
dgtst$(EXE)
-# scotch replacement text for install line
-$(bindir)/acpl$(EXE): acpl$(EXE)
- -$(CP) acpl$(EXE) $(bindir)/acpl$(EXE)
-$(bindir)/amk_ccc$(EXE): amk_ccc$(EXE)
- -$(CP) amk_ccc$(EXE) $(bindir)/amk_ccc$(EXE)
-$(bindir)/amk_fft2$(EXE): amk_fft2$(EXE)
- -$(CP) amk_fft2$(EXE) $(bindir)/amk_fft2$(EXE)
-$(bindir)/amk_grf$(EXE): amk_grf$(EXE)
- -$(CP) amk_grf$(EXE) $(bindir)/amk_grf$(EXE)
-$(bindir)/amk_hy$(EXE): amk_hy$(EXE)
- -$(CP) amk_hy$(EXE) $(bindir)/amk_hy$(EXE)
-$(bindir)/amk_m2$(EXE): amk_m2$(EXE)
- -$(CP) amk_m2$(EXE) $(bindir)/amk_m2$(EXE)
-$(bindir)/amk_p2$(EXE): amk_p2$(EXE)
- -$(CP) amk_p2$(EXE) $(bindir)/amk_p2$(EXE)
-$(bindir)/atst$(EXE): atst$(EXE)
- -$(CP) atst$(EXE) $(bindir)/atst$(EXE)
-$(bindir)/gbase$(EXE): gbase$(EXE)
- -$(CP) gbase$(EXE) $(bindir)/gbase$(EXE)
-$(bindir)/gcv$(EXE): gcv$(EXE)
- -$(CP) gcv$(EXE) $(bindir)/gcv$(EXE)
-$(bindir)/gmap$(EXE): gmap$(EXE)
- -$(CP) gmap$(EXE) $(bindir)/gmap$(EXE)
-$(bindir)/gmk_hy$(EXE): gmk_hy$(EXE)
- -$(CP) gmk_hy$(EXE) $(bindir)/gmk_hy$(EXE)
-$(bindir)/gmk_m2$(EXE): gmk_m2$(EXE)
- -$(CP) gmk_m2$(EXE) $(bindir)/gmk_m2$(EXE)
-$(bindir)/gmk_m3$(EXE): gmk_m3$(EXE)
- -$(CP) gmk_m3$(EXE) $(bindir)/gmk_m3$(EXE)
-$(bindir)/gmk_msh$(EXE): gmk_msh$(EXE)
- -$(CP) gmk_msh$(EXE) $(bindir)/gmk_msh$(EXE)
-$(bindir)/gmk_ub2$(EXE): gmk_ub2$(EXE)
- -$(CP) gmk_ub2$(EXE) $(bindir)/gmk_ub2$(EXE)
-$(bindir)/gmtst$(EXE): gmtst$(EXE)
- -$(CP) gmtst$(EXE) $(bindir)/gmtst$(EXE)
-$(bindir)/gord$(EXE): gord$(EXE)
- -$(CP) gord$(EXE) $(bindir)/gord$(EXE)
-$(bindir)/gotst$(EXE): gotst$(EXE)
- -$(CP) gotst$(EXE) $(bindir)/gotst$(EXE)
-$(bindir)/gout$(EXE): gout$(EXE)
- -$(CP) gout$(EXE) $(bindir)/gout$(EXE)
-$(bindir)/gpart$(EXE): $(bindir)/gmap$(EXE)
- -$(RM) $(bindir)/gpart$(EXE)
- -$(LN) $(bindir)/gmap$(EXE) $(bindir)/gpart$(EXE)
-$(bindir)/gscat$(EXE): gscat$(EXE)
- -$(CP) gscat$(EXE) $(bindir)/gscat$(EXE)
-$(bindir)/gtst$(EXE): gtst$(EXE)
- -$(CP) gtst$(EXE) $(bindir)/gtst$(EXE)
-$(bindir)/mcv$(EXE): mcv$(EXE)
- -$(CP) mcv$(EXE) $(bindir)/mcv$(EXE)
-$(bindir)/mmk_m2$(EXE): mmk_m2$(EXE)
- -$(CP) mmk_m2$(EXE) $(bindir)/mmk_m2$(EXE)
-$(bindir)/mmk_m3$(EXE): mmk_m3$(EXE)
- -$(CP) mmk_m3$(EXE) $(bindir)/mmk_m3$(EXE)
-$(bindir)/mord$(EXE): mord$(EXE)
- -$(CP) mord$(EXE) $(bindir)/mord$(EXE)
-$(bindir)/mtst$(EXE): mtst$(EXE)
- -$(CP) mtst$(EXE) $(bindir)/mtst$(EXE)
-
-
-install : $(bindir)/acpl$(EXE) $(bindir)/amk_ccc$(EXE) \
+install : \
+ $(bindir)/acpl$(EXE) $(bindir)/amk_ccc$(EXE) \
$(bindir)/amk_fft2$(EXE) $(bindir)/amk_grf$(EXE) \
$(bindir)/amk_hy$(EXE) $(bindir)/amk_m2$(EXE) \
$(bindir)/amk_p2$(EXE) $(bindir)/atst$(EXE) \
@@ -170,7 +111,10 @@ install : $(bindir)/acpl$(EXE) $(bindir)/amk_ccc$(EXE) \
$(bindir)/mmk_m2$(EXE) $(bindir)/mmk_m3$(EXE) \
$(bindir)/mord$(EXE) $(bindir)/mtst$(EXE)
- -$(CP) dggath$(EXE) dgmap$(EXE) dgord$(EXE) dgpart$(EXE) dgscat$(EXE) dgtst$(EXE) $(bindir)
+ptinstall : \
+ $(bindir)/dggath$(EXE) $(bindir)/dgmap$(EXE) \
+ $(bindir)/dgord$(EXE) $(bindir)/dgpart$(EXE) \
+ $(bindir)/dgscat$(EXE) $(bindir)/dgtst$(EXE)
clean :
-$(RM) *~ *$(OBJ) acpl$(EXE) amk_ccc$(EXE) amk_fft2$(EXE) amk_grf$(EXE) amk_hy$(EXE) amk_m2$(EXE) amk_p2$(EXE) atst$(EXE) gbase$(EXE) gcv$(EXE) *ggath$(EXE) *gmap$(EXE) gmk_hy$(EXE) gmk_m2$(EXE) gmk_m3$(EXE) gmk_msh$(EXE) gmk_ub2$(EXE) gmtst$(EXE) *gord$(EXE) gotst$(EXE) gout$(EXE) *gpart$(EXE) *gscat$(EXE) *gtst$(EXE) mcv$(EXE) mmk_m2$(EXE) mmk_m3$(EXE) mord$(EXE) mtst$(EXE)
@@ -178,6 +122,13 @@ clean :
realclean : clean
##
+## Installation dependencies.
+##
+
+$(bindir)/%$(EXE) : %$(EXE)
+ -$(CP) $? $@
+
+##
## Todo list.
##
More information about the CIG-COMMITS
mailing list