Commit 44ec45bf authored by marsamos's avatar marsamos

extlibs deleted moved to archive and main install

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@8377 c92efa57-630b-4861-b058-cf58834340f0
parent fb7b8b32
......@@ -137,17 +137,15 @@ bindir :
#############################################################
# Targets for external libraries
############################################################
libblas:
if test -e extlibs/archive/blas-1.tar.gz ; then \
( cd extlibs ; $(MAKE) $(MFLAGS) $@) ; fi
libblas : touch-dummy
cd install ; $(MAKE) $(MFLAGS) -f extlibs_makefile $@
liblapack:
if test -e extlibs/archive/lapack-3.2.tar.gz ; then \
( cd extlibs ; $(MAKE) $(MFLAGS) $@) ; fi
liblapack: touch-dummy
cd install ; $(MAKE) $(MFLAGS) -f extlibs_makefile $@
libiotk: touch-dummy
cd install ; $(MAKE) $(MFLAGS) -f extlibs_makefile $@
libiotk:
if test -e extlibs/archive/iotk-1.2.beta.tar.gz ; then \
( cd extlibs ; $(MAKE) $(MFLAGS) $@) ; fi
# In case of trouble with iotk and compilers, add
# FFLAGS="$(FFLAGS_NOOPT)" after $(MFLAGS)
......@@ -218,8 +216,8 @@ clean :
# remove configuration files too
distclean veryclean : clean
- test -d extlibs && ( cd extlibs ; $(MAKE) veryclean)
- rm -rf make.sys
- @(cd install ; $(MAKE) $(MFLAGS) -f plugins_makefile veryclean)
- @(cd install ; $(MAKE) $(MFLAGS) -f extlibs_makefile veryclean)
- rm -rf install/patch-plumed
- cd install ; rm -f config.log configure.msg config.status autom4te.cache \
CPV/version.h ChangeLog* intel.pcl */intel.pcl
......@@ -231,6 +229,7 @@ distclean veryclean : clean
test -d $$dir && ( cd $$dir ; $(MAKE) $(MFLAGS) TLDEPS= clean ) \
done
- test -d GUI && ( cd GUI ; $(MAKE) $(MFLAGS) TLDEPS= veryclean )
- rm -rf make.sys
tar :
@if test -f espresso.tar.gz ; then /bin/rm espresso.tar.gz ; fi
......
Archive contains the .tar.gz files
......@@ -10416,9 +10416,9 @@ ac_config_files="$ac_config_files configure.msg"
ac_config_files="$ac_config_files install/make_wannier90.sys"
ac_config_files="$ac_config_files extlibs/install/make_blas.inc"
ac_config_files="$ac_config_files install/make_blas.inc"
ac_config_files="$ac_config_files extlibs/install/make_lapack.inc"
ac_config_files="$ac_config_files install/make_lapack.inc"
......@@ -10979,8 +10979,8 @@ do
"make.sys") CONFIG_FILES="$CONFIG_FILES make.sys" ;;
"configure.msg") CONFIG_FILES="$CONFIG_FILES configure.msg" ;;
"install/make_wannier90.sys") CONFIG_FILES="$CONFIG_FILES install/make_wannier90.sys" ;;
"extlibs/install/make_blas.inc") CONFIG_FILES="$CONFIG_FILES extlibs/install/make_blas.inc" ;;
"extlibs/install/make_lapack.inc") CONFIG_FILES="$CONFIG_FILES extlibs/install/make_lapack.inc" ;;
"install/make_blas.inc") CONFIG_FILES="$CONFIG_FILES install/make_blas.inc" ;;
"install/make_lapack.inc") CONFIG_FILES="$CONFIG_FILES install/make_lapack.inc" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
......
......@@ -1963,8 +1963,8 @@ AC_CONFIG_FILES(configure.msg)
AC_CONFIG_FILES(install/make_wannier90.sys)
AC_CONFIG_FILES(extlibs/install/make_blas.inc)
AC_CONFIG_FILES(extlibs/install/make_lapack.inc)
AC_CONFIG_FILES(install/make_blas.inc)
AC_CONFIG_FILES(install/make_lapack.inc)
AC_OUTPUT
......
......@@ -24,9 +24,9 @@ fake_blas_external :
libblas_internal:
if test ! -d ../BLAS; then \
( gzip -dc archive/blas-1.tar.gz |(cd ../; tar -xvf -)); fi
if test -e install/make_blas.inc; then \
(cp install/make_blas.inc ../BLAS/make.inc; \
( gzip -dc ../archive/blas-1.tar.gz |(cd ../; tar -xvf -)); fi
if test -e make_blas.inc; then \
(cp make_blas.inc ../BLAS/make.inc; \
cd ../BLAS; $(MAKE) $(BLASLIB)); else \
(echo "no configuration file found for blas"; \
echo "run configure from main QE dir"); fi
......@@ -42,21 +42,21 @@ fake_lapack_external :
liblapack_internal:
if test ! -d ../lapack-3.2; then \
( gzip -dc archive/lapack-3.2.tar.gz | (cd ../; tar -xvf -)); fi
if test -e install/make_lapack.inc; then \
(cp install/make_lapack.inc ../lapack-3.2/make.inc; \
cp install/Makefile_lapack ../lapack-3.2/SRC/Makefile; \
cp install/Makefile_lapack_testing_lin ../lapack-3.2/TESTING/LIN/Makefile; \
( gzip -dc ../archive/lapack-3.2.tar.gz | (cd ../; tar -xvf -)); fi
if test -e make_lapack.inc; then \
(cp make_lapack.inc ../lapack-3.2/make.inc; \
cp Makefile_lapack ../lapack-3.2/SRC/Makefile; \
cp Makefile_lapack_testing_lin ../lapack-3.2/TESTING/LIN/Makefile; \
cd ../lapack-3.2; $(MAKE) lapacklib); else \
(echo "no configuration file found for lapack"; \
echo "run configure from main QE dir"); fi
libiotk:
if test ! -d ../S3DE; then \
(gzip -dc archive/iotk-1.2.beta.tar.gz | (cd ../; tar -xvf -)) ; \
if test -e install/Makefile_iotk; then \
(cp install/Makefile_iotk ../S3DE/iotk/src/Makefile); fi; \
if test -e install/iotk_config.h; then \
(cp install/iotk_config.h ../S3DE/iotk/include/iotk_config.h); fi; fi
(gzip -dc ../archive/iotk-1.2.beta.tar.gz | (cd ../; tar -xvf -)) ; \
if test -e Makefile_iotk; then \
(cp Makefile_iotk ../S3DE/iotk/src/Makefile); fi; \
if test -e iotk_config.h; then \
(cp iotk_config.h ../S3DE/iotk/include/iotk_config.h); fi; fi
cd ../S3DE/iotk/src; $(MAKE) lib+util;
cd ../bin; ln -fs ../S3DE/iotk/tools/iotk .; \
ln -fs ../S3DE/iotk/src/iotk.x .; \
......
......@@ -242,7 +242,7 @@ plumed_clean:
rm -rf ./make-plumed ./patch-plumed
plumed_veryclean: plumed_clean
if test -d ../PLUMED; then (rm -R -f ../PLUMED); fi
rm -rf ./uncompress-plumed
rm -rf ./uncompress-plumed ../plumedpatch_qespresso.sh
##########################################################
# general cleaning
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment