Configure machinery for gnumake.

psblas3-type-indexed
Salvatore Filippone 17 years ago
parent e5b06ec171
commit 7a1cebcfd9

21
configure vendored

@ -10037,6 +10037,20 @@ fi
FC="$save_FC"; FC="$save_FC";
CC="$save_CC"; CC="$save_CC";
{ echo "$as_me:$LINENO: checking for gnumake" >&5
echo $ECHO_N "checking for gnumake... $ECHO_C" >&6; }
MAKE=${MAKE:-make}
if $MAKE --version 2>&1 | grep -e"GNU Make" >/dev/null; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
psblas_make_gnumake='yes'
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
psblas_make_gnumake='no'
fi
############################################################################### ###############################################################################
# METIS, SuperLU, SuperLU_Dist UMFPack libraries presence checks # METIS, SuperLU, SuperLU_Dist UMFPack libraries presence checks
@ -10279,12 +10293,14 @@ UTILLIBNAME=libpsb_util.a
if test "X$psblas_cv_fc" == "Xgcc" ; then if test "X$psblas_make_gnumake" == "Xyes" ; then
PSBLASRULES=' PSBLASRULES='
PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB) $(LIBS) PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB) $(LIBS)
CDEFINES=$(PSBCDEFINES) CDEFINES=$(PSBCDEFINES)
FDEFINES=$(PSBFDEFINES) FDEFINES=$(PSBFDEFINES)
# Warning : these rules are only valid with GNU make! # Warning : these rules are only valid with GNU make!
$(.mod).o:
%.o: %.c %.o: %.c
$(CC) $(F90COPT) $(CINCLUDES) $(CDEFINES) -c $< $(CC) $(F90COPT) $(CINCLUDES) $(CDEFINES) -c $<
@ -10311,9 +10327,10 @@ PSBLASRULES='
PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB) $(LIBS) PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB) $(LIBS)
CDEFINES=$(PSBCDEFINES) CDEFINES=$(PSBCDEFINES)
FDEFINES=$(PSBFDEFINES) FDEFINES=$(PSBFDEFINES)
$(.mod).o:
$(.mod).o:
# These should be portable rules, arent they? # These should be portable rules, arent they?
.c.o: .c.o:
$(CC) $(CCOPT) $(CINCLUDES) $(CDEFINES) -c $< $(CC) $(CCOPT) $(CINCLUDES) $(CDEFINES) -c $<

@ -656,6 +656,7 @@ FDEFINES=$(PSBFDEFINES)
# Warning : these rules are only valid with GNU make! # Warning : these rules are only valid with GNU make!
$(.mod).o: $(.mod).o:
%.o: %.c %.o: %.c
$(CC) $(F90COPT) $(CINCLUDES) $(CDEFINES) -c $< $(CC) $(F90COPT) $(CINCLUDES) $(CDEFINES) -c $<
%.o: %.f %.o: %.f
@ -683,6 +684,8 @@ CDEFINES=$(PSBCDEFINES)
FDEFINES=$(PSBFDEFINES) FDEFINES=$(PSBFDEFINES)
$(.mod).o:
# These should be portable rules, arent they? # These should be portable rules, arent they?
.c.o: .c.o:
$(CC) $(CCOPT) $(CINCLUDES) $(CDEFINES) -c $< $(CC) $(CCOPT) $(CINCLUDES) $(CDEFINES) -c $<

Loading…
Cancel
Save