Commit bdff849b authored by Marco Govoni's avatar Marco Govoni
Browse files

Updated Makefiles to incorporate Libraries/Forpy

parent 5a73a6b9
...@@ -5,6 +5,7 @@ include ../../make.inc ...@@ -5,6 +5,7 @@ include ../../make.inc
# location of needed modules # location of needed modules
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../LAXlib \ MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../LAXlib \
$(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../PW/src \ $(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../PW/src \
$(MOD_FLAG)../Libraries/Forpy \
$(MOD_FLAG)../Libraries/Json \ $(MOD_FLAG)../Libraries/Json \
$(MOD_FLAG)../Libraries/Base64 \ $(MOD_FLAG)../Libraries/Base64 \
$(MOD_FLAG)../Modules \ $(MOD_FLAG)../Modules \
...@@ -28,7 +29,7 @@ wfreq_io.o \ ...@@ -28,7 +29,7 @@ wfreq_io.o \
wfreq_restart.o wfreq_restart.o
PWOBJS = ../../PW/src/libpw.a PWOBJS = ../../PW/src/libpw.a
QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a ../Libraries/Json/libjson.a ../Libraries/Base64/libbase64.a QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a ../Libraries/Forpy/libforpy.a ../Libraries/Json/libjson.a ../Libraries/Base64/libbase64.a
TLDEPS= bindir mods libs pw TLDEPS= bindir mods libs pw
......
...@@ -5,6 +5,7 @@ include ../../make.inc ...@@ -5,6 +5,7 @@ include ../../make.inc
# location of needed modules # location of needed modules
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../LAXlib \ MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../LAXlib \
$(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../PW/src \ $(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../PW/src \
$(MOD_FLAG)../Libraries/Forpy \
$(MOD_FLAG)../Libraries/Json \ $(MOD_FLAG)../Libraries/Json \
$(MOD_FLAG)../Libraries/Base64 \ $(MOD_FLAG)../Libraries/Base64 \
$(MOD_FLAG)../Modules \ $(MOD_FLAG)../Modules \
...@@ -41,7 +42,7 @@ read_pwout.o \ ...@@ -41,7 +42,7 @@ read_pwout.o \
bar.o bar.o
PWOBJS = ../../PW/src/libpw.a PWOBJS = ../../PW/src/libpw.a
QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a ../Libraries/Json/libjson.a ../Libraries/Base64/libbase64.a QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a ../Libraries/Forpy/libforpy.a ../Libraries/Json/libjson.a ../Libraries/Base64/libbase64.a
TLDEPS= bindir mods libs pw TLDEPS= bindir mods libs pw
......
...@@ -5,6 +5,7 @@ include ../../make.inc ...@@ -5,6 +5,7 @@ include ../../make.inc
# location of needed modules # location of needed modules
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../LAXlib \ MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../LAXlib \
$(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../PW/src \ $(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../PW/src \
$(MOD_FLAG)../Libraries/Forpy \
$(MOD_FLAG)../Libraries/Json \ $(MOD_FLAG)../Libraries/Json \
$(MOD_FLAG)../Libraries/Base64 \ $(MOD_FLAG)../Libraries/Base64 \
$(MOD_FLAG)../Modules \ $(MOD_FLAG)../Modules \
...@@ -32,7 +33,7 @@ do_sxx.o \ ...@@ -32,7 +33,7 @@ do_sxx.o \
westpp.o westpp.o
PWOBJS = ../../PW/src/libpw.a PWOBJS = ../../PW/src/libpw.a
QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a ../Libraries/Json/libjson.a ../Libraries/Base64/libbase64.a QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a ../Libraries/Forpy/libforpy.a ../Libraries/Json/libjson.a ../Libraries/Base64/libbase64.a
WESTLIBS = \ WESTLIBS = \
../DFPT_kernel/lib_dfpt_kernel.a \ ../DFPT_kernel/lib_dfpt_kernel.a \
../IO_kernel/lib_io_kernel.a \ ../IO_kernel/lib_io_kernel.a \
......
...@@ -5,6 +5,7 @@ include ../../make.inc ...@@ -5,6 +5,7 @@ include ../../make.inc
# location of needed modules # location of needed modules
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../LAXlib \ MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../LAXlib \
$(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../PW/src \ $(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../PW/src \
$(MOD_FLAG)../Libraries/Forpy \
$(MOD_FLAG)../Libraries/Json \ $(MOD_FLAG)../Libraries/Json \
$(MOD_FLAG)../Libraries/Base64 \ $(MOD_FLAG)../Libraries/Base64 \
$(MOD_FLAG)../Modules \ $(MOD_FLAG)../Modules \
...@@ -81,7 +82,7 @@ wfreq.o ...@@ -81,7 +82,7 @@ wfreq.o
##io_eigenfreq.o ##io_eigenfreq.o
PWOBJS = ../../PW/src/libpw.a PWOBJS = ../../PW/src/libpw.a
QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a ../Libraries/Json/libjson.a ../Libraries/Base64/libbase64.a QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a ../Libraries/Forpy/libforpy.a ../Libraries/Json/libjson.a ../Libraries/Base64/libbase64.a
WESTLIBS = \ WESTLIBS = \
../IO_kernel/lib_io_kernel.a \ ../IO_kernel/lib_io_kernel.a \
../DFPT_kernel/lib_dfpt_kernel.a \ ../DFPT_kernel/lib_dfpt_kernel.a \
......
...@@ -5,6 +5,7 @@ include ../../make.inc ...@@ -5,6 +5,7 @@ include ../../make.inc
# location of needed modules # location of needed modules
MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../LAXlib \ MODFLAGS= $(MOD_FLAG)../../iotk/src $(MOD_FLAG)../../Modules $(MOD_FLAG)../../LAXlib \
$(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../PW/src \ $(MOD_FLAG)../../FFTXlib $(MOD_FLAG)../../PW/src \
$(MOD_FLAG)../Libraries/Forpy \
$(MOD_FLAG)../Libraries/Json \ $(MOD_FLAG)../Libraries/Json \
$(MOD_FLAG)../Libraries/Base64 \ $(MOD_FLAG)../Libraries/Base64 \
$(MOD_FLAG)../Modules \ $(MOD_FLAG)../Modules \
...@@ -29,7 +30,7 @@ davidson_diago.o \ ...@@ -29,7 +30,7 @@ davidson_diago.o \
wstat.o wstat.o
PWOBJS = ../../PW/src/libpw.a PWOBJS = ../../PW/src/libpw.a
QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a ../Libraries/Json/libjson.a ../Libraries/Base64/libbase64.a QEMODS = ../../Modules/libqemod.a ../../FFTXlib/libqefft.a ../../LAXlib/libqela.a ../Libraries/Forpy/libforpy.a ../Libraries/Json/libjson.a ../Libraries/Base64/libbase64.a
WESTLIBS = \ WESTLIBS = \
../IO_kernel/lib_io_kernel.a \ ../IO_kernel/lib_io_kernel.a \
../DFPT_kernel/lib_dfpt_kernel.a \ ../DFPT_kernel/lib_dfpt_kernel.a \
......
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