Makefile generation

2 files changed, 31 insertions, 34 deletions

diff --git a/macros/CCodeGeneration/C_GenerateMakefile.sci b/macros/CCodeGeneration/C_GenerateMakefile.sci
index e591e6f3..ace98c2b 100644
--- a/macros/CCodeGeneration/C_GenerateMakefile.sci
+++ b/macros/CCodeGeneration/C_GenerateMakefile.sci
@@ -38,11 +38,9 @@ PrintStringInfo('# --- USER PARAMETERS ---',FileInfo.MakefileFilename,'file','y'
 PrintStringInfo('# -----------------------',FileInfo.MakefileFilename,'file','y');
 PrintStringInfo('# --- DIRECTORIES AND FILES ---',FileInfo.MakefileFilename,'file','y');
 
-makeobjpath  = pathconvert('..\..\..\Scilab2C\CFiles\sci2cobj', %f, %f, 'u');
-// makeobjpath  = FileInfo.CStyleSCI2CMainDir+'\CFiles\sci2cobj';
-makecsrcdir  = pathconvert('..\..\..\Scilab2C\CFiles\sci2ccode', %f, %f, 'u');
+makecsrcdir  = pathconvert('src/c', %f, %f, 'u');
 // makecsrcdir  = FileInfo.CStyleSCI2CMainDir+'\CFiles\sci2ccode';
-makehsrcdir  = pathconvert('..\..\..\Scilab2C\CFiles\sci2cincludes', %f, %f, 'u');
+makehsrcdir  = pathconvert('includes', %f, %f, 'u');
 // makehsrcdir  = FileInfo.CStyleSCI2CMainDir+'\CFiles\sci2cincludes';
 makeisrcdir  = pathconvert('..\..\..\Scilab2C\CFiles\sci2cinterfaces', %f, %f, 'u');
 // makeisrcdir  = FileInfo.CStyleSCI2CMainDir+'\CFiles\sci2cinterfaces';
@@ -50,7 +48,6 @@ makesci2cdir = FileInfo.CStyleOutCCCodeDir;
 // makesci2cdir = FileInfo.CStyleOutCCCodeDir;
 
 
-PrintStringInfo('OBJDIR      = '+makeobjpath,FileInfo.MakefileFilename,'file','y');
 PrintStringInfo('CSRCDIR     = '+makecsrcdir,FileInfo.MakefileFilename,'file','y');
 PrintStringInfo('HSRCDIR     = '+makehsrcdir,FileInfo.MakefileFilename,'file','y');
 PrintStringInfo('ISRCDIR     = '+makeisrcdir,FileInfo.MakefileFilename,'file','y');
@@ -61,17 +58,17 @@ PrintStringInfo('EXEFILENAME = mytest.exe',FileInfo.MakefileFilename,'file','y')
 // -------------------------------
 // --- Open template makefile. ---
 // -------------------------------
-//-- fidfile = SCI2COpenFileRead(FileInfo.MakefileTemplate);
+fidfile = SCI2COpenFileRead(FileInfo.MakefileTemplate);
 
 // -------------------
 // --- Read lines. ---
 // -------------------
-//-- tmpline = mgetl(fidfile,1);
-//-- while (meof(fidfile) == 0)
-//--   PrintStringInfo(tmpline,FileInfo.MakefileFilename,'file','y');
-//--   tmpline = mgetl(fidfile,1);
-//-- end
+tmpline = mgetl(fidfile,1);
+while (meof(fidfile) == 0)
+  PrintStringInfo(tmpline,FileInfo.MakefileFilename,'file','y');
+  tmpline = mgetl(fidfile,1);
+end
 
-//-- mclose(fidfile);
+mclose(fidfile);
 
 endfunction
diff --git a/macros/CCodeGeneration/SCI2CMakefileTemplate.rc b/macros/CCodeGeneration/SCI2CMakefileTemplate.rc
index 3787172a..6d459829 100644
--- a/macros/CCodeGeneration/SCI2CMakefileTemplate.rc
+++ b/macros/CCodeGeneration/SCI2CMakefileTemplate.rc
@@ -23,17 +23,6 @@ EXEFILE = $(SCI2CDIR)/$(EXEFILENAME)
 SWSRCS	=	\
 	$(CSRCDIR)/doubleComplex.c \
 	$(CSRCDIR)/floatComplex.c \
-	$(CSRCDIR)/RealToComplex.c \
-	$(CSRCDIR)/OpIns.c \
-	$(CSRCDIR)/OpExt.c \
-	$(CSRCDIR)/FileManagement.c \
-	$(CSRCDIR)/OpLogLt.c \
-	$(CSRCDIR)/OpLogGt.c \
-	$(CSRCDIR)/OpLogGe.c \
-	$(CSRCDIR)/OpLogLe.c \
-	$(CSRCDIR)/OpLogOr.c \
-	$(CSRCDIR)/OpLogAnd.c \
-	$(CSRCDIR)/ConvertPrecision.c \
 	$(CSRCDIR)/ssqrts.c \
 	$(CSRCDIR)/dsqrts.c \
 	$(CSRCDIR)/csqrts.c \
@@ -489,16 +478,27 @@ SWSRCS	=	\
 	$(CSRCDIR)/srounds.c \
 	$(CSRCDIR)/srounda.c \
 	$(CSRCDIR)/zrounds.c \
-	$(CSRCDIR)/zrounda.c 
-	
-	
-	
-	
-	
-	
-	
-	
-	
+	$(CSRCDIR)/zrounda.c
+
+
+
+
+#	$(CSRCDIR)/RealToComplex.c \
+#	$(CSRCDIR)/OpIns.c \
+#	$(CSRCDIR)/OpExt.c \
+#	$(CSRCDIR)/FileManagement.c \
+#	$(CSRCDIR)/OpLogLt.c \
+#	$(CSRCDIR)/OpLogGt.c \
+#	$(CSRCDIR)/OpLogGe.c \
+#	$(CSRCDIR)/OpLogLe.c \
+#	$(CSRCDIR)/OpLogOr.c \
+#	$(CSRCDIR)/OpLogAnd.c \
+#	$(CSRCDIR)/ConvertPrecision.c \
+
+
+
+
+
 #	$(CSRCDIR)/clog1ps.c \
 #	$(CSRCDIR)/zlog1ps.c \
 #	$(CSRCDIR)/clog1pa.c \
@@ -514,7 +514,7 @@ compileexecute: $(SWOBJS)
 	@echo "============================"
 	@echo "Generation of the executable"
 	@echo "============================"
-	$(CC) $(CFLAGS) $(SWOBJS) $(SCI2CDIR)/*.c -llapack -lblas -o $(EXEFILE)
+	$(CC) $(CFLAGS) $(SWOBJS) *.c -llapack -lblas -o $(EXEFILE)
 	@echo " "
 	@echo "=============="
 	@echo "Executing code"