Changed library names and machinery for CUDA.

cuda/Makefile

@@ -55,7 +55,7 @@ lib: mods objs ilib cudalib spgpulib
 mods: $(FOBJS)
 	$(INSTALL) -p *$(.mod) $(MODDIR)
 	$(INSTALL) -p *.h $(INCDIR)
-objs: mods $(OBJS) iobjs cudaobjs spgpuobjs
+objs: $(OBJS) iobjs cudaobjs spgpuobjs
 
 $(OBJS) iobjs cudaobjs spgpuobjs: spgpuinc
 

cuda/spgpu/Makefile

@@ -3,10 +3,11 @@ include $(TOP)/Make.inc
 #
 # Libraries used
 #
+UP=..
 LIBDIR=$(TOP)/lib
 INCDIR=$(TOP)/include
 MODDIR=$(TOP)/modules
-LIBNAME=libspgpu.a
+LIBNAME=$(UP)/libpsb_cuda.a
 
 OBJS=coo.o core.o dia.o ell.o hdia.o hell.o 
 CU_INCLUDES=-I$(INCDIR) $(CUDA_INCLUDES)
@@ -17,7 +18,7 @@ objs: incl $(OBJS) iobjs
 
 lib: objs iobjs ilib
 	$(AR) $(LIBNAME) $(OBJS)
-	/bin/cp -p $(LIBNAME) $(LIBDIR)
+#	/bin/cp -p $(LIBNAME) $(LIBDIR)
 
 iobjs:
 	$(MAKE) -C kernels objs

cuda/spgpu/kernels/Makefile

@@ -7,7 +7,7 @@ LIBDIR=$(TOP)/lib
 INCDIR=$(TOP)/include
 MODDIR=$(TOP)/modules
 UP=..
-LIBNAME=$(UP)/libspgpu.a
+LIBNAME=$(UP)/libpsb_cuda.a
 CINCLUDES=-I$(INCDIR)
 CU_INCLUDES=-I$(INCDIR) $(CUDA_INCLUDES)
 OBJS=cabs.o  camax.o  casum.o  caxpby.o  caxy.o  cdot.o  cgath.o \