Restoring PH for GPU

Author: fspiga

PH/Makefile

@@ -8,10 +8,10 @@ MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../FF
           $(MOD_FLAG)../../PW/src $(MOD_FLAG)../../PHonon/PH \
           $(MOD_FLAG). 
 
-PWMODS = ../../PW/src/libpw.a ../PW/libpwgpu.a
-QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../Modules/libqemodgpu.a
+PWMODS = ../../LR_Modules/liblrmod.a ../../PW/src/libpw.a ../PW/libpwgpu.a
+QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a ../Modules/libqemodgpu.a
 
-LIBOBJS        = ../../flib/ptools.a ../../flib/flib.a ../../clib/clib.a ../../iotk/src/libiotk.a
+LIBOBJS        = ../../clib/clib.a ../../iotk/src/libiotk.a
 
 TLDEPS= bindir mods libs pw-gpu
 

install/Makefile.gpu.in

@@ -54,7 +54,7 @@ endif
 # Redirect to GPU build
 ph	: ph-gpu
 
-ph-gpu : bindir  mods libphiGEMM libMAGMA gpu-mods libs pw-gpu
+ph-gpu : bindir  mods libphiGEMM libMAGMA gpu-mods libs pw-gpu lrmods 
 	cd install ; $(MAKE) $(MFLAGS) -f plugins_makefile uncompress-phonon
 ifeq ($(PHIGEMM_SYMBOLS),1) 
 	grep -rl -E 'gemm|GEMM' ./PHonon/PH/*.f90 | python ./GPU/scripts/addPhigemmSymbs.py
@@ -115,6 +115,9 @@ libenviron :  mods
 	( if test -d Environ ; then cd Environ ; if test "$(MAKE)" = "" ;  \
 	then make $(MFLAGS) TLDEPS= all; else $(MAKE) $(MFLAGS) TLDEPS= all ; fi ; fi )
 
+lrmods :
+	( cd LR_Modules ; $(MAKE) TLDEPS=lr-lib || exit 1 )
+
 bindir :
 	test -d bin || mkdir bin