Compile the basic and sparse option works

Author: yageek

CMakeLists.txt

@@ -89,11 +89,24 @@ set(LIST_2 lufactor.c bkpfacto.c chfactor.c qrfactor.c solve.c hsehldr.c
 set (LIST_3 sparse.c sprow.c sparseio.c spchfctr.c splufctr.c 
 	spbkp.c spswap.c iter0.c itersym.c iternsym.c)
 
+set (ZLIST1 zmachine.c zcopy.c zmatio.c zmemory.c zvecop.c zmatop.c znorm.c zfunc.c )
+
+set (ZLIST2 zlufctr.c zsolve.c zmatlab.c zhsehldr.c zqrfctr.c zgivens.c  zhessen.c zschur.c)
+
 set (OLD_LIST onjgrad.c lanczos.c arnoldi.c)
 
-file(GLOB_RECURSE all_source_files *.c)
-file(GLOB_RECURSE all_source_headers *.h)
+set(TORTURE torture.c sptort.c ztorture.c memtort.c itertort.c  mfuntort.c iotort.c)
+
+set (sources_files ${LIST_1} ${LIST_2})
+
+if(SPARSE)
+	set(sources_files ${sources_files} ${LIST_3})
+endif(SPARSE)
+
+if(COMPLEX)
+	set (sources_files ${sources_files} ${ZLIST1} ${ZLIST2})
+endif(COMPLEX)
 
-add_library(meschach ${all_source_files})
+add_library(meschach ${sources_files})
 
 

makefile.in

@@ -89,7 +89,7 @@ part3: $(LIST3)
 	ar ru meschach.a $(LIST3)
 	$(RANLIB) meschach.a
 
-$(ZLIST1): $(HBASDE) zmatrix.h
+$(ZLIST1): $(HBASE) zmatrix.h
 zpart1: $(ZLIST1)
 	ar ru meschach.a $(ZLIST1)
 	$(RANLIB) meschach.a

matlab.c

@@ -33,6 +33,7 @@
 */
 
 #include        <stdio.h>
+#include		<string.h>
 #include        "matrix.h"
 #include	"matlab.h"
 

matrixio.c

@@ -445,7 +445,7 @@ char    *f_string;
 const char	*setformat(const char *f_string)
 #endif
 {
-    const char	*old_f_string;
+    static const char	*old_f_string;
     old_f_string = format;
     if ( f_string != (char *)NULL && *f_string != '\0' )
 	format = f_string;

spbkp.c

@@ -38,9 +38,7 @@ static	char	rcsid[] = "$Id: spbkp.c,v 1.6 1996/08/20 19:53:10 stewart Exp $";
 #include        "sparse2.h"
 
 
-#ifdef MALLOCDECL
-#include <malloc.h>
-#endif
+#include "machine.h"
 
 #define alpha	0.6403882032022076 /* = (1+sqrt(17))/8 */