config/pac.m4
 configure.ac
 configure

Fixed recognition of GNU make for .mod.o rule.
psblas3-type-indexed
Salvatore Filippone 17 years ago
parent 1cfda22e02
commit e5b06ec171

@ -598,3 +598,20 @@ else
fi fi
])dnl ])dnl
dnl @synopsis PAC_MAKE_IS_GNUMAKE
dnl
dnl @author Salvatore Filippone <salvatore.filippone@uniroma2.it>
dnl
define(PAC_MAKE_IS_GNUMAKE,[
AC_MSG_CHECKING(for gnumake)
MAKE=${MAKE:-make}
if $MAKE --version 2>&1 | grep -e"GNU Make" >/dev/null; then
AC_MSG_RESULT(yes)
psblas_make_gnumake='yes'
else
AC_MSG_RESULT(no)
psblas_make_gnumake='no'
fi
])dnl

@ -558,7 +558,7 @@ CC="$MPICC";
PAC_CHECK_BLACS PAC_CHECK_BLACS
FC="$save_FC"; FC="$save_FC";
CC="$save_CC"; CC="$save_CC";
PAC_MAKE_IS_GNUMAKE
############################################################################### ###############################################################################
# METIS, SuperLU, SuperLU_Dist UMFPack libraries presence checks # METIS, SuperLU, SuperLU_Dist UMFPack libraries presence checks
@ -648,12 +648,13 @@ AC_SUBST(METIS_LIBS)
AC_SUBST(CINCLUDES) AC_SUBST(CINCLUDES)
AC_SUBST(FINCLUDES) AC_SUBST(FINCLUDES)
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 $<
@ -680,7 +681,6 @@ PSBLASRULES='
PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB) $(LIBS) PSBLDLIBS=$(BLACS) $(BLAS) $(METIS_LIB) $(LIBS)
CDEFINES=$(PSBCDEFINES) CDEFINES=$(PSBCDEFINES)
FDEFINES=$(PSBFDEFINES) FDEFINES=$(PSBFDEFINES)
$(.mod).o:
# These should be portable rules, arent they? # These should be portable rules, arent they?

Loading…
Cancel
Save