File Make.cp.irix replaced by the common Make.irix machine file

In CPV/Makefile FPMD/Makefile LDFLAGS now used like in PW/Makefile


git-svn-id: http://qeforge.qe-forge.org/svn/q-e/trunk/espresso@121 c92efa57-630b-4861-b058-cf58834340f0

CPV/Makefile

@@ -25,8 +25,8 @@ default:
 	make $(PROGNAME)
 
 cp90 : $(FOBJS) cpflush.o
-	$(LD) -o $(PROGNAME) $(LDFLAGS) $(FOBJS) ../Modules/*.o cpflush.o \
-          ../flib/flib.a ../flib/eispack.o $(LIBS)
+	$(LD) -o $(PROGNAME) $(FOBJS) ../Modules/*.o cpflush.o \
+          ../flib/flib.a ../flib/eispack.o $(LDFLAGS)
 	chmod a+r $(PROGNAME)
 	chmod a+x $(PROGNAME)
 

configure

@@ -69,7 +69,7 @@ then
         case "$1" in
           pc_ifc | beo_ifc | ibm    | ibmsp | origin | nec | t3e | \
           alpha  | alphaMPI| hitachi | \
-          cp.irix | cp.qsw | cp.sx5 )
+          irix | cp.qsw | cp.sx5 )
             cp install/Rules.nocpp make.rules
           ;;
           pc_pgi | pc_abs | beowulf | fujitsu | sun   | sunmpi | sxcross | \

install/Make.cp.irix

@@ -1,55 +0,0 @@
-######################################################################
-# Machine file for generic IRIX Workstation/Server
-#
-  ARCH=irix
-#
-######################################################################
-
-# --- Change Variables according to your system --- #
-
-# ** Preprocessor Macro **
-  CPMACRO=-D__SGI -D__ORIGIN -D__FFTW
-#
-# ** Scientific Libraries **
-# Uncomment to Use system library
-  MYLIB=
-  SCILIB= -lcomplib.sgimath 
-  INCLUDEFFTW=-I/a/acv0/fftw-2.1.3/fftw
-  FFTW=-L /cineca/lib/ -lfftw64
-#
-######################################################################
-# ***  Usually you don't need to edit variables below this line **** #
-######################################################################
-#
-# General Flags
-  ARCHFLAGS= -mips4 -64 -r8
-  DEBUGFLAGS=
-  PREPROCESSING= -cpp $(CPMACRO)
-  OPTIMIZATIONS= -O3 -OPT:ALIAS=RESTRICT 
-  FREEFORM= -freeform
-#
-# Flag for the compilation of the fortran source files
-  F77FLAGS= $(ARCHFLAGS) $(DEBUGFLAGS) $(OPTIMIZATIONS)
-  F90FLAGS= $(ARCHFLAGS) $(FREEFORM) $(PREPROCESSING) $(DEBUGFLAGS) $(OPTIMIZATIONS)
-  LDFLAGS=  $(ARCHFLAGS)  
-#
-# Flag for the compilation of the c source files
-  CCFLAGS=   $(INCLUDEPATH) $(ARCHFLAGS) $(INCLUDEFFTW) $(CPMACRO) $(OPTIMIZATIONS)
-#
-# Libraries
-  LIBS= $(FFTW) $(SCILIB)
-#
-  MODULEFLAG=-I $(OSHOME)/CPV -I$(OSHOME)/Modules
-#
-  AR = ar
-  ARFLAGS   = rv
-
-# Name of the fortran compiler
-  FC= f90
-  F77= f90
-  F90= f90
-  LD= f90
-#
-# Name of the c compiler
-  CC=cc
-#

install/Make.irix

@@ -0,0 +1,61 @@
+#
+# System-dependent definitions for origin (parallel, MPI)
+# Edit according to your needs
+#
+# Add -D__FFTW if you want to use fft routines from fftw library
+# instead of fft from complib library
+#
+# Add -D__SGI64 if you are going to compile in 64 bit mode
+#
+# flags for CP code
+#
+CPPFLAGS = -D__FFTW -D__SGI -D__SGI64 -I$(OSHOME)/include
+#
+# flags for PW and FPMD
+#
+# CPPFLAGS = -D__SGI -D__SGI64 -I$(OSHOME)/include
+#
+# Fortran compiler:
+#
+F90 = f90
+F77 = f90
+#
+# use -O3 only if you are sure that it actually works 
+#
+FFLAGS = -mips4 -64 -O2 -r8
+F77FLAGS = $(FFLAGS)
+F90FLAGS = $(FFLAGS) -cpp $(CPPFLAGS)
+#
+# This is needed to tell the compiler where modules are
+#
+MODULEFLAG= -I$(OSHOME)/Modules -I$(OSHOME)/FPMD
+MODULEFLAG= -I$(OSHOME)/Modules -I$(OSHOME)/CPV
+MODULEFLAG= -I$(OSHOME)/Modules -I$(OSHOME)/PW -I$(OSHOME)/PH
+#
+# C compiler
+#
+CC=cc
+#
+# Flags for the C compiler
+#
+CCFLAGS=  -mips4 -64 -O2 $(INCLUDEFFTW) $(CPPFLAGS) 
+#
+# Libraries:
+#
+#  CINECA Machines
+#
+# LIBS = -lcomplib.sgimath -L/cineca/lib -lfftw64
+#
+LIBS = -lcomplib.sgimath -L/usr/local/lib -lfftw
+#
+# Loader:
+#
+LD=$(F90)
+#
+LDFLAGS = $(FFLAGS) $(OSHOME)/flib/flib.a $(LIBS)
+#
+#
+# ar:
+#
+AR = ar
+ARFLAGS = ruv

install/configure

@@ -69,7 +69,7 @@ then
         case "$1" in
           pc_ifc | beo_ifc | ibm    | ibmsp | origin | nec | t3e | \
           alpha  | alphaMPI| hitachi | \
-          cp.irix | cp.qsw | cp.sx5 )
+          irix | cp.qsw | cp.sx5 )
             cp install/Rules.nocpp make.rules
           ;;
           pc_pgi | pc_abs | beowulf | fujitsu | sun   | sunmpi | sxcross | \

install/sizeof.c

@@ -8,13 +8,13 @@
 int main()
 {
 #if defined __FFTW
-  printf("SIZEOF ( fftw_plan * ). . = %d\n",sizeof(fftw_plan *));
-  printf("SIZEOF ( FFTW_COMPLEX * ) = %d\n",sizeof(FFTW_COMPLEX *));
-  printf("SIZEOF ( FFTW_COMPLEX ) . = %d\n",sizeof(FFTW_COMPLEX));
+  printf("SIZEOF ( fftw_plan * ). . = %d\n",(int)sizeof(fftw_plan *));
+  printf("SIZEOF ( FFTW_COMPLEX * ) = %d\n",(int)sizeof(FFTW_COMPLEX *));
+  printf("SIZEOF ( FFTW_COMPLEX ) . = %d\n",(int)sizeof(FFTW_COMPLEX));
 #endif
-  printf("SIZEOF ( void * ) . . . . = %d\n",sizeof(void *));
-  printf("SIZEOF ( double ) . . . . = %d\n",sizeof(double));
-  printf("SIZEOF ( float ). . . . . = %d\n",sizeof(float));
-  printf("SIZEOF ( int ). . . . . . = %d\n",sizeof(int));
-  printf("SIZEOF ( char ) . . . . . = %d\n",sizeof(char));
+  printf("SIZEOF ( void * ) . . . . = %d\n",(int)sizeof(void *));
+  printf("SIZEOF ( double ) . . . . = %d\n",(int)sizeof(double));
+  printf("SIZEOF ( float ). . . . . = %d\n",(int)sizeof(float));
+  printf("SIZEOF ( int ). . . . . . = %d\n",(int)sizeof(int));
+  printf("SIZEOF ( char ) . . . . . = %d\n",(int)sizeof(char));
 }