scnc
/
quantum-espresso
mirror of https://gitlab.com/QEF/q-e.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

adding the FoX library to the archive and adding its compilation as external library 

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@13643 c92efa57-630b-4861-b058-cf58834340f0
This commit is contained in:
pietrodelugas 2017-07-28 20:01:07 +00:00
parent 3e30b7b51c
commit 2d1e77948a
6 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -65,15 +65,15 @@ default :
# If "|| exit 1" is not present, the error code from make in subdirectories
# is not returned and make goes on even if compilation has failed
pw : bindir libfft libla libutil mods liblapack libs libiotk
pw : bindir libfft libla libutil mods liblapack libs libiotk libfox
if test -d PW ; then \
( cd PW ; $(MAKE) TLDEPS= all || exit 1) ; fi
pw-lib : bindir libfft libla libutil mods liblapack libs libiotk
pw-lib : bindir libfft libla libutil mods liblapack libs libiotk libfox
if test -d PW ; then \
( cd PW ; $(MAKE) TLDEPS= pw-lib || exit 1) ; fi
cp : bindir libfft libla libutil mods liblapack libs libiotk
cp : bindir libfft libla libutils mods liblapack libs libiotk libfox
if test -d CPV ; then \
( cd CPV ; $(MAKE) TLDEPS= all || exit 1) ; fi
@ -170,7 +170,7 @@ libfft : touch-dummy
libutil : touch-dummy
( cd UtilXlib ; $(MAKE) TLDEPS= all || exit 1 )
mods : libiotk libla libfft libutil
mods : libiotk libfox libla libfft libutil
( cd Modules ; $(MAKE) TLDEPS= all || exit 1 )
libs : mods
@ -194,6 +194,8 @@ liblapack: touch-dummy
libiotk: touch-dummy
cd install ; $(MAKE) -f extlibs_makefile $@
libfox: touch-dummy
cd install ; $(MAKE) -f extlibs_makefile $@
# In case of trouble with iotk and compilers, add
# FFLAGS="$(FFLAGS_NOOPT)" after $(MFLAGS)

BIN
archive/fox.tgz Normal file
View File

Binary file not shown.

2
install/configure.ac
View File

@ -28,7 +28,7 @@ X_AC_QE_ARCH()
try_dflags=""
# "-I../include" is required by IOTK ...
try_iflags="-I\$(TOPDIR)/include -I../include/"
try_iflags="-I\$(TOPDIR)/include -I\$(TOPDIR)/FoX/finclude -I../include/"
# Checking archiver...
X_AC_QE_AR()

7
install/extlibs_makefile
View File

@ -75,7 +75,12 @@ libiotk:
ln -fs ../S3DE/iotk/src/iotk.x .; \
ln -fs ../S3DE/iotk/src/iotk_print_kinds.x .; \
cd ../; ln -fs S3DE/iotk iotk
libfox:
if test ! -d ../FoX; then \
(gzip -dc ../archive/fox.tgz | (cd ../; tar -xvf -)); \
cd ../fox/; ./configure --prefix=$(TOPDIR)/FoX ;\
cd ../fox; $(MAKE) install; rm -fr ../fox;fi
# ELPA
libelpa : libelpa_$(ELPA_LIBS_SWITCH)

6
install/make.inc.in
View File

@ -129,6 +129,8 @@ FFT_LIBS = @fft_libs@
# HDF5
HDF5_LIB = @hdf5_libs@
FOX_LIB = -L$(TOPDIR)/FoX/lib -lFoX_dom -lFoX_sax -lFoX_wxml -lFoX_common\
-lFoX_utils -lFoX_fsys
# For parallel execution, the correct path to MPI libraries must
# be specified in MPI_LIBS (except for IBM if you use mpxlf)
@ -153,8 +155,8 @@ RANLIB = @ranlib@
FLIB_TARGETS = all
LIBOBJS = $(TOPDIR)/clib/clib.a $(TOPDIR)/iotk/src/libiotk.a
LIBS = $(SCALAPACK_LIBS) $(LAPACK_LIBS) $(FFT_LIBS) $(BLAS_LIBS) $(MPI_LIBS) $(MASS_LIBS) $(HDF5_LIB) $(LD_LIBS)
LIBOBJS = $(TOPDIR)/clib/clib.a $(TOPDIR)/iotk/src/libiotk.a
LIBS = $(SCALAPACK_LIBS) $(LAPACK_LIBS) $(FOX_LIB) $(FFT_LIBS) $(BLAS_LIBS) $(MPI_LIBS) $(MASS_LIBS) $(HDF5_LIB) $(LD_LIBS)
# wget or curl - useful to download from network
WGET = @wget@

2
install/makedeps.sh
View File

@ -96,6 +96,8 @@ for dir in $dirs; do
# handle special cases: modules for C-fortran binding, hdf5, MPI
sed '/@iso_c_binding@/d' make.depend > make.depend.tmp
sed '/@hdf5@/d;/@mpi@/d' make.depend.tmp > make.depend
sed '/@fox_wxml@/d' make.depend > make.depend.tmp
sed '/@fox_dom@/d' make.depend.tmp > make.depend
if test "$DIR" = "FFTXlib"
then