Make.inc.in
 config/ax_f90_module_extension.m4
 config/pac.m4
 configure.ac
 configure
 examples/fileread/Makefile
 examples/pdegen/Makefile
 mlprec/Makefile
 mlprec/impl/Makefile
 mlprec/impl/level/Makefile
 mlprec/impl/smoother/Makefile
 mlprec/impl/solver/Makefile
 tests/fileread/Makefile
 tests/newslv/Makefile
 tests/pdegen/Makefile

Changes from rpmtest branch. Should be working now.
This commit is contained in:
Salvatore Filippone
2017-02-09 11:54:45 +00:00
parent 808a04fb1e
commit ad4587569f
16 changed files with 6110 additions and 1044 deletions
+10 -13
View File
@@ -1,12 +1,9 @@
MLDDIR=../..
MLDINCDIR=$(MLDDIR)/include
include $(MLDINCDIR)/Make.inc.mld2p4
PSBLIBDIR=$(PSBLASDIR)/lib/
PSBINCDIR=$(PSBLASDIR)/include
MLDLIBDIR=$(MLDDIR)/lib
MLD_LIB=-L$(MLDLIBDIR) -lmld_prec
PSBLAS_LIB= -L$(PSBLIBDIR) -lpsb_krylov -lpsb_prec -lpsb_util -lpsb_base
FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR) $(FMFLAG)$(PSBINCDIR) $(FIFLAG).
MLD_LIBS=-L$(MLDLIBDIR) -lpsb_krylov -lmld_prec -lpsb_prec
FINCLUDES=$(FMFLAG). $(FMFLAG)$(MLDINCDIR) $(PSBLAS_INCLUDES) $(FIFLAG).
DMOBJS=mld_dexample_ml.o data_input.o
D1OBJS=mld_dexample_1lev.o data_input.o
@@ -24,12 +21,12 @@ all: mld_dexample_ml mld_dexample_1lev mld_zexample_ml mld_zexample_1lev\
mld_dexample_ml: $(DMOBJS)
$(F90LINK) $(LINKOPT) $(DMOBJS) -o mld_dexample_ml \
$(MLD_LIB) $(PSBLAS_LIB) $(LDLIBS)
$(MLD_LIBS) $(PSBLAS_LIBS) $(LDLIBS)
/bin/mv mld_dexample_ml $(EXEDIR)
mld_dexample_1lev: $(D1OBJS)
$(F90LINK) $(LINKOPT) $(D1OBJS) -o mld_dexample_1lev \
$(MLD_LIB) $(PSBLAS_LIB) $(LDLIBS)
$(MLD_LIBS) $(PSBLAS_LIBS) $(LDLIBS)
/bin/mv mld_dexample_1lev $(EXEDIR)
mld_dexample_ml.o: data_input.o
@@ -37,12 +34,12 @@ mld_dexample_1lev.o: data_input.o
mld_zexample_ml: $(ZMOBJS)
$(F90LINK) $(LINKOPT) $(ZMOBJS) -o mld_zexample_ml \
$(MLD_LIB) $(PSBLAS_LIB) $(LDLIBS)
$(MLD_LIBS) $(PSBLAS_LIBS) $(LDLIBS)
/bin/mv mld_zexample_ml $(EXEDIR)
mld_zexample_1lev: $(Z1OBJS)
$(F90LINK) $(LINKOPT) $(Z1OBJS) -o mld_zexample_1lev \
$(MLD_LIB) $(PSBLAS_LIB) $(LDLIBS)
$(MLD_LIBS) $(PSBLAS_LIBS) $(LDLIBS)
/bin/mv mld_zexample_1lev $(EXEDIR)
mld_zexample_ml.o: data_input.o
@@ -52,12 +49,12 @@ mld_zexample_1lev.o: data_input.o
mld_sexample_ml: $(SMOBJS)
$(F90LINK) $(LINKOPT) $(SMOBJS) -o mld_sexample_ml \
$(MLD_LIB) $(PSBLAS_LIB) $(LDLIBS)
$(MLD_LIBS) $(PSBLAS_LIBS) $(LDLIBS)
/bin/mv mld_sexample_ml $(EXEDIR)
mld_sexample_1lev: $(S1OBJS)
$(F90LINK) $(LINKOPT) $(S1OBJS) -o mld_sexample_1lev \
$(MLD_LIB) $(PSBLAS_LIB) $(LDLIBS)
$(MLD_LIBS) $(PSBLAS_LIBS) $(LDLIBS)
/bin/mv mld_sexample_1lev $(EXEDIR)
mld_sexample_ml.o: data_input.o
@@ -65,12 +62,12 @@ mld_sexample_1lev.o: data_input.o
mld_cexample_ml: $(CMOBJS)
$(F90LINK) $(LINKOPT) $(CMOBJS) -o mld_cexample_ml \
$(MLD_LIB) $(PSBLAS_LIB) $(LDLIBS)
$(MLD_LIBS) $(PSBLAS_LIBS) $(LDLIBS)
/bin/mv mld_cexample_ml $(EXEDIR)
mld_cexample_1lev: $(C1OBJS)
$(F90LINK) $(LINKOPT) $(C1OBJS) -o mld_cexample_1lev \
$(MLD_LIB) $(PSBLAS_LIB) $(LDLIBS)
$(MLD_LIBS) $(PSBLAS_LIBS) $(LDLIBS)
/bin/mv mld_cexample_1lev $(EXEDIR)
mld_cexample_ml.o: data_input.o