*** empty log message ***

git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@6 c92efa57-630b-4861-b058-cf58834340f0
2003-01-20 11:17:39 +00:00 · 2003-01-20 11:17:39 +00:00 · 71f80d3e07
parent be381d0bd0
commit 71f80d3e07
10 changed files with 59 additions and 37 deletions
--- a/install/Make.alpha
+++ b/install/Make.alpha
@ -13,7 +13,8 @@ CPP = /lib/cpp
 #  in some cases it is slower than the full 3d FFT)
 # Use -DFFTW instead of -DDXML if you use fft routines from fftw library
 #
-CPPFLAGS = -P -DDEC -DLANGUAGE_FORTRAN -DDXML -DNOPENCILS -I$(INCL_DIR)
+CPPFLAGS = -P -DDEC -DLANGUAGE_FORTRAN -DDXML -DNOPENCILS \
+           -I$(OSHOME)/include

 #
 # Fortran compiler:
@ -22,10 +23,13 @@ F90 = f90
 #
 # options suggested by Ph. Baranek:
 # F90FLAGS =-O5 -fast -big_endian  -fpe0 -check underflow -real_size 64 \
-#        -align dcommons -align records -I. -I$(INCL_DIR)
+#        -align dcommons -align records
 #  -big_endian allows to read files generated on other (big endian) machines
-# F90FLAGS = -O -real_size 64 -align dcommons -align records -I. -I$(INCL_DIR)
-
+F90FLAGS = -O -real_size 64 -align dcommons -align records
+#
+# This is needed to tell the compiler where modules are
+#
+MODULEFLAG= -I$(OSHOME)/Modules -I$(OSHOME)/PW -I$(OSHOME)/PH
 #
 # Libraries:
 # If you have dxml or cxml libraries, use
--- a/install/Make.alphaMPI
+++ b/install/Make.alphaMPI
@ -14,14 +14,18 @@ CPP = /usr/bin/cpp
 # (in some cases it is slower than the full 3d FFT)
 #
 CPPFLAGS = -P -E -traditional -DDEC -DFFTW -DPARA -D__MPI \
-                 -DLANGUAGE_FORTRAN -I$(INCL_DIR)
+                 -DLANGUAGE_FORTRAN -I$(OSHOME)/include

 #
 # Fortran compiler:
 #
 F90 = f90
 F90FLAGS = -O -fpe0 -check underflow -real_size 64 -align dcommons \
-	-align records -I$(INCL_DIR)
+	-align records
+#
+# This is needed to tell the compiler where modules are
+#
+MODULEFLAG= -I$(OSHOME)/Modules -I$(OSHOME)/PW -I$(OSHOME)/PH

 #
 # Libraries (mpi + cxml + fftw) :
--- a/install/Make.beowulf
+++ b/install/Make.beowulf
@ -13,7 +13,7 @@ CPP = /lib/cpp
 # Define FFTW library names with one underscore less than they have in
 # the library (one underscore is added by the compiler)
 #
-CPPFLAGS = -P -traditional -I$(INCL_DIR) -DPC -DPGI -DPARA -D__MPI -DFFTW \
+CPPFLAGS = -P -traditional -I$(OSHOME)/include -DPC -DPGI -DPARA -D__MPI -DFFTW \
           -D"FFTWND_F77_ONE=fftwnd_f77_one" \
           -D"FFTW3D_F77_CREATE_PLAN=fftw3d_f77_create_plan" \
           -D"FFTW_F77_CREATE_PLAN=fftw_f77_create_plan" \
@ -24,7 +24,11 @@ F90 =mpif90
 #
 # Please note: -r8 is necessary for numerical stability ..
 #
-F90FLAGS =  -fast -r8 -I$(INCL_DIR) 
+F90FLAGS =  -fast -r8
+#
+# This is needed to tell the compiler where modules are
+#
+MODULEFLAG= -I$(OSHOME)/Modules -I$(OSHOME)/PW -I$(OSHOME)/PH

 #
 # Loader:
@ -38,7 +42,7 @@ LIBS = -L/usr/local/pgi/linux86/lib/ -llapack -lblas -L/usr/local/lib -lfftw
 #LIBS = -L/usr/local/pgi/linux86/lib/ -llapack -L/cineca/lib/ATLAS -lf77blas -latlas -L/cineca/lib -lfftw 
 #
 LD=$(F90)
-LFLAGS = $(LIBS) -I$(INCL_DIR)
+LFLAGS = $(LIBS) -I$(MODULEFLAG)

 #
 # ar:
--- a/install/Make.fujitsu
+++ b/install/Make.fujitsu
@ -8,16 +8,20 @@ CPP = /usr/lib/cpp
 #
 # -DLANGUAGE_FORTRAN avoids that // is considered as a C++ comment
 #
-CPPFLAGS =  -P -DFUJ64 -DLANGUAGE_FORTRAN -I $(INCL_DIR) 
+CPPFLAGS =  -P -DFUJ64 -DLANGUAGE_FORTRAN -I $(OSHOME)/include

 #
 # Fortran compiler:
 #
 F90C = frt
-#F90FLAGS = -O4 -X9 -AU -AR -Am -Kalign9 -Kfreealloc -KA64 -M$(INCL_DIR)
-#F90FLAGS = -O4 -X9 -AU -AR -Am -Kalign9  -M$(INCL_DIR)
-#F90FLAGS = -O4 -KA64 -Kfast -Knof90move -Kalign7 -Knofreealloc -Ad -AR -Am -M$(INCL_DIR)
-F90FLAGS = -g -Ad -AR -Am -M$(INCL_DIR)
+#F90FLAGS = -O4 -X9 -AU -AR -Am -Kalign9 -Kfreealloc -KA64
+#F90FLAGS = -O4 -X9 -AU -AR -Am -Kalign9
+#F90FLAGS = -O4 -KA64 -Kfast -Knof90move -Kalign7 -Knofreealloc -Ad -AR -Am
+F90FLAGS = -g -Ad -AR -Am
+#
+# This is needed to tell the compiler where modules are
+#
+MODULEFLAG= -M$(OSHOME)/Modules -M$(OSHOME)/PW -M$(OSHOME)/PH
 #
 # Libraries:
 LIBS= -L/usr/lang/lib -llapackvp -lblasvp -lssl2vp  -L/usr/local/lib/lib64/ -lfftvp_news  -lmp
--- a/install/Make.origin
+++ b/install/Make.origin
@ -10,7 +10,7 @@ CPP = /lib/cpp
 # Add -DFFTW if you want to use fft routines from fftw library
 # instead of fft from complib library
 #
-CPPFLAGS = -P -DORIGIN -DPARA -D__MPI -I$(INCL_DIR)
+CPPFLAGS = -P -DORIGIN -DPARA -D__MPI -I$(OSHOME)/include

 #
 # Fortran compiler:
@ -19,7 +19,11 @@ F90 = f90
 #
 # use -O3 only if you are sure that it actually works 
 #
-F90FLAGS = -mips4 -64 -O2 -r10000 -r8 -I/usr/include -I../include
+F90FLAGS = -mips4 -64 -O2 -r10000 -r8
+#
+# This is needed to tell the compiler where modules are
+#
+MODULEFLAG= -I$(OSHOME)/Modules -I$(OSHOME)/PW -I$(OSHOME)/PH

 #
 # Libraries:
@ -27,13 +31,9 @@ F90FLAGS = -mips4 -64 -O2 -r10000 -r8 -I/usr/include -I../include
 LIBS = -lmpi -lcomplib.sgimath
 #
 # Loader:
-# $(PWLIBS) are defined in main/Makefile and automatically loaded.
-# The loader of some machines is unable to resolve the few existing
-# cross-references between libraries in $(PWLIBS). Reloading them
-# once again should fix the problem
 LD=$(F90)

-LFLAGS = $(PWLIBS) $(LIBS)
+LFLAGS = $(LIBS)

 #
 # ar:
--- a/install/Make.pc_abs
+++ b/install/Make.pc_abs
@ -13,7 +13,7 @@ CPP = /lib/cpp
 # library names contain respectively one or two underscores at the end
 # Define FFTW library names exactly as they appear in the library
 #
-CPPFLAGS = -P -traditional -I$(INCL_DIR) -DPC -DABSOFT -DFFTW \
+CPPFLAGS = -P -traditional -I$(OSHOME)/include -DPC -DABSOFT -DFFTW \
           -DADD_BLAS_ONE_UNDERSCORE \
           -D"FFTWND_F77_ONE=fftwnd_f77_one" \
           -D"FFTW3D_F77_CREATE_PLAN=fftw3d_f77_create_plan"
@ -33,7 +33,11 @@ F90 = f90
 #                  -B101 for Pentium    optimization
 #                  -N113 Promote REAL and COMPLEX data types to DOUBLE
 #
-F90FLAGS =-s -N113 -O -B100 -YEXT_NAMES=LCS -p../include
+F90FLAGS =-s -N113 -O -B100 -YEXT_NAMES=LCS
+#
+# This is needed to tell the compiler where modules are
+#
+MODULEFLAG= -I$(OSHOME)/Modules -I$(OSHOME)/PW -I$(OSHOME)/PH

 #
 # Loader:
--- a/install/Make.pc_pgi
+++ b/install/Make.pc_pgi
@ -13,7 +13,7 @@ CPP = /lib/cpp
 # Define FFTW library names with one underscore less than they have in
 # the library (one underscore is added by the compiler)
 #
-CPPFLAGS = -P -traditional -I$(INCL_DIR) -DPC -DPGI -DFFTW  \
+CPPFLAGS = -P -traditional -I$(OSHOME)/include -DPC -DPGI -DFFTW  \
           -D"FFTWND_F77_ONE=fftwnd_f77_one" \
           -D"FFTW3D_F77_CREATE_PLAN=fftw3d_f77_create_plan"

@ -21,7 +21,11 @@ CPPFLAGS = -P -traditional -I$(INCL_DIR) -DPC -DPGI -DFFTW  \
 # Fortran compilers:
 # Please note: -r8 is necessary for numerical stability ..
 F90 =pgf90
-F90FLAGS =  -fast -r8 -I$(INCL_DIR) 
+F90FLAGS =  -fast -r8
+#
+# This is needed to tell the compiler where modules are
+#
+MODULEFLAG= -I$(OSHOME)/Modules -I$(OSHOME)/PW -I$(OSHOME)/PH

 #
 # Loader:
@ -31,7 +35,7 @@ F90FLAGS =  -fast -r8 -I$(INCL_DIR)
 LD=$(F90)
 LIBS = -L/usr/local/pgi/linux86/lib/ -llapack -lblas -L/usr/local/lib -lfftw 
 #
-LFLAGS = $(LIBS) -I$(INCL_DIR)
+LFLAGS = $(LIBS) -I$(MODULEFLAG)

 #
 # ar:
--- a/install/Make.sun
+++ b/install/Make.sun
@ -5,14 +5,14 @@
 # Preprocessor
 #
 CPP = fpp
-CPPFLAGS = -P -DSUN -DNOPENCILS -DHAS_ZHEGVX -I$(INCL_DIR)
+CPPFLAGS = -P -DSUN -DNOPENCILS -DHAS_ZHEGVX -I$(OSHOME)/include
 #
 # Fortran compiler:
 #
 F90 = f90
 #
-F90FLAGS = -fast -dalign -xchip=ultra3 -xarch=v8plusb \
-         -M$(INCL_DIR) -xlic_lib=sunperf 
+F90FLAGS = -fast -dalign -xchip=ultra3 -xarch=v8plusb -xlic_lib=sunperf  \
+           -M$(OSHOME)/Modules -M$(OSHOME)/PW -M$(OSHOME)/PH
 #
 LIBS = -L/usr/opt/SUNWhpc/lib -R/opt/SUNWhpc/lib -lmvec 
 #
--- a/install/Make.sunmpi
+++ b/install/Make.sunmpi
@ -5,14 +5,12 @@
 # add -DFFTW to CPPFLAGS
 #
 CPP = fpp
-CPPFLAGS = -P -DSUN -DNOPENCILS -DPARA -DHAS_ZHEGVX -I$(INCL_DIR)
+CPPFLAGS = -P -DSUN -DNOPENCILS -DPARA -DHAS_ZHEGVX -I$(OSHOME)/include
 # Fortran compiler:
 F90 = mpf90
 #
-F90FLAGS = -fast -xchip=ultra3 -xarch=v8plusb \
-         -M$(INCL_DIR) \
-         -stackvar \
-         -xlic_lib=sunperf
+F90FLAGS = -fast -xchip=ultra3 -xarch=v8plusb -stackvar -xlic_lib=sunperf
+           -M$(OSHOME)/Modules -M$(OSHOME)/PW -M$(OSHOME)/PH
 #
 LIBS = -L/usr/opt/SUNWhpc/lib \
       -R/opt/SUNWhpc/lib -lmvec -lmpi
--- a/install/Make.t3e
+++ b/install/Make.t3e
@ -2,7 +2,6 @@
 # System-dependent definitions for t3e using MPI
 # Edit according to your needs
 #
-#
 # Precompiler
 #
 CPP = /opt/ctl/bin/cpp
@ -10,7 +9,7 @@ CPP = /opt/ctl/bin/cpp
 # add -DT3D_BENCHLIB if the benchlib is installed
 # remove -DFFTW if fftw is not installed and you cannot compile it
 # (you will use the fft's contained in standard t3e libraries)
-CPPFLAGS = -P -N -I$(INCL_DIR) -DT3D -DPARA -D__MPI -DFFTW
+CPPFLAGS = -P -N -I$(OSHOME)/include/ -DT3D -DPARA -D__MPI -DFFTW

 #
 # Fortran compiler:
@ -21,7 +20,8 @@ F90 = f90
 # with -M1110 flag compiler does not issue warning messages for 
 # the use of DOUBLE PRECISION constants in the code. (SdG)
 #
-FFLAGS = -em -dp  -M1110 -p../include
+FFLAGS = -em -dp  -M1110 -p$(OSHOME)/Modules -p$(OSHOME)/PW \
+         -p$(OSHOME)/PH
 F90FLAGS = $(FFLAGS) 
 #
 # Loader: