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

Makefile simplification: TOPDIR is used to define the same LIBOBJS everywhere. 

In case of trouble, see instruction in the make.inc file.


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@12840 c92efa57-630b-4861-b058-cf58834340f0
This commit is contained in:
giannozz 2016-08-25 19:27:31 +00:00
parent f8d4f4a4b8
commit 7ce7d161bf
18 changed files with 20 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CPV/src/Makefile
View File

@ -122,8 +122,6 @@ QELA=../../LAXlib/libqela.a
TLDEPS= bindir fftlib mods libs libiotk
LIBOBJS= ../../clib/clib.a ../../iotk/src/libiotk.a
all : tldeps libcp.a manycp.x cp.x cppp.x wfdd.x
manycp.x : manycp.o libcp.a $(QEMODS) $(QEFFT) $(QELA) $(LIBOBJS)

4
Doc/release-notes
View File

@ -1,6 +1,8 @@
New in 6.0 version:
* New XML data file according to the XML Schema
* Socket interface with PALENQUE framework
* New I/O: XML data file according to the XML Schema, initial implementation
of HDF5 binary files (experimental, activate with -D__XSD and -D__HDF5)
* Non-collinear magnetism implemented in epsilon.x, code restructuring
(Tae-Yun Kim, Andrea Ferretti, Cheol-Hwan Park)
* Lin Lin's ACE (Adaptively Compressed Exchange) for hybrid functionals

8
GWW/bse/Makefile
View File

@ -8,11 +8,9 @@ IFLAGS=-I../../include
# location of needed modules
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules \
$(MOD_FLAG)../../PHonon/Gamma/ $(MOD_FLAG)../../PHonon/PH/ \
$(MOD_FLAG)../../PW/src $(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../LAXlib $(MOD_FLAG)../pw4gww $(MOD_FLAG)../gww $(MOD_FLAG).
#location of needed libraries
LIBOBJS= ../../iotk/src/libiotk.a \
../../clib/clib.a
$(MOD_FLAG)../../PW/src $(MOD_FLAG)../../FFTXlib \
$(MOD_FLAG)../../LAXlib $(MOD_FLAG)../pw4gww \
$(MOD_FLAG)../gww $(MOD_FLAG).
BSEOBJS = \
openfil_bse.o \

3
GWW/gww/Makefile
View File

@ -10,9 +10,6 @@ IFLAGS=
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules \
$(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../LAXlib $(MOD_FLAG)../pw4gww $(MOD_FLAG).
#location of needed libraries
LIBOBJS= ../../iotk/src/libiotk.a ../../clib/clib.a
GWWOBJS = \
basic_structures.o \
compact_product.o \

3
GWW/head/Makefile
View File

@ -12,9 +12,6 @@ MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules \
$(MOD_FLAG)../../PHonon/PH $(MOD_FLAG)../../LR_Modules $(MOD_FLAG)../../PW/src \
$(MOD_FLAG)../../LAXlib $(MOD_FLAG)../../FFTXlib $(MOD_FLAG).
#location of needed libraries
LIBOBJS= ../../iotk/src/libiotk.a ../../clib/clib.a
HEADOBJS = \
bcast_ph_input.o \
close_phq.o \

3
GWW/pw4gww/Makefile
View File

@ -10,9 +10,6 @@ IFLAGS=-I../../include
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules \
$(MOD_FLAG)../../PW/src $(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../LAXlib $(MOD_FLAG).
#location of needed libraries
LIBOBJS= ../../iotk/src/libiotk.a ../../clib/clib.a
PW4GWWOBJS = \
allocate_wannier.o \
produce_wannier_gamma.o \

3
NEB/src/Makefile
View File

@ -10,9 +10,6 @@ MODFLAGS= $(MOD_FLAG)../../iotk/src \
$(MOD_FLAG)../../PW/src $(MOD_FLAG).
IFLAGS=
#location of needed libraries
LIBOBJS= ../../iotk/src/libiotk.a ../../clib/clib.a
NEBOBJS = \
neb.o \

3
PHonon/FD/Makefile
View File

@ -9,9 +9,6 @@ include ../../make.inc
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules \
$(MOD_FLAG)../../LAXlib $(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../PW/src $(MOD_FLAG).
#location of needed libraries
LIBOBJS= ../../iotk/src/libiotk.a ../../clib/clib.a
FDOBJS = \
stop_pp.o

5
PHonon/Gamma/Makefile
View File

@ -4,11 +4,10 @@ include ../../make.inc
# location of needed modules and included files (if any)
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules \
$(MOD_FLAG)../../LAXlib $(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../PW/src $(MOD_FLAG).
$(MOD_FLAG)../../LAXlib $(MOD_FLAG)../../FFTXlib \
$(MOD_FLAG)../../PW/src $(MOD_FLAG).
IFLAGS=
LIBOBJS = ../../clib/clib.a ../../iotk/src/libiotk.a
CGOBJS = \
a_h.o \
cg_readin.o \

2
PHonon/PH/Makefile
View File

@ -184,8 +184,6 @@ LRMODS = ../../LR_Modules/liblrmod.a
PWOBJS = ../../PW/src/libpw.a
QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a
LIBOBJS = ../../clib/clib.a ../../iotk/src/libiotk.a
TLDEPS= bindir mods libs pw-lib lr-lib
all : tldeps libs-ph ph.x dynmat.x matdyn.x q2r.x q2trans.x q2trans_fd.x lambda.x fqha.x q2qstar.x

2
PP/src/Makefile
View File

@ -55,8 +55,6 @@ MODULES = $(PWOBJS) $(QEOBJS)
TLDEPS= bindir mods libs pw
LIBOBJS = ../../clib/clib.a ../../iotk/src/libiotk.a
all : tldeps average.x bands.x dos.x epsilon.x initial_state.x fs.x \
plan_avg.x plotband.x plotproj.x plotrho.x pmw.x pp.x projwfc.x \
pawplot.x sumpdos.x pw2wannier90.x pw_export.x pw2gw.x \

2
PW/src/Makefile
View File

@ -256,8 +256,6 @@ QEMODS=../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a
TLDEPS=bindir mods libs liblapack libblas
LIBOBJS = ../../clib/clib.a ../../iotk/src/libiotk.a
all : tldeps pw.x manypw.x generate_vdW_kernel_table.x generate_rVV10_kernel_table.x
pw.x : $(PWOBJS) libpw.a $(LIBOBJS) $(QEMODS)

2
PWCOND/src/Makefile
View File

@ -49,8 +49,6 @@ transmit.o
PWOBJS = ../../PW/src/libpw.a
QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a
LIBOBJS = ../../clib/clib.a ../../iotk/src/libiotk.a
TLDEPS= bindir mods libs pw pp
all : tldeps pwcond.x

2
TDDFPT/src/Makefile
View File

@ -2,8 +2,6 @@
include ../../make.inc
IFLAGS = -I../../include
LIBOBJS = ../../clib/clib.a ../../iotk/src/libiotk.a
# location of needed modules
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../LAXlib \

5
TDDFPT/tools/Makefile
View File

@ -2,11 +2,10 @@
include ../../make.inc
IFLAGS = -I../../include
LIBOBJS = ../../clib/clib.a ../../iotk/src/libiotk.a
# location of needed modules
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../LAXlib $(MOD_FLAG).
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules \
$(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../LAXlib $(MOD_FLAG).
QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a
PWOBJS = ../../PW/src/libpw.a

8
XSpectra/src/Makefile
View File

@ -43,11 +43,9 @@ MANIP_XS_OBJ=./gaunt_mod.o
QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a
PWOBJS = ../../PW/src/libpw.a
LIBOBJS = ../../iotk/src/libiotk.a ../../clib/clib.a
TLDEPS = bindir libs pw
all : tldeps xspectra.x spectra_manipulation.x
all : tldeps xspectra.x spectra_manipulation.x molecularnexafs.x
xspectra.x : xspectra.o $(XOBJS) $(GIPAWOBJS) $(QEMODS) $(PWOBJS)
$(MPIF90) -o $@ xspectra.o $(XOBJS) $(GIPAWOBJS) \
@ -59,6 +57,10 @@ spectra_manipulation.x : spectra_manipulation.o $(MANIP_XS_OBJ) $(QEMODS) $(PWOB
$(LDFLAGS) $(LIBOBJS) $(LIBS)
- ( cd ../../bin ; ln -fs ../XSpectra/src/$@ . )
molecularnexafs.x : molecularnexafs.o
$(MPIF90) -o $@ molecularnexafs.o
- ( cd ../../bin ; ln -fs ../XSpectra/src/$@ . )
tldeps :
test -n "$(TLDEPS)" && ( cd ../.. ; $(MAKE) $(MFLAGS) $(TLDEPS) || exit 1) || :

2
atomic/src/Makefile
View File

@ -8,8 +8,6 @@ include ../../make.inc
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../LAXlib $(MOD_FLAG).
IFLAGS=
LIBOBJS = ../../iotk/src/libiotk.a ../../clib/clib.a
LD1OBJS = \
add_exchange.o \
all_electron.o \

9
install/make.inc.in
View File

@ -25,11 +25,12 @@
@SET_MAKE@
# Top QE directory, not used in QE but useful for linking QE libs with plugins
# Top QE directory, useful for locating libraries, linking QE with plugins
# The following syntax should always point to TOPDIR:
# $(dir $(abspath $(filter %make.inc,$(MAKEFILE_LIST))))
TOPDIR = $(dir $(abspath $(filter %make.inc,$(MAKEFILE_LIST))))
# if it doesn't work, uncomment the following line (edit if needed):
TOPDIR = @topdir@
# TOPDIR = @topdir@
# DFLAGS = precompilation options (possible arguments to -D and -U)
# used by the C compiler and preprocessor
@ -150,7 +151,7 @@ RANLIB = @ranlib@
FLIB_TARGETS = all
LIBOBJS = ../clib/clib.a ../iotk/src/libiotk.a
LIBOBJS = $(TOPDIR)/clib/clib.a $(TOPDIR)/iotk/src/libiotk.a
LIBS = $(SCALAPACK_LIBS) $(LAPACK_LIBS) $(FFT_LIBS) $(BLAS_LIBS) $(MPI_LIBS) $(MASS_LIBS) $(LD_LIBS)
# wget or curl - useful to download from network