From 338679aa6331021d0a0fd24d17e70ebb1dfc4b96 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Mon, 10 Mar 2008 10:39:30 +0000 Subject: [PATCH] mld2p4: Makefile mkdir.sh Fixed install target in makefile. Deleted Make.inc, should only be generated on-the-fly. --- Make.inc | 51 --------------------------------------------------- Makefile | 8 ++++---- mkdir.sh | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 55 deletions(-) delete mode 100644 Make.inc create mode 100755 mkdir.sh diff --git a/Make.inc b/Make.inc deleted file mode 100644 index 3c8ba190..00000000 --- a/Make.inc +++ /dev/null @@ -1,51 +0,0 @@ -########################################################## -# # -# Note: directories external to the MLD2P4 subtree # -# must be specified here with absolute pathnames # -# # -########################################################## -PSBLASDIR=/home/sfilippo/NUMERICAL/PSBLAS2/psblas2-dev/ -include $(PSBLASDIR)/Make.inc - - -INSTALL=/usr/bin/install -c -INSTALL_DATA=${INSTALL} -m 644 -INSTALL_DIR=/usr/local/PSBLAS/MLD2P4/gnu43 -INSTALL_LIBDIR=/usr/local/PSBLAS/MLD2P4/gnu43/lib -INSTALL_INCLUDEDIR=/usr/local/PSBLAS/MLD2P4/gnu43/include - -########################################################## -# # -# Additional defines and libraries for multilevel # -# Note that these libraries should be compatible # -# (compiled with) the compilers specified in the # -# PSBLAS main Make.inc # -# # -# Examples: # -# UMFLIBS=-lumfpack -lamd -L/path/to/UMFPACK # -# UMFFLAGS=-DHave_UMF_ -I/path/to/UMFPACK # -# # -# SLULIBS=-lslu -L/path/to/SuperLU # -# SLUFLAGS=-DHave_SLU_ -I/path/to/SuperLU # -# # -# SLUDISTLIBS=-lslud -L/path/to/SuperLUDist # -# SLUDISTFLAGS=-DHave_SLUDist_ -I/path/to/SuperLUDist # -# # -########################################################## - -SLULIBS= -SLUFLAGS= - -SLUDISTLIBS= -SLUDISTFLAGS= - - -UMFLIBS=-lumfpack -lamd -L/home/sfilippo/LIB/Umfpack_gcc41/ -UMFFLAGS=-DHave_UMF_ -I/home/sfilippo/LIB/Umfpack_gcc41/ - - -LDLIBS=$(SLULIBS) $(SLUDISTLIBS) $(UMFLIBS) $(PSBLDLIBS) - -# -CDEFINES=$(SLUFLAGS) $(UMFFLAGS) $(SLUDISTFLAGS) $(PSBCDEFINES) -FDEFINES=$(PSBFDEFINES) diff --git a/Makefile b/Makefile index 1339a55b..76d22c73 100644 --- a/Makefile +++ b/Makefile @@ -13,10 +13,10 @@ kryl: (cd krylov; make lib) install: - ($(INSTALL) -d $(INSTALL_DIR)/lib &&\ - $(INSTALL_DATA) lib/*.a $(INSTALL_DIR)/lib) - ($(INSTALL) -d $(INSTALL_DIR)/include && \ - $(INSTALL_DATA) lib/*$(.mod) $(INSTALL_DIR)/include) + (./mkdir.sh $(INSTALL_LIBDIR) &&\ + $(INSTALL_DATA) lib/*.a $(INSTALL_LIBDIR)) + (./mkdir.sh $(INSTALL_INCLUDEDIR) && \ + $(INSTALL_DATA) lib/*$(.mod) $(INSTALL_INCLUDEDIR)) veryclean: (cd mlprec; make veryclean) (cd krylov; make veryclean) diff --git a/mkdir.sh b/mkdir.sh new file mode 100755 index 00000000..0a9820ea --- /dev/null +++ b/mkdir.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +dir=$1; + +dir_cmp=`echo $dir | sed 's./. /.g'` +if [ ! -d $dir ] +then + path='' + for cmp in $dir_cmp ; do + path="$path$cmp"; + if [ ! -d $path ] ; then + mkdir $path; rc=$?; + if [ $rc != 0 ] ; then + echo "Error while making directory $path " + exit 1 + fi + fi + done +fi + \ No newline at end of file