move makefile.incl.mak
Allan CORNET [Tue, 20 Jan 2009 09:02:15 +0000 (10:02 +0100)]
scilab/CHANGES_5.2
scilab/README_Windows.txt
scilab/modules/core/examples/call_scilab/c/common/makefile.mak
scilab/modules/core/examples/call_scilab/cpp/common/Makefile.mak
scilab/modules/dynamic_link/.gitignore
scilab/modules/dynamic_link/dynamic_link.iss
scilab/modules/dynamic_link/macros/ilib_gen_Make.sci
scilab/modules/dynamic_link/src/scripts/Makefile.incl.mak [moved from scilab/Makefile.incl.mak with 100% similarity]
scilab/modules/dynamic_link/src/scripts/TEMPLATE_MAKEFILE.VC
scilab/modules/intersci/examples/Makefile.mak
scilab/modules/linear_algebra/examples/Makefile.mak

index 26b0bdf..30ffdbb 100644 (file)
@@ -7,6 +7,11 @@ Compilation:
 
 * Visual studio uses default runtime library /MD (msvcrt.lib) to build all libraries of scilab.
 
+Source reorganisation:
+======================
+
+* Makefile.incl.mak (Windows, dynamic link) moved from SCI directory to SCI/modules/src/scripts
+
 Bug fixes:
 ==========
 
index 4f03d72..ce00fd1 100644 (file)
@@ -74,7 +74,6 @@ V - SOME IMPORTANT FILES AND DIRECTORIES
               you can also have your own startup file "scilab.ini" 
               in your SCIHOME directory.
  
- Makefile.incl.mak: file included by all Makefile's.
  
  Scilab.sln : Visual Studio 2008 Scilab Solution with Intel Fortran.
  
index 785a348..e3a3f6b 100644 (file)
@@ -9,7 +9,7 @@ SCIIMPLIB=$(SCIDIR)/bin/LibScilab.lib
 CFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/routines"
 CPPFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/routines"
 
-!include $(SCIDIR)/Makefile.incl.mak 
+!include $(SCIDIR)/modules/dynamic_link/src/scripts/Makefile.incl.mak 
 
 
 OBJSC= myprog.obj
index 9b55345..00cd205 100644 (file)
@@ -9,7 +9,7 @@ SCIIMPLIB=$(SCIDIR)/bin/LibScilab.lib
 CFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/modules/core/includes" /EHsc
 CPPFLAGS= $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/modules/core/includes" /EHsc
 
-!include $(SCIDIR)/Makefile.incl.mak 
+!include $(SCIDIR)/modules/dynamic_link/src/scripts/Makefile.incl.mak 
 
 OBJSC = myprog.obj ccmatrix1.obj 
 
index 62332e0..e6b1a5c 100644 (file)
@@ -3,3 +3,15 @@
 #
 src/c/dynamic_link.def
 src/fortran/dynamic_link_f.def
+examples/*/*.dll
+examples/*/*.def
+examples/*/*.obj
+examples/*/Makelib.mak
+examples/*/loader.sce
+examples/*/*/*.dll
+examples/*/*/*.def
+examples/*/*/*.obj
+examples/*/*/Makelib.mak
+examples/*/*/loader.sce
+examples/gateway/libtutorial.c
+examples/*/*/gw_ex*.c
\ No newline at end of file
index 1734035..eaaf983 100644 (file)
@@ -36,6 +36,7 @@ Source: modules\{#DYNAMIC_LINK}\help\addchapter.sce; DestDir: {app}\modules\{#DY
 ;
 Source: modules\{#DYNAMIC_LINK}\src\scripts\Makedll.incl; DestDir: {app}\modules\{#DYNAMIC_LINK}\src\scripts; Components: {#COMPN_SCILAB}
 Source: modules\{#DYNAMIC_LINK}\src\scripts\TEMPLATE_MAKEFILE.VC; DestDir: {app}\modules\{#DYNAMIC_LINK}\src\scripts; Components: {#COMPN_SCILAB}
+Source: modules\{#DYNAMIC_LINK}\src\scripts\Makefile.incl.mak; DestDir: {app}\modules\{#DYNAMIC_LINK}\src\scripts; Components: {#COMPN_SCILAB}
 ;
 Source: modules\{#DYNAMIC_LINK}\includes\*.h; DestDir: {app}\modules\{#DYNAMIC_LINK}\includes; Components: {#COMPN_SCILAB}
 ;
index 4230cac..e1b9605 100644 (file)
@@ -119,7 +119,7 @@ function ilib_gen_Make_win32(name,table,files,libs,Makename,with_gateway,ldflags
   mfprintf(fd,"OTHERLIBS = ");
   for x=libs(:)' ; mfprintf(fd," %s.lib",x);end
   mfprintf(fd,"\n");
-  mfprintf(fd,"!include $(SCIDIR1)\\Makefile.incl.mak\n");
+  mfprintf(fd,"!include $(SCIDIR1)\\modules\\dynamic_link\\src\\scripts\\Makefile.incl.mak\n");
   
   mexcflags = ' ';
   mexfflags = ' ';
index 8f9800f..5b74ac1 100644 (file)
@@ -15,7 +15,7 @@ OBJS = __OBJS__
 # added libraries
 OTHERLIBS = __OTHERSLIBS__
 # ------------------------------------------------------
-!include $(SCIDIR1)\Makefile.incl.mak
+!include $(SCIDIR1)\modules\dynamic_link\src\scripts\Makefile.incl.mak
 # ------------------------------------------------------
 CC = __CC__
 # ------------------------------------------------------
index b6aee3a..b2b34b5 100644 (file)
@@ -8,7 +8,7 @@ SCIIMPLIB=$(SCIDIR)/bin/LibScilab.lib
 INTERSCI="$(SCIDIR1)\modules\intersci\bin\intersci"
 F2C="$(SCIDIR1)\bin\f2c.exe"
 
-include ../../../Makefile.incl.mak 
+include ../../dynamic_link/src/scripts/Makefile.incl.mak 
 
 FFLAGS = $(FC_OPTIONS) -DFORDLL INCLUDES=-I"$(SCIDIR)\libs\MALLOC\includes" -I"$(SCIDIR)\modules\core\includes" -I"$(SCIDIR)/libs/f2c" -I"$(SCIDIR)/modules/mexlib/includes" 
 CFLAGS = $(CC_OPTIONS) -DFORDLL INCLUDES=-I"$(SCIDIR)\libs\MALLOC\includes" -I"$(SCIDIR)\modules\core\includes" -I"$(SCIDIR)/libs/f2c" -I"$(SCIDIR)/modules/mexlib/includes" 
index 006aa97..939621c 100644 (file)
@@ -23,7 +23,7 @@ OTHERFOBJS =
 DUMPEXTS="$(SCIDIR1)\bin\dumpexts"
 SCIIMPLIB="$(SCIDIR1)\bin\LibScilab.lib"
 
-!include ..\..\..\Makefile.incl.mak
+!include ..\..\dynamic_link\src\scripts\Makefile.incl.mak
 
 FFLAGS = $(FC_OPTIONS) -DFORDLL -I"$(SCIDIR1)\routines"
 CFLAGS = $(CC_OPTIONS) -DFORDLL -I"$(SCIDIR)/routines"