Fixes for compilation on SP5: avoid "??'", also clean up CR/LF from makefiles.
parent
6e3042a380
commit
2ea35bfab3
@ -1,36 +1,36 @@
|
|||||||
include ../../Make.inc
|
include ../../Make.inc
|
||||||
#
|
#
|
||||||
# Libraries used
|
# Libraries used
|
||||||
#
|
#
|
||||||
LIBDIR=../../lib/
|
LIBDIR=../../lib/
|
||||||
PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
|
PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_krylov -lpsb_prec -lpsb_base
|
||||||
|
|
||||||
FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG).
|
FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG).
|
||||||
|
|
||||||
DFOBJS=getp.o df_sample.o
|
DFOBJS=getp.o df_sample.o
|
||||||
ZFOBJS=getp.o zf_sample.o
|
ZFOBJS=getp.o zf_sample.o
|
||||||
|
|
||||||
EXEDIR=./runs
|
EXEDIR=./runs
|
||||||
|
|
||||||
all: df_sample zf_sample
|
all: df_sample zf_sample
|
||||||
|
|
||||||
|
|
||||||
df_sample: $(DFOBJS)
|
df_sample: $(DFOBJS)
|
||||||
$(F90LINK) $(DFOBJS) -o df_sample $(PSBLAS_LIB) $(LDLIBS)
|
$(F90LINK) $(DFOBJS) -o df_sample $(PSBLAS_LIB) $(LDLIBS)
|
||||||
/bin/mv df_sample $(EXEDIR)
|
/bin/mv df_sample $(EXEDIR)
|
||||||
zf_sample: $(ZFOBJS)
|
zf_sample: $(ZFOBJS)
|
||||||
$(F90LINK) $(ZFOBJS) -o zf_sample $(PSBLAS_LIB) $(LDLIBS)
|
$(F90LINK) $(ZFOBJS) -o zf_sample $(PSBLAS_LIB) $(LDLIBS)
|
||||||
/bin/mv zf_sample $(EXEDIR)
|
/bin/mv zf_sample $(EXEDIR)
|
||||||
|
|
||||||
.f90.o:
|
.f90.o:
|
||||||
$(MPF90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
|
$(MPF90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
/bin/rm -f $(DFOBJS) $(ZFOBJS) \
|
/bin/rm -f $(DFOBJS) $(ZFOBJS) \
|
||||||
*$(.mod) $(EXEDIR)/df_sample $(EXEDIR)/zf_sample
|
*$(.mod) $(EXEDIR)/df_sample $(EXEDIR)/zf_sample
|
||||||
|
|
||||||
lib:
|
lib:
|
||||||
(cd ../../; make library)
|
(cd ../../; make library)
|
||||||
verycleanlib:
|
verycleanlib:
|
||||||
(cd ../../; make veryclean)
|
(cd ../../; make veryclean)
|
||||||
|
|
||||||
|
@ -1,42 +1,42 @@
|
|||||||
include ../../Make.inc
|
include ../../Make.inc
|
||||||
#
|
#
|
||||||
# Libraries used
|
# Libraries used
|
||||||
#
|
#
|
||||||
LIBDIR=../../lib/
|
LIBDIR=../../lib/
|
||||||
PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_base
|
PSBLAS_LIB= -L$(LIBDIR) -lpsb_util -lpsb_base
|
||||||
|
|
||||||
#
|
#
|
||||||
# We are using the public domain tool METIS from U. Minnesota. To get it
|
# We are using the public domain tool METIS from U. Minnesota. To get it
|
||||||
# check URL http://www.cs.umn.edu:~karypis
|
# check URL http://www.cs.umn.edu:~karypis
|
||||||
#
|
#
|
||||||
FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG).
|
FINCLUDES=$(FMFLAG)$(LIBDIR) $(FMFLAG).
|
||||||
|
|
||||||
ZH2MOBJS=zhb2mm.o
|
ZH2MOBJS=zhb2mm.o
|
||||||
DH2MOBJS=dhb2mm.o
|
DH2MOBJS=dhb2mm.o
|
||||||
DM2HOBJS=dmm2hb.o
|
DM2HOBJS=dmm2hb.o
|
||||||
ZM2HOBJS=zmm2hb.o
|
ZM2HOBJS=zmm2hb.o
|
||||||
MMHBOBJS=$(ZH2MOBJS) $(DH2MOBJS) $(DM2HOBJS) $(ZM2HOBJS)
|
MMHBOBJS=$(ZH2MOBJS) $(DH2MOBJS) $(DM2HOBJS) $(ZM2HOBJS)
|
||||||
|
|
||||||
|
|
||||||
all: dhb2mm zhb2mm dmm2hb zmm2hb
|
all: dhb2mm zhb2mm dmm2hb zmm2hb
|
||||||
|
|
||||||
dhb2mm: $(DH2MOBJS)
|
dhb2mm: $(DH2MOBJS)
|
||||||
$(MPF90) -o dhb2mm $(DH2MOBJS) $(PSBLAS_LIB) $(LDLIBS)
|
$(MPF90) -o dhb2mm $(DH2MOBJS) $(PSBLAS_LIB) $(LDLIBS)
|
||||||
dmm2hb: $(DM2HOBJS)
|
dmm2hb: $(DM2HOBJS)
|
||||||
$(MPF90) -o dmm2hb $(DM2HOBJS) $(PSBLAS_LIB) $(LDLIBS)
|
$(MPF90) -o dmm2hb $(DM2HOBJS) $(PSBLAS_LIB) $(LDLIBS)
|
||||||
zhb2mm: $(ZH2MOBJS)
|
zhb2mm: $(ZH2MOBJS)
|
||||||
$(MPF90) -o zhb2mm $(ZH2MOBJS) $(PSBLAS_LIB) $(LDLIBS)
|
$(MPF90) -o zhb2mm $(ZH2MOBJS) $(PSBLAS_LIB) $(LDLIBS)
|
||||||
zmm2hb: $(ZM2HOBJS)
|
zmm2hb: $(ZM2HOBJS)
|
||||||
$(MPF90) -o zmm2hb $(ZM2HOBJS) $(PSBLAS_LIB) $(LDLIBS)
|
$(MPF90) -o zmm2hb $(ZM2HOBJS) $(PSBLAS_LIB) $(LDLIBS)
|
||||||
|
|
||||||
.f90.o:
|
.f90.o:
|
||||||
$(MPF90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
|
$(MPF90) $(F90COPT) $(FINCLUDES) $(FDEFINES) -c $<
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
/bin/rm -f $(MMHBOBJS) dhb2mm zhb2mm dmm2hb zmm2hb
|
/bin/rm -f $(MMHBOBJS) dhb2mm zhb2mm dmm2hb zmm2hb
|
||||||
|
|
||||||
lib:
|
lib:
|
||||||
(cd ../../; make library)
|
(cd ../../; make library)
|
||||||
verycleanlib:
|
verycleanlib:
|
||||||
(cd ../../; make veryclean)
|
(cd ../../; make veryclean)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue