Moving the iotk dependency wasn't working as expected: better to wait

until iotk has disappeared
This commit is contained in:
Paolo Giannozzi 2018-08-22 10:09:38 +02:00
parent f603e4adb8
commit 145d2ed684
5 changed files with 4 additions and 18 deletions

View File

@ -7,10 +7,6 @@ LIBMIN = ../minpack/minpacklib.a
MODFLAGS= $(BASEMOD_FLAGS) \
$(MOD_FLAG)../../PW/src $(MOD_FLAG)../pw4gww $(MOD_FLAG)../gww
#location of needed libraries
LIBOBJS= ../../iotk/src/libiotk.a \
../../clib/clib.a
SIMPLEOBJS = \
stop_pp.o \
read_export.o \

View File

@ -6,10 +6,6 @@ include ../../make.inc
MODFLAGS= $(BASEMOD_FLAGS) \
$(MOD_FLAG)../../GWW/gww
#location of needed libraries
LIBOBJS= ../../iotk/src/libiotk.a \
../../clib/clib.a
EXCOBJS = \
simple_object.o \
start_end.o \

View File

@ -6,10 +6,6 @@ include ../../make.inc
MODFLAGS= $(BASEMOD_FLAGS) \
$(MOD_FLAG)../pw4gww $(MOD_FLAG)../../PW/src
#location of needed libraries
LIBOBJS= ../../iotk/src/libiotk.a \
../../clib/clib.a
SIMPLEIPOBJS = \
simple_ip_objects.o \
start_end.o \

View File

@ -89,11 +89,11 @@ tddfpt : phlibs
if test -d TDDFPT; then \
( cd TDDFPT; $(MAKE) all || exit 1) ; fi
pp : pwlibs libiotk
pp : pwlibs
if test -d PP ; then \
( cd PP ; $(MAKE) TLDEPS= all || exit 1 ) ; fi
pwcond : pwlibs libiotk
pwcond : pwlibs
if test -d PWCOND ; then \
( cd PWCOND ; $(MAKE) TLDEPS= all || exit 1 ) ; fi
@ -164,7 +164,7 @@ pwlibs: bindir libs mods libks_solvers dftd3
if test -d PW ; then \
( cd PW ; $(MAKE) pw-lib || exit 1) ; fi
phlibs: pwlibs lrmods libiotk
phlibs: pwlibs lrmods
if test -d PHonon; then \
( cd PHonon; $(MAKE) ph-lib || exit 1) ; fi
@ -176,7 +176,7 @@ pw4gwwlib : phlibs
if test -d GWW ; then \
( cd GWW ; $(MAKE) pw4gwwa || exit 1 ) ; fi
mods : libfox libutil libla libfft
mods : libiotk libfox libutil libla libfft
( cd Modules ; $(MAKE) TLDEPS= all || exit 1 )
libks_solvers : libs libutil libla

View File

@ -12,8 +12,6 @@ PWOBJS = ../src/libpw.a
TLDEPS= pwlibs
LIBOBJS = ../../clib/clib.a ../../iotk/src/libiotk.a
all : tldeps ev.x kpoints.x pwi2xsf.x ibrav2cell.x
ibrav2cell.x : ibrav2cell.o $(PWOBJS) $(QEMODS) $(LIBOBJS)