Restructuring linsolve.

linsolve/Makefile

@@ -10,32 +10,29 @@ MODOBJS= psb_base_linsolve_conv_mod.o \
 	psb_s_linsolve_conv_mod.o psb_c_linsolve_conv_mod.o \
 	psb_d_linsolve_conv_mod.o psb_z_linsolve_conv_mod.o \
 	psb_linsolve_mod.o
-F90OBJS=psb_dkrylov.o psb_skrylov.o psb_ckrylov.o psb_zkrylov.o \
-	psb_drichardson.o psb_srichardson.o psb_crichardson.o psb_zrichardson.o \
-        psb_dcgstab.o psb_dcg.o psb_dfcg.o psb_dgcr.o psb_dcgs.o \
-	psb_dbicg.o psb_dcgstabl.o psb_drgmres.o\
-	psb_scgstab.o psb_scg.o psb_sfcg.o psb_sgcr.o psb_scgs.o \
-	psb_sbicg.o psb_scgstabl.o psb_srgmres.o\
-	psb_ccgstab.o psb_ccg.o psb_cfcg.o psb_cgcr.o psb_ccgs.o  \
-	psb_cbicg.o psb_ccgstabl.o psb_crgmres.o\
-	psb_zcgstab.o psb_zcg.o psb_zfcg.o psb_zgcr.o psb_zcgs.o  \
-	psb_zbicg.o psb_zcgstabl.o psb_zrgmres.o
-OBJS=$(F90OBJS) $(MODOBJS)
+
+OBJS=$(MODOBJS)
 
 LOCAL_MODS=$(MODOBJS:.o=$(.mod))
 LIBNAME=$(METHDLIBNAME)	
 
 FINCLUDES=$(FMFLAG). $(FMFLAG)$(MODDIR) 
 
-objs: $(OBJS)
+objs: $(OBJS)  impld
 	/bin/cp -p $(CPUPDFLAG) *$(.mod) $(MODDIR)
 
 lib: objs
+	$(MAKE) -C impl lib
 	$(AR) $(HERE)/$(LIBNAME) $(OBJS)
 	$(RANLIB) $(HERE)/$(LIBNAME)
 	/bin/cp -p $(CPUPDFLAG) $(HERE)/$(LIBNAME) $(LIBDIR)
 
 
+$(OBJS): $(MODDIR)/$(BASEMODNAME)$(.mod)
+
+impld: $(OBJS)
+	$(MAKE) -C impl objs
+
 psb_s_linsolve_conv_mod.o psb_c_linsolve_conv_mod.o psb_d_linsolve_conv_mod.o psb_z_linsolve_conv_mod.o:  psb_base_linsolve_conv_mod.o
 psb_linsolve_conv_mod.o: psb_s_linsolve_conv_mod.o psb_c_linsolve_conv_mod.o psb_d_linsolve_conv_mod.o psb_z_linsolve_conv_mod.o 
 $(F90OBJS): $(MODOBJS)
@@ -44,6 +41,8 @@ $(OBJS): $(MODDIR)/$(PRECMODNAME)$(.mod)  $(MODDIR)/$(BASEMODNAME)$(.mod)
 veryclean: clean
 	/bin/rm -f $(HERE)/$(LIBNAME)
 
-clean:
+iclean:
+	cd impl && $(MAKE) clean
+clean: iclean
 	/bin/rm -f $(OBJS) *$(.mod)
 

linsolve/impl/Makefile

@@ -0,0 +1,30 @@
+include ../../Make.inc
+
+LIBDIR=../../lib
+INCDIR=../../include
+MODDIR=../../modules
+HERE=..
+OBJS=psb_dkrylov.o psb_skrylov.o psb_ckrylov.o psb_zkrylov.o \
+	psb_drichardson.o psb_srichardson.o psb_crichardson.o psb_zrichardson.o \
+        psb_dcgstab.o psb_dcg.o psb_dfcg.o psb_dgcr.o psb_dcgs.o \
+	psb_dbicg.o psb_dcgstabl.o psb_drgmres.o\
+	psb_scgstab.o psb_scg.o psb_sfcg.o psb_sgcr.o psb_scgs.o \
+	psb_sbicg.o psb_scgstabl.o psb_srgmres.o\
+	psb_ccgstab.o psb_ccg.o psb_cfcg.o psb_cgcr.o psb_ccgs.o  \
+	psb_cbicg.o psb_ccgstabl.o psb_crgmres.o\
+	psb_zcgstab.o psb_zcg.o psb_zfcg.o psb_zgcr.o psb_zcgs.o  \
+	psb_zbicg.o psb_zcgstabl.o psb_zrgmres.o
+
+LIBNAME=$(METHDLIBNAME)
+COBJS=
+FINCLUDES=$(FMFLAG).. $(FMFLAG)$(MODDIR)
+
+objs:  $(OBJS)
+lib:  objs
+	$(AR) $(HERE)/$(LIBNAME) $(OBJS)
+	$(RANLIB) $(HERE)/$(LIBNAME)
+
+veryclean: clean
+
+clean:
+	/bin/rm -f $(OBJS) $(LOCAL_MODS)