Merge remote-tracking branch 'origin/master' into YaSp 71/9671/1
Sylvestre Ledru [Tue, 13 Nov 2012 09:53:18 +0000 (10:53 +0100)]
Change-Id: Ia21b499afca8a24f7de085b2b97d5931545952f7

1  2 
scilab/modules/core/src/c/stack3.c
scilab/modules/fftw/sci_gateway/c/sci_dct.c
scilab/modules/fftw/sci_gateway/c/sci_dst.c
scilab/modules/scicos/.depend
scilab/modules/scicos/Makefile.in
scilab/modules/spreadsheet/src/c/ripole/ole.c
scilab/modules/xcos/Makefile.am
scilab/modules/xcos/Makefile.in

@@@ -158,24 -179,30 +178,30 @@@ int C2F(creadcmat)(char *namex, int *m
  
  int C2F(cwritemat)(char *namex, int *m, int *n,  double *mat, unsigned long name_len)
  {
-   int   ix1 = *m * *n;
-   int Rhs_k = Rhs , Top_k = Top ;
-   int l4, id[nsiz], lc, lr;
+     int   ix1 = *m * *n;
+     int Rhs_k = Rhs , Top_k = Top ;
+     int l4, id[nsiz], lc, lr;
  
-   C2F(str2name)(namex, id, name_len);
+     C2F(str2name)(namex, id, name_len);
  
-   Top = Top + Nbvars + 1;
-   if (! C2F(cremat)("cwritemat", &Top, &cx0, m, n, &lr, &lc, 9L)) return  FALSE;
-   C2F(dcopy)(&ix1, mat, &cx1, stk(lr ), &cx1);
-   Rhs = 0;
-   l4 = C2F(iop).lct[3];
-   C2F(iop).lct[3] = -1;
- //  C2F(stackp)(id, &cx0);
-   C2F(iop).lct[3] = l4;
-   Top = Top_k;
-   Rhs = Rhs_k;
-   if (Err > 0)  return FALSE;
-   return TRUE;
+     Top = Top + Nbvars + 1;
+     if (! C2F(cremat)("cwritemat", &Top, &cx0, m, n, &lr, &lc, 9L))
+     {
+         return  FALSE;
+     }
+     C2F(dcopy)(&ix1, mat, &cx1, stk(lr ), &cx1);
+     Rhs = 0;
+     l4 = C2F(iop).lct[3];
+     C2F(iop).lct[3] = -1;
 -    C2F(stackp)(id, &cx0);
++    //  C2F(stackp)(id, &cx0);
+     C2F(iop).lct[3] = l4;
+     Top = Top_k;
+     Rhs = Rhs_k;
+     if (Err > 0)
+     {
+         return FALSE;
+     }
+     return TRUE;
  }
  
  
   * @param n: number of columns
   * @param mat: matrix entries stored columnwise in Scilab object for complex number
  */
- int C2F(cwritecmat)(char *namex,int *m, int*n,double *mat,unsigned long name_len)
- {
-       int   ix1 = *m * *n *2; /* real part + imaginary part */
-       int Rhs_k = Rhs , Top_k = Top ;
-       int l4, id[nsiz], lc, lr;
-       int IT=1; /* Type Complex */
-       C2F(str2name)(namex, id, name_len);
-       Top = Top + Nbvars + 1;
-       if (! C2F(cremat)("cwritecmat", &Top, &IT, m, n, &lr, &lc, 10L)) return  FALSE;
-       C2F(dcopy)(&ix1, mat, &cx1, stk(lr ), &cx1);
-       Rhs = 0;
-       l4 = C2F(iop).lct[3];
-       C2F(iop).lct[3] = -1;
- //    C2F(stackp)(id, &cx0);
-       C2F(iop).lct[3] = l4;
-       Top = Top_k;
-       Rhs = Rhs_k;
-       if (Err > 0)  return FALSE;
-       return TRUE;
+ int C2F(cwritecmat)(char *namex, int *m, int*n, double *mat, unsigned long name_len)
+ {
+     int   ix1 = *m * *n * 2; /* real part + imaginary part */
+     int Rhs_k = Rhs , Top_k = Top ;
+     int l4, id[nsiz], lc, lr;
+     int IT = 1; /* Type Complex */
+     C2F(str2name)(namex, id, name_len);
+     Top = Top + Nbvars + 1;
+     if (! C2F(cremat)("cwritecmat", &Top, &IT, m, n, &lr, &lc, 10L))
+     {
+         return  FALSE;
+     }
+     C2F(dcopy)(&ix1, mat, &cx1, stk(lr ), &cx1);
+     Rhs = 0;
+     l4 = C2F(iop).lct[3];
+     C2F(iop).lct[3] = -1;
 -    C2F(stackp)(id, &cx0);
++    //        C2F(stackp)(id, &cx0);
+     C2F(iop).lct[3] = l4;
+     Top = Top_k;
+     Rhs = Rhs_k;
+     if (Err > 0)
+     {
+         return FALSE;
+     }
+     return TRUE;
  }
  /*--------------------------------------------------------------------------*/
-  /* Put variable number into Scilab internal stack with name "namex" */
- int C2F(putvar)(int  *number,char *namex,  unsigned long name_len)
+ /* Put variable number into Scilab internal stack with name "namex" */
+ int C2F(putvar)(int  *number, char *namex,  unsigned long name_len)
  {
-   int Rhs_k = Rhs , Top_k = Top ;
-   int l4, id[nsiz],/* lc, lr,*/ cx0_2=1;
+     int Rhs_k = Rhs , Top_k = Top ;
+     int l4, id[nsiz],/* lc, lr,*/ cx0_2 = 1;
  
-   C2F(str2name)(namex, id, name_len);
-   Top = *number + Top -Rhs;
-   Rhs = 0;
-   l4 = C2F(iop).lct[3];
-   C2F(iop).lct[3] = -1;
- //  C2F(stackp)(id, &cx0_2);
-   C2F(iop).lct[3] = l4;
-   Top = Top_k;
-   Rhs = Rhs_k;
-   if (Err > 0)  return FALSE;
-   return TRUE;
+     C2F(str2name)(namex, id, name_len);
+     Top = *number + Top - Rhs;
+     Rhs = 0;
+     l4 = C2F(iop).lct[3];
+     C2F(iop).lct[3] = -1;
 -    C2F(stackp)(id, &cx0_2);
++    //  C2F(stackp)(id, &cx0_2);
+     C2F(iop).lct[3] = l4;
+     Top = Top_k;
+     Rhs = Rhs_k;
+     if (Err > 0)
+     {
+         return FALSE;
+     }
+     return TRUE;
  }
  
  /*------------------------------------------------------
@@@ -378,7 -435,7 +434,7 @@@ int C2F(cwritechain)(char *namex, int *
      Rhs = 0;
      l4 = C2F(iop).lct[3];
      C2F(iop).lct[3] = -1;
- //    C2F(stackp)(id, &cx0);
 -    C2F(stackp)(id, &cx0);
++    //    C2F(stackp)(id, &cx0);
      C2F(iop).lct[3] = l4;
      Top = Top_k ;
      Rhs = Rhs_k ;
@@@ -686,24 -776,30 +775,30 @@@ int C2F(creadbmat)(char *namex, int *m
  /*--------------------------------------------------------------------------*/
  int C2F(cwritebmat)(char *namex, int *m, int *n,  int *mat, unsigned long name_len)
  {
-       int   ix1 = *m * *n;
-       int Rhs_k = Rhs , Top_k = Top ;
-       int l4, id[nsiz], lr;
+     int   ix1 = *m * *n;
+     int Rhs_k = Rhs , Top_k = Top ;
+     int l4, id[nsiz], lr;
  
-       C2F(str2name)(namex, id, name_len);
-       Top = Top + Nbvars + 1;
-       if (! C2F(crebmat)("cwritebmat", &Top, m, n, &lr, 10L)) return  FALSE;
+     C2F(str2name)(namex, id, name_len);
+     Top = Top + Nbvars + 1;
+     if (! C2F(crebmat)("cwritebmat", &Top, m, n, &lr, 10L))
+     {
+         return  FALSE;
+     }
  
-       C2F(icopy)(&ix1, mat, &cx1, istk(lr ), &cx1);
-       Rhs = 0;
-       l4 = C2F(iop).lct[3];
-       C2F(iop).lct[3] = -1;
- //    C2F(stackp)(id, &cx0);
-       C2F(iop).lct[3] = l4;
-       Top = Top_k;
-       Rhs = Rhs_k;
-       if (Err > 0)  return FALSE;
-       return TRUE;
+     C2F(icopy)(&ix1, mat, &cx1, istk(lr ), &cx1);
+     Rhs = 0;
+     l4 = C2F(iop).lct[3];
+     C2F(iop).lct[3] = -1;
 -    C2F(stackp)(id, &cx0);
++    //        C2F(stackp)(id, &cx0);
+     C2F(iop).lct[3] = l4;
+     Top = Top_k;
+     Rhs = Rhs_k;
+     if (Err > 0)
+     {
+         return FALSE;
+     }
+     return TRUE;
  
  }
  /*--------------------------------------------------------------------------*/
@@@ -962,29 -1080,29 +1079,29 @@@ void CreateCPolyVarFromPtr(int _iNewVal
  
  void GetRhsStringVar(int _iVarNum, int* _piRows, int* _piCols, int* _piLen, char* _pstData)
  {
-       int iAddrBase           = iadr(*Lstk(Top - Rhs + _iVarNum));
-       int iValType            = *istk(iAddrBase);
-       int iAddrData           = 0;
-       if(iValType < 0)
-       {
-               iAddrBase               = iadr(*istk(iAddrBase + 1));
-       }
+     int iAddrBase             = iadr(*Lstk(Top - Rhs + _iVarNum));
+     int iValType              = *istk(iAddrBase);
+     int iAddrData             = 0;
+     if (iValType < 0)
+     {
+         iAddrBase             = iadr(*istk(iAddrBase + 1));
+     }
  
-       iGetStringFromAddress(iAddrBase, _piRows, _piCols, _piLen, &iAddrData);
+     iGetStringFromAddress(iAddrBase, _piRows, _piCols, _piLen, &iAddrData);
  
-       if(iAddrData == 0)
-       {
-               return;
-       }
+     if (iAddrData == 0)
+     {
+         return;
+     }
  
-       if(_pstData == NULL)
-       {
-               return;
-       }
-       //code2str(&_pstData, (int*) cstk(iAddrData), iArraySum(_piLen, 0, *_piRows * *_piCols));
+     if (_pstData == NULL)
+     {
+         return;
+     }
 -    code2str(&_pstData, (int*) cstk(iAddrData), iArraySum(_piLen, 0, *_piRows * *_piCols));
++    //code2str(&_pstData, (int*) cstk(iAddrData), iArraySum(_piLen, 0, *_piRows * *_piCols));
  
-       C2F(intersci).ntypes[_iVarNum - 1] = '$' ;
-       C2F(intersci).iwhere[_iVarNum - 1] = *Lstk(_iVarNum);
+     C2F(intersci).ntypes[_iVarNum - 1] = '$' ;
+     C2F(intersci).iwhere[_iVarNum - 1] = *Lstk(_iVarNum);
  }
  
  void CreateSparseVarFromPtr(int _iNewVal, int _iRows, int _iCols, int _iTotalElem, int* _piElemByRow, int* _piColByRow, double* _pdblRealData)
@@@ -1733,16 -1915,18 +1914,18 @@@ int iGetListItemSparse(int _iVar, int _
  
  int iGetListItemString(int _iVar, int _iItemNumber, int *_piRows, int *_piCols, int *_piLen, char* _pszData)
  {
-       int iAddrData   = 0;
-       int iAddrItem   = iGetAddressFromItemNumber(_iVar, _iItemNumber);
+     int iAddrData     = 0;
+     int iAddrItem     = iGetAddressFromItemNumber(_iVar, _iItemNumber);
  
-       iGetStringFromAddress(iAddrItem, _piRows, _piCols, _piLen, &iAddrData);
+     iGetStringFromAddress(iAddrItem, _piRows, _piCols, _piLen, &iAddrData);
  
-       if(iAddrData == 0 || _pszData == NULL)
-               return 0;
+     if (iAddrData == 0 || _pszData == NULL)
+     {
+         return 0;
+     }
  
-       //code2str(&_pszData, (int*) cstk(iAddrData), iArraySum(_piLen, 0, *_piRows * *_piCols));
-       return 0;
 -    code2str(&_pszData, (int*) cstk(iAddrData), iArraySum(_piLen, 0, *_piRows * *_piCols));
++    //code2str(&_pszData, (int*) cstk(iAddrData), iArraySum(_piLen, 0, *_piRows * *_piCols));
+     return 0;
  }
  
  //Get SubList reference
@@@ -1786,25 -1973,25 +1972,25 @@@ int* iGetListItemList(int _iVar, int* _
  //Get SubItem String
  int iGetListSubItemString(int _iVar, int* _piParentList, int _iItemNumber, int *_piRows, int *_piCols, int *_piLen, char* _pszData)
  {
-       int *piString = NULL;
-       int* piItemAdd = iGetListItemPointerFromItemNumber(_iVar, _piParentList, _iItemNumber);
+     int *piString = NULL;
+     int* piItemAdd = iGetListItemPointerFromItemNumber(_iVar, _piParentList, _iItemNumber);
  
-       if(piItemAdd == NULL)
-       {
-               return 1;
-       }
+     if (piItemAdd == NULL)
+     {
+         return 1;
+     }
  
-       iGetStringFromPointer(piItemAdd, _piRows, _piCols, _piLen, &piString);
+     iGetStringFromPointer(piItemAdd, _piRows, _piCols, _piLen, &piString);
  
-       if(_piLen == NULL || _pszData == NULL)
-       {
-               return 0;
-       }
+     if (_piLen == NULL || _pszData == NULL)
+     {
+         return 0;
+     }
  
-       //code2str(&_pszData, piString, iArraySum(_piLen, 0, *_piRows * *_piCols));
-       {
-               return 0;
-       }
 -    code2str(&_pszData, piString, iArraySum(_piLen, 0, *_piRows * *_piCols));
++    //code2str(&_pszData, piString, iArraySum(_piLen, 0, *_piRows * *_piCols));
+     {
+         return 0;
+     }
  }
  
  
@@@ -1940,26 -2149,93 +2148,30 @@@ int iGetStringFromAddress(int _iAddr, i
  
  int iGetStringFromPointer(int* _piAddr, int *_piRows, int *_piCols, int *_piLen, int** _piString)
  {
-       int iIndex                      = 0;
-       int *piOffset           = NULL;
+     int iIndex                        = 0;
+     int *piOffset             = NULL;
  
-       *_piRows                                = _piAddr[1];
-       *_piCols                                = _piAddr[2];
+     *_piRows                          = _piAddr[1];
+     *_piCols                          = _piAddr[2];
  
  
-       if(_piLen == NULL)
-               return 0;
+     if (_piLen == NULL)
+     {
+         return 0;
+     }
  
-       piOffset                        = _piAddr + 4;
+     piOffset                  = _piAddr + 4;
  
-       /*Get all offest*/
-       for(iIndex = 0 ; iIndex < *_piRows * *_piCols; iIndex++)
-               _piLen[iIndex] = piOffset[iIndex + 1] - piOffset[iIndex];
+     /*Get all offest*/
+     for (iIndex = 0 ; iIndex < *_piRows * *_piCols; iIndex++)
+     {
+         _piLen[iIndex] = piOffset[iIndex + 1] - piOffset[iIndex];
+     }
  
-       *_piString                      = _piAddr + (5 + (*_piRows) * (*_piCols));
-       return 0;
+     *_piString                        = _piAddr + (5 + (*_piRows) * (*_piCols));
+     return 0;
  }
  
 -void vGetPointerFromDoubleComplex(const doublecomplex *_poComplex, int _iSize, double *_pdblReal, double *_pdblImg)
 -{
 -
 -    int iTwo  = 2;
 -    int iOne  = 1;
 -    double *pReal = (double*)&_poComplex[0].r;
 -    double *pImg = (double*)&_poComplex[0].i;
 -
 -    if (_pdblReal != NULL && _pdblImg != NULL)
 -    {
 -        C2F(dcopy)(&_iSize, pReal, &iTwo, _pdblReal, &iOne);
 -        C2F(dcopy)(&_iSize, pImg, &iTwo, _pdblImg, &iOne);
 -    }
 -    else if (_pdblReal != NULL && _pdblImg == NULL)
 -    {
 -        C2F(dcopy)(&_iSize, pReal, &iTwo, _pdblReal, &iOne);
 -    }
 -    else if (_pdblReal == NULL && _pdblImg != NULL)
 -    {
 -        C2F(dcopy)(&_iSize, pImg, &iTwo, _pdblImg, &iOne);
 -    }
 -}
 -doublecomplex* oGetDoubleComplexFromPointer(double *_pdblReal, double *_pdblImg, int _iSize)
 -{
 -    doublecomplex *poComplex = (doublecomplex*)MALLOC(sizeof(doublecomplex) * _iSize);
 -    int iTwo  = 2;
 -    int iOne  = 1;
 -    double *pReal = &poComplex[0].r;
 -    double *pImg = &poComplex[0].i;
 -
 -    if (_pdblReal != NULL && _pdblImg != NULL)
 -    {
 -
 -        C2F(dcopy)(&_iSize, _pdblReal, &iOne, pReal, &iTwo);
 -        C2F(dcopy)(&_iSize, _pdblImg, &iOne, pImg, &iTwo);
 -    }
 -    else if (_pdblReal != NULL && _pdblImg == NULL)
 -    {
 -        double ZERO = 0.;
 -        C2F(dcopy)(&_iSize, _pdblReal, &iOne, pReal, &iTwo);
 -        C2F(dset)(&_iSize, &ZERO, pImg, &iTwo);
 -    }
 -    else if (_pdblReal == NULL && _pdblImg != NULL)
 -    {
 -        double ZERO = 0.;
 -        C2F(dset)(&_iSize, &ZERO, pReal, &iTwo);
 -        C2F(dcopy)(&_iSize, _pdblImg, &iOne, pImg, &iTwo);
 -    }
 -    else
 -    {
 -        FREE(poComplex);
 -        return NULL;
 -    }
 -    return poComplex;
 -}
 -void vFreeDoubleComplexFromPointer(doublecomplex *_poComplex)
 -{
 -    if (_poComplex != NULL)
 -    {
 -        FREE(_poComplex);
 -    }
 -}
 -
  /*
  Create a list in scilab stack
  This function only "reserves" VarNum
@@@ -2297,52 -2596,52 +2532,52 @@@ int GetRhsVarMatrixComplex(int number, 
  
  int *GetLengthStringMatrixByName(char *name_, int *m, int *n)
  {
-       int *lenghtMatrix = NULL;
-       unsigned long name_len= (unsigned long)strlen(name_);
-       int x = 0;
-       int y = 0;
-       int mn = 0;
-       int lp = 0;
-       int j = 0;
-       int iposx = 0, iposy = 0;
-       int lengthAtiposxiposy = 0;
-       if ( ! C2F(cmatsptr)  (name_, m,n, &iposx, &iposy, &lp, &lengthAtiposxiposy, name_len) )
-       {
-               *m = -1;
-               *n = -1;
-               return NULL;
-       }
-       mn = *m * *n;
-       lenghtMatrix = (int*)MALLOC(mn * sizeof(int));
-       if (!lenghtMatrix)
-       {
-               *m = -1;
-               *n = -1;
-               return NULL;
-       }
-       j = 0;
-       for (x = 1; x <= *m;x++)
-       {
-               for (y = 1; y <= *n;y++)
-               {
-                       if ( !C2F(cmatsptr)  (name_, m,n, &x, &y, &lp, &lengthAtiposxiposy, name_len) )
-                       {
-                               FREE(lenghtMatrix);
-                               *m = -1;
-                               *n = -1;
-                               return NULL;
-                       }
-                       /* scilab string not finished by '\0' */
-                       /* we add to the length */
-                       lenghtMatrix[j] = lengthAtiposxiposy + 1;
-                       j++;
-               }
-       }
-       return lenghtMatrix;
 -    int *lengthMatrix = NULL;
++    int *lenghtMatrix = NULL;
+     unsigned long name_len = (unsigned long)strlen(name_);
+     int x = 0;
+     int y = 0;
+     int mn = 0;
+     int lp = 0;
+     int j = 0;
+     int iposx = 0, iposy = 0;
+     int lengthAtiposxiposy = 0;
+     if ( ! C2F(cmatsptr)  (name_, m, n, &iposx, &iposy, &lp, &lengthAtiposxiposy, name_len) )
+     {
+         *m = -1;
+         *n = -1;
+         return NULL;
+     }
+     mn = *m * *n;
 -    lengthMatrix = (int*)MALLOC(mn * sizeof(int));
 -    if (!lengthMatrix)
++    lenghtMatrix = (int*)MALLOC(mn * sizeof(int));
++    if (!lenghtMatrix)
+     {
+         *m = -1;
+         *n = -1;
+         return NULL;
+     }
+     j = 0;
+     for (x = 1; x <= *m; x++)
+     {
+         for (y = 1; y <= *n; y++)
+         {
+             if ( !C2F(cmatsptr)  (name_, m, n, &x, &y, &lp, &lengthAtiposxiposy, name_len) )
+             {
 -                FREE(lengthMatrix);
++                FREE(lenghtMatrix);
+                 *m = -1;
+                 *n = -1;
+                 return NULL;
+             }
+             /* scilab string not finished by '\0' */
+             /* we add to the length */
 -            lengthMatrix[j] = lengthAtiposxiposy + 1;
++            lenghtMatrix[j] = lengthAtiposxiposy + 1;
+             j++;
+         }
+     }
 -    return lengthMatrix;
++    return lenghtMatrix;
  }
  
  /*Nouveau d├ębut, FAIRE DU TRI DANS TOUT CE MERDIER TONIO !!!!!!!*/
@@@ -1013,8 -1014,8 +1013,8 @@@ int sci_dct_gen(void* pvApiCtx, char *f
      }
  
  
 -    AssignOutputVariable(_pvCtx, 1) =  1;/* assume inplace transform*/
 +    AssignOutputVariable(pvApiCtx, 1) =  1;/* assume inplace transform*/
-     if (isn == 1 & iopt == 0)
+     if (isn == 1 && iopt == 0)
      {
          /* normalization */
          if (dct_scale_array(Ar, Ai, gdim, isn) == -1)
@@@ -1,89 -1,89 +1,87 @@@
--src/modelica_compiler/parseTree.cmi:
--src/modelica_compiler/linenum.cmi:
--src/modelica_compiler/parser.cmi: ./src/modelica_compiler/parseTree.cmi
--src/modelica_compiler/lexer.cmi: ./src/translator/parsing/parser.cmi
--src/modelica_compiler/precompilation.cmi: \
++./src/modelica_compiler/parseTree.cmi:
++./src/modelica_compiler/lexer.cmi: ./src/translator/parsing/parser.cmi
++./src/modelica_compiler/precompilation.cmi: \
      ./src/modelica_compiler/parseTree.cmi
--src/modelica_compiler/compilation.cmi: \
++./src/modelica_compiler/compilation.cmi: \
      ./src/modelica_compiler/precompilation.cmi
--src/modelica_compiler/instantiation.cmi: \
++./src/modelica_compiler/instantiation.cmi: \
      ./src/modelica_compiler/compilation.cmi
--src/modelica_compiler/graphNodeSet.cmi:
--src/modelica_compiler/symbolicExpression.cmi:
--src/modelica_compiler/squareSparseMatrix.cmi:
--src/modelica_compiler/bipartiteGraph.cmi:
--src/modelica_compiler/hungarianMethod.cmi:
--src/modelica_compiler/causalityGraph.cmi:
--src/modelica_compiler/optimization.cmi: \
++./src/modelica_compiler/graphNodeSet.cmi:
++./src/modelica_compiler/symbolicExpression.cmi:
++./src/modelica_compiler/squareSparseMatrix.cmi:
++./src/modelica_compiler/bipartiteGraph.cmi:
++./src/modelica_compiler/hungarianMethod.cmi:
++./src/modelica_compiler/causalityGraph.cmi:
++./src/modelica_compiler/optimization.cmi: \
      ./src/modelica_compiler/symbolicExpression.cmi \
      ./src/translator/instantiation/instantiation.cmi \
      ./src/modelica_compiler/compilation.cmi
--src/modelica_compiler/xMLCodeGeneration.cmi: \
++./src/modelica_compiler/xMLCodeGeneration.cmi: \
      ./src/modelica_compiler/optimization.cmi
--src/modelica_compiler/optimizingCompiler.cmi: \
++./src/modelica_compiler/optimizingCompiler.cmi: \
      ./src/modelica_compiler/optimization.cmi
--src/modelica_compiler/scicosCodeGeneration.cmi: \
++./src/modelica_compiler/scicosCodeGeneration.cmi: \
      ./src/modelica_compiler/optimization.cmi
--src/modelica_compiler/scicosOptimizingCompiler.cmi:
--src/modelica_compiler/parseTree.cmo: src/modelica_compiler/parseTree.cmi
--src/modelica_compiler/parseTree.cmx: src/modelica_compiler/parseTree.cmi
--src/modelica_compiler/linenum.cmo: src/modelica_compiler/linenum.cmi
--src/modelica_compiler/linenum.cmx: src/modelica_compiler/linenum.cmi
--src/modelica_compiler/parser.cmo: ./src/modelica_compiler/parseTree.cmi \
--    ./src/translator/parsing/linenum.cmi src/modelica_compiler/parser.cmi
--src/modelica_compiler/parser.cmx: ./src/modelica_compiler/parseTree.cmx \
--    ./src/translator/parsing/linenum.cmx src/modelica_compiler/parser.cmi
--src/modelica_compiler/lexer.cmo: ./src/translator/parsing/parser.cmi \
--    src/modelica_compiler/lexer.cmi
--src/modelica_compiler/lexer.cmx: ./src/translator/parsing/parser.cmx \
--    src/modelica_compiler/lexer.cmi
--src/modelica_compiler/precompilation.cmo: \
++./src/modelica_compiler/scicosOptimizingCompiler.cmi:
++./src/modelica_compiler/parseTree.cmo: ./src/modelica_compiler/parseTree.cmi
++./src/modelica_compiler/parseTree.cmx: ./src/modelica_compiler/parseTree.cmi
++./src/modelica_compiler/linenum.cmo:
++./src/modelica_compiler/linenum.cmx:
++./src/modelica_compiler/parser.cmo: ./src/modelica_compiler/parseTree.cmi \
++    ./src/translator/parsing/linenum.cmo
++./src/modelica_compiler/parser.cmx: ./src/modelica_compiler/parseTree.cmx \
++    ./src/translator/parsing/linenum.cmx
++./src/modelica_compiler/lexer.cmo: ./src/translator/parsing/parser.cmi \
++    ./src/modelica_compiler/lexer.cmi
++./src/modelica_compiler/lexer.cmx: ./src/translator/parsing/parser.cmx \
++    ./src/modelica_compiler/lexer.cmi
++./src/modelica_compiler/precompilation.cmo: \
      ./src/modelica_compiler/parseTree.cmi \
--    src/modelica_compiler/precompilation.cmi
--src/modelica_compiler/precompilation.cmx: \
++    ./src/modelica_compiler/precompilation.cmi
++./src/modelica_compiler/precompilation.cmx: \
      ./src/modelica_compiler/parseTree.cmx \
--    src/modelica_compiler/precompilation.cmi
--src/modelica_compiler/compilation.cmo: \
++    ./src/modelica_compiler/precompilation.cmi
++./src/modelica_compiler/compilation.cmo: \
      ./src/modelica_compiler/precompilation.cmi \
      ./src/modelica_compiler/parseTree.cmi \
--    src/modelica_compiler/compilation.cmi
--src/modelica_compiler/compilation.cmx: \
++    ./src/modelica_compiler/compilation.cmi
++./src/modelica_compiler/compilation.cmx: \
      ./src/modelica_compiler/precompilation.cmx \
      ./src/modelica_compiler/parseTree.cmx \
--    src/modelica_compiler/compilation.cmi
--src/modelica_compiler/instantiation.cmo: \
++    ./src/modelica_compiler/compilation.cmi
++./src/modelica_compiler/instantiation.cmo: \
      ./src/modelica_compiler/compilation.cmi \
--    src/modelica_compiler/instantiation.cmi
--src/modelica_compiler/instantiation.cmx: \
++    ./src/modelica_compiler/instantiation.cmi
++./src/modelica_compiler/instantiation.cmx: \
      ./src/modelica_compiler/compilation.cmx \
--    src/modelica_compiler/instantiation.cmi
--src/modelica_compiler/graphNodeSet.cmo: \
--    src/modelica_compiler/graphNodeSet.cmi
--src/modelica_compiler/graphNodeSet.cmx: \
--    src/modelica_compiler/graphNodeSet.cmi
--src/modelica_compiler/symbolicExpression.cmo: \
++    ./src/modelica_compiler/instantiation.cmi
++./src/modelica_compiler/graphNodeSet.cmo: \
++    ./src/modelica_compiler/graphNodeSet.cmi
++./src/modelica_compiler/graphNodeSet.cmx: \
++    ./src/modelica_compiler/graphNodeSet.cmi
++./src/modelica_compiler/symbolicExpression.cmo: \
      ./src/modelica_compiler/graphNodeSet.cmi \
--    src/modelica_compiler/symbolicExpression.cmi
--src/modelica_compiler/symbolicExpression.cmx: \
++    ./src/modelica_compiler/symbolicExpression.cmi
++./src/modelica_compiler/symbolicExpression.cmx: \
      ./src/modelica_compiler/graphNodeSet.cmx \
--    src/modelica_compiler/symbolicExpression.cmi
--src/modelica_compiler/squareSparseMatrix.cmo: \
--    src/modelica_compiler/squareSparseMatrix.cmi
--src/modelica_compiler/squareSparseMatrix.cmx: \
--    src/modelica_compiler/squareSparseMatrix.cmi
--src/modelica_compiler/bipartiteGraph.cmo: \
--    src/modelica_compiler/bipartiteGraph.cmi
--src/modelica_compiler/bipartiteGraph.cmx: \
--    src/modelica_compiler/bipartiteGraph.cmi
--src/modelica_compiler/hungarianMethod.cmo: \
--    src/modelica_compiler/hungarianMethod.cmi
--src/modelica_compiler/hungarianMethod.cmx: \
--    src/modelica_compiler/hungarianMethod.cmi
--src/modelica_compiler/causalityGraph.cmo: \
--    src/modelica_compiler/causalityGraph.cmi
--src/modelica_compiler/causalityGraph.cmx: \
--    src/modelica_compiler/causalityGraph.cmi
--src/modelica_compiler/optimization.cmo: \
++    ./src/modelica_compiler/symbolicExpression.cmi
++./src/modelica_compiler/squareSparseMatrix.cmo: \
++    ./src/modelica_compiler/squareSparseMatrix.cmi
++./src/modelica_compiler/squareSparseMatrix.cmx: \
++    ./src/modelica_compiler/squareSparseMatrix.cmi
++./src/modelica_compiler/bipartiteGraph.cmo: \
++    ./src/modelica_compiler/bipartiteGraph.cmi
++./src/modelica_compiler/bipartiteGraph.cmx: \
++    ./src/modelica_compiler/bipartiteGraph.cmi
++./src/modelica_compiler/hungarianMethod.cmo: \
++    ./src/modelica_compiler/hungarianMethod.cmi
++./src/modelica_compiler/hungarianMethod.cmx: \
++    ./src/modelica_compiler/hungarianMethod.cmi
++./src/modelica_compiler/causalityGraph.cmo: \
++    ./src/modelica_compiler/causalityGraph.cmi
++./src/modelica_compiler/causalityGraph.cmx: \
++    ./src/modelica_compiler/causalityGraph.cmi
++./src/modelica_compiler/optimization.cmo: \
      ./src/modelica_compiler/symbolicExpression.cmi \
      ./src/modelica_compiler/squareSparseMatrix.cmi \
      ./src/translator/instantiation/instantiation.cmi \
@@@ -91,8 -91,8 +89,8 @@@
      ./src/modelica_compiler/compilation.cmi \
      ./src/modelica_compiler/causalityGraph.cmi \
      ./src/modelica_compiler/bipartiteGraph.cmi \
--    src/modelica_compiler/optimization.cmi
--src/modelica_compiler/optimization.cmx: \
++    ./src/modelica_compiler/optimization.cmi
++./src/modelica_compiler/optimization.cmx: \
      ./src/modelica_compiler/symbolicExpression.cmx \
      ./src/modelica_compiler/squareSparseMatrix.cmx \
      ./src/translator/instantiation/instantiation.cmx \
      ./src/modelica_compiler/compilation.cmx \
      ./src/modelica_compiler/causalityGraph.cmx \
      ./src/modelica_compiler/bipartiteGraph.cmx \
--    src/modelica_compiler/optimization.cmi
--src/modelica_compiler/xMLCodeGeneration.cmo: \
++    ./src/modelica_compiler/optimization.cmi
++./src/modelica_compiler/xMLCodeGeneration.cmo: \
      ./src/modelica_compiler/symbolicExpression.cmi \
      ./src/modelica_compiler/optimization.cmi \
--    src/modelica_compiler/xMLCodeGeneration.cmi
--src/modelica_compiler/xMLCodeGeneration.cmx: \
++    ./src/modelica_compiler/xMLCodeGeneration.cmi
++./src/modelica_compiler/xMLCodeGeneration.cmx: \
      ./src/modelica_compiler/symbolicExpression.cmx \
      ./src/modelica_compiler/optimization.cmx \
--    src/modelica_compiler/xMLCodeGeneration.cmi
--src/modelica_compiler/optimizingCompiler.cmo: \
++    ./src/modelica_compiler/xMLCodeGeneration.cmi
++./src/modelica_compiler/optimizingCompiler.cmo: \
      ./src/modelica_compiler/xMLCodeGeneration.cmi \
      ./src/modelica_compiler/precompilation.cmi \
      ./src/translator/parsing/parser.cmi \
      ./src/modelica_compiler/optimization.cmi \
--    ./src/translator/parsing/lexer.cmi \
++    ./src/modelica_compiler/lexer.cmi \
      ./src/translator/instantiation/instantiation.cmi \
      ./src/modelica_compiler/compilation.cmi \
--    src/modelica_compiler/optimizingCompiler.cmi
--src/modelica_compiler/optimizingCompiler.cmx: \
++    ./src/modelica_compiler/optimizingCompiler.cmi
++./src/modelica_compiler/optimizingCompiler.cmx: \
      ./src/modelica_compiler/xMLCodeGeneration.cmx \
      ./src/modelica_compiler/precompilation.cmx \
      ./src/translator/parsing/parser.cmx \
      ./src/modelica_compiler/optimization.cmx \
--    ./src/translator/parsing/lexer.cmx \
++    ./src/modelica_compiler/lexer.cmx \
      ./src/translator/instantiation/instantiation.cmx \
      ./src/modelica_compiler/compilation.cmx \
--    src/modelica_compiler/optimizingCompiler.cmi
--src/modelica_compiler/scicosCodeGeneration.cmo: \
++    ./src/modelica_compiler/optimizingCompiler.cmi
++./src/modelica_compiler/scicosCodeGeneration.cmo: \
      ./src/modelica_compiler/symbolicExpression.cmi \
      ./src/modelica_compiler/optimization.cmi \
      ./src/translator/instantiation/instantiation.cmi \
--    src/modelica_compiler/scicosCodeGeneration.cmi
--src/modelica_compiler/scicosCodeGeneration.cmx: \
++    ./src/modelica_compiler/scicosCodeGeneration.cmi
++./src/modelica_compiler/scicosCodeGeneration.cmx: \
      ./src/modelica_compiler/symbolicExpression.cmx \
      ./src/modelica_compiler/optimization.cmx \
      ./src/translator/instantiation/instantiation.cmx \
--    src/modelica_compiler/scicosCodeGeneration.cmi
--src/modelica_compiler/scicosOptimizingCompiler.cmo: \
++    ./src/modelica_compiler/scicosCodeGeneration.cmi
++./src/modelica_compiler/scicosOptimizingCompiler.cmo: \
      ./src/modelica_compiler/scicosCodeGeneration.cmi \
      ./src/modelica_compiler/optimizingCompiler.cmi \
--    src/modelica_compiler/scicosOptimizingCompiler.cmi
--src/modelica_compiler/scicosOptimizingCompiler.cmx: \
++    ./src/modelica_compiler/scicosOptimizingCompiler.cmi
++./src/modelica_compiler/scicosOptimizingCompiler.cmx: \
      ./src/modelica_compiler/scicosCodeGeneration.cmx \
      ./src/modelica_compiler/optimizingCompiler.cmx \
--    src/modelica_compiler/scicosOptimizingCompiler.cmi
--src/xml2modelica/xMLTree.cmo:
--src/xml2modelica/xMLTree.cmx:
--src/xml2modelica/linenum.cmo:
--src/xml2modelica/linenum.cmx:
--src/xml2modelica/stringParser.cmo:
--src/xml2modelica/stringParser.cmx:
--src/xml2modelica/stringLexer.cmo: ./src/xml2modelica/stringParser.cmo
--src/xml2modelica/stringLexer.cmx: ./src/xml2modelica/stringParser.cmx
--src/xml2modelica/xMLParser.cmo: ./src/xml2modelica/xMLTree.cmo \
--    ./src/translator/parsing/linenum.cmi
--src/xml2modelica/xMLParser.cmx: ./src/xml2modelica/xMLTree.cmx \
++    ./src/modelica_compiler/scicosOptimizingCompiler.cmi
++./src/xml2modelica/xMLTree.cmo:
++./src/xml2modelica/xMLTree.cmx:
++./src/xml2modelica/linenum.cmo:
++./src/xml2modelica/linenum.cmx:
++./src/xml2modelica/stringParser.cmo:
++./src/xml2modelica/stringParser.cmx:
++./src/xml2modelica/stringLexer.cmo: ./src/xml2modelica/stringParser.cmo
++./src/xml2modelica/stringLexer.cmx: ./src/xml2modelica/stringParser.cmx
++./src/xml2modelica/xMLParser.cmo: ./src/xml2modelica/xMLTree.cmo \
++    ./src/translator/parsing/linenum.cmo
++./src/xml2modelica/xMLParser.cmx: ./src/xml2modelica/xMLTree.cmx \
      ./src/translator/parsing/linenum.cmx
--src/xml2modelica/xMLLexer.cmo: ./src/xml2modelica/xMLParser.cmo
--src/xml2modelica/xMLLexer.cmx: ./src/xml2modelica/xMLParser.cmx
--src/xml2modelica/modelicaCodeGenerator.cmo: ./src/xml2modelica/xMLTree.cmo \
++./src/xml2modelica/xMLLexer.cmo: ./src/xml2modelica/xMLParser.cmo
++./src/xml2modelica/xMLLexer.cmx: ./src/xml2modelica/xMLParser.cmx
++./src/xml2modelica/modelicaCodeGenerator.cmo: ./src/xml2modelica/xMLTree.cmo \
      ./src/xml2modelica/stringParser.cmo ./src/xml2modelica/stringLexer.cmo
--src/xml2modelica/modelicaCodeGenerator.cmx: ./src/xml2modelica/xMLTree.cmx \
++./src/xml2modelica/modelicaCodeGenerator.cmx: ./src/xml2modelica/xMLTree.cmx \
      ./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringLexer.cmx
--src/xml2modelica/xML2Modelica.cmo: ./src/xml2modelica/xMLParser.cmo \
++./src/xml2modelica/xML2Modelica.cmo: ./src/xml2modelica/xMLParser.cmo \
      ./src/xml2modelica/xMLLexer.cmo \
      ./src/xml2modelica/modelicaCodeGenerator.cmo
--src/xml2modelica/xML2Modelica.cmx: ./src/xml2modelica/xMLParser.cmx \
++./src/xml2modelica/xML2Modelica.cmx: ./src/xml2modelica/xMLParser.cmx \
      ./src/xml2modelica/xMLLexer.cmx \
      ./src/xml2modelica/modelicaCodeGenerator.cmx
--src/translator/parsing/syntax.cmi:
--src/translator/parsing/parser.cmi: ./src/translator/parsing/syntax.cmi
--src/translator/parsing/lexer.cmi: ./src/translator/parsing/parser.cmi
--src/translator/parsing/linenum.cmi:
--src/translator/compilation/types.cmi:
--src/translator/compilation/nameResolve.cmi: \
--    ./src/translator/compilation/types.cmi \
--    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi
--src/translator/instantiation/instantiation.cmi: \
--    ./src/translator/compilation/types.cmi \
--    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
++./src/translator/parsing/parser.cmi: ./src/translator/parsing/syntax.cmo
++./src/translator/compilation/nameResolve.cmi: \
++    ./src/translator/compilation/types.cmo \
++    ./src/translator/parsing/syntax.cmo ./src/translator/parsing/parser.cmi
++./src/translator/instantiation/instantiation.cmi: \
++    ./src/translator/compilation/types.cmo \
++    ./src/translator/parsing/syntax.cmo ./src/translator/parsing/parser.cmi \
      ./src/translator/compilation/nameResolve.cmi
--src/translator/exceptionHandling/msgDico.cmi:
--src/translator/exceptionHandling/errorDico.cmi: \
++./src/translator/exceptionHandling/errorDico.cmi: \
      ./src/translator/parsing/parser.cmi \
      ./src/translator/instantiation/instantiation.cmi
--src/translator/exceptionHandling/exceptHandler.cmi: \
++./src/translator/exceptionHandling/exceptHandler.cmi: \
      ./src/translator/parsing/parser.cmi \
      ./src/translator/instantiation/instantiation.cmi
--src/translator/translation/libraryManager.cmi: \
--    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi
--src/translator/translation/codeGeneration.cmi: \
--    ./src/translator/compilation/types.cmi \
++./src/translator/translation/libraryManager.cmi: \
++    ./src/translator/parsing/syntax.cmo ./src/translator/parsing/parser.cmi
++./src/translator/translation/codeGeneration.cmi: \
++    ./src/translator/compilation/types.cmo \
      ./src/translator/instantiation/instantiation.cmi \
      ./src/translator/exceptionHandling/errorDico.cmi
--src/translator/translation/versiondate.cmi:
--src/translator/translation/translator.cmi: \
--    ./src/translator/parsing/syntax.cmi \
++./src/translator/translation/translator.cmi: \
++    ./src/translator/parsing/syntax.cmo \
      ./src/translator/compilation/nameResolve.cmi \
      ./src/translator/instantiation/instantiation.cmi
--src/translator/parsing/syntax.cmo: src/translator/parsing/syntax.cmi
--src/translator/parsing/syntax.cmx: src/translator/parsing/syntax.cmi
--src/translator/parsing/parser.cmo: ./src/translator/parsing/syntax.cmi \
--    src/translator/parsing/parser.cmi
--src/translator/parsing/parser.cmx: ./src/translator/parsing/syntax.cmx \
--    src/translator/parsing/parser.cmi
--src/translator/parsing/lexer.cmo: ./src/translator/parsing/parser.cmi \
--    src/translator/parsing/lexer.cmi
--src/translator/parsing/lexer.cmx: ./src/translator/parsing/parser.cmx \
--    src/translator/parsing/lexer.cmi
--src/translator/parsing/linenum.cmo: src/translator/parsing/linenum.cmi
--src/translator/parsing/linenum.cmx: src/translator/parsing/linenum.cmi
--src/translator/compilation/types.cmo: src/translator/compilation/types.cmi
--src/translator/compilation/types.cmx: src/translator/compilation/types.cmi
--src/translator/compilation/nameResolve.cmo: \
--    ./src/translator/compilation/types.cmi \
--    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
--    src/translator/compilation/nameResolve.cmi
--src/translator/compilation/nameResolve.cmx: \
++./src/translator/parsing/syntax.cmo:
++./src/translator/parsing/syntax.cmx:
++./src/translator/parsing/parser.cmo: ./src/translator/parsing/syntax.cmo \
++    ./src/translator/parsing/parser.cmi
++./src/translator/parsing/parser.cmx: ./src/translator/parsing/syntax.cmx \
++    ./src/translator/parsing/parser.cmi
++./src/translator/parsing/lexer.cmo: ./src/translator/parsing/parser.cmi
++./src/translator/parsing/lexer.cmx: ./src/translator/parsing/parser.cmx
++./src/translator/parsing/linenum.cmo:
++./src/translator/parsing/linenum.cmx:
++./src/translator/compilation/types.cmo:
++./src/translator/compilation/types.cmx:
++./src/translator/compilation/nameResolve.cmo: \
++    ./src/translator/compilation/types.cmo \
++    ./src/translator/parsing/syntax.cmo ./src/translator/parsing/parser.cmi \
++    ./src/translator/compilation/nameResolve.cmi
++./src/translator/compilation/nameResolve.cmx: \
      ./src/translator/compilation/types.cmx \
      ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.cmx \
--    src/translator/compilation/nameResolve.cmi
--src/translator/instantiation/instantiation.cmo: \
--    ./src/translator/compilation/types.cmi \
--    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
++    ./src/translator/compilation/nameResolve.cmi
++./src/translator/instantiation/instantiation.cmo: \
++    ./src/translator/compilation/types.cmo \
++    ./src/translator/parsing/syntax.cmo ./src/translator/parsing/parser.cmi \
      ./src/translator/compilation/nameResolve.cmi \
--    src/translator/instantiation/instantiation.cmi
--src/translator/instantiation/instantiation.cmx: \
++    ./src/translator/instantiation/instantiation.cmi
++./src/translator/instantiation/instantiation.cmx: \
      ./src/translator/compilation/types.cmx \
      ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.cmx \
      ./src/translator/compilation/nameResolve.cmx \
--    src/translator/instantiation/instantiation.cmi
--src/translator/exceptionHandling/msgDico.cmo: \
--    src/translator/exceptionHandling/msgDico.cmi
--src/translator/exceptionHandling/msgDico.cmx: \
--    src/translator/exceptionHandling/msgDico.cmi
--src/translator/exceptionHandling/errorDico.cmo: \
++    ./src/translator/instantiation/instantiation.cmi
++./src/translator/exceptionHandling/msgDico.cmo:
++./src/translator/exceptionHandling/msgDico.cmx:
++./src/translator/exceptionHandling/errorDico.cmo: \
      ./src/translator/parsing/parser.cmi \
      ./src/translator/compilation/nameResolve.cmi \
      ./src/translator/instantiation/instantiation.cmi \
--    src/translator/exceptionHandling/errorDico.cmi
--src/translator/exceptionHandling/errorDico.cmx: \
++    ./src/translator/exceptionHandling/errorDico.cmi
++./src/translator/exceptionHandling/errorDico.cmx: \
      ./src/translator/parsing/parser.cmx \
      ./src/translator/compilation/nameResolve.cmx \
      ./src/translator/instantiation/instantiation.cmx \
--    src/translator/exceptionHandling/errorDico.cmi
--src/translator/exceptionHandling/exceptHandler.cmo: \
++    ./src/translator/exceptionHandling/errorDico.cmi
++./src/translator/exceptionHandling/exceptHandler.cmo: \
      ./src/translator/parsing/parser.cmi \
      ./src/translator/compilation/nameResolve.cmi \
--    ./src/translator/exceptionHandling/msgDico.cmi \
--    ./src/translator/parsing/linenum.cmi \
++    ./src/translator/exceptionHandling/msgDico.cmo \
++    ./src/translator/parsing/linenum.cmo \
      ./src/translator/instantiation/instantiation.cmi \
      ./src/translator/exceptionHandling/errorDico.cmi \
--    src/translator/exceptionHandling/exceptHandler.cmi
--src/translator/exceptionHandling/exceptHandler.cmx: \
++    ./src/translator/exceptionHandling/exceptHandler.cmi
++./src/translator/exceptionHandling/exceptHandler.cmx: \
      ./src/translator/parsing/parser.cmx \
      ./src/translator/compilation/nameResolve.cmx \
      ./src/translator/exceptionHandling/msgDico.cmx \
      ./src/translator/parsing/linenum.cmx \
      ./src/translator/instantiation/instantiation.cmx \
      ./src/translator/exceptionHandling/errorDico.cmx \
--    src/translator/exceptionHandling/exceptHandler.cmi
--src/translator/translation/libraryManager.cmo: \
--    ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.cmi \
++    ./src/translator/exceptionHandling/exceptHandler.cmi
++./src/translator/translation/libraryManager.cmo: \
++    ./src/translator/parsing/parser.cmi ./src/modelica_compiler/lexer.cmi \
      ./src/translator/exceptionHandling/exceptHandler.cmi \
--    src/translator/translation/libraryManager.cmi
--src/translator/translation/libraryManager.cmx: \
--    ./src/translator/parsing/parser.cmx ./src/translator/parsing/lexer.cmx \
++    ./src/translator/translation/libraryManager.cmi
++./src/translator/translation/libraryManager.cmx: \
++    ./src/translator/parsing/parser.cmx ./src/modelica_compiler/lexer.cmx \
      ./src/translator/exceptionHandling/exceptHandler.cmx \
--    src/translator/translation/libraryManager.cmi
--src/translator/translation/codeGeneration.cmo: \
--    ./src/translator/compilation/types.cmi \
++    ./src/translator/translation/libraryManager.cmi
++./src/translator/translation/codeGeneration.cmo: \
++    ./src/translator/compilation/types.cmo \
      ./src/translator/compilation/nameResolve.cmi \
      ./src/translator/instantiation/instantiation.cmi \
      ./src/translator/exceptionHandling/errorDico.cmi \
--    src/translator/translation/codeGeneration.cmi
--src/translator/translation/codeGeneration.cmx: \
++    ./src/translator/translation/codeGeneration.cmi
++./src/translator/translation/codeGeneration.cmx: \
      ./src/translator/compilation/types.cmx \
      ./src/translator/compilation/nameResolve.cmx \
      ./src/translator/instantiation/instantiation.cmx \
      ./src/translator/exceptionHandling/errorDico.cmx \
--    src/translator/translation/codeGeneration.cmi
--src/translator/translation/versiondate.cmo: \
--    src/translator/translation/versiondate.cmi
--src/translator/translation/versiondate.cmx: \
--    src/translator/translation/versiondate.cmi
--src/translator/translation/translator.cmo: \
--    ./src/translator/translation/versiondate.cmi \
++    ./src/translator/translation/codeGeneration.cmi
++./src/translator/translation/versiondate.cmo:
++./src/translator/translation/versiondate.cmx:
++./src/translator/translation/translator.cmo: \
++    ./src/translator/translation/versiondate.cmo \
      ./src/translator/compilation/nameResolve.cmi \
      ./src/translator/translation/libraryManager.cmi \
      ./src/translator/instantiation/instantiation.cmi \
      ./src/translator/exceptionHandling/exceptHandler.cmi \
      ./src/translator/translation/codeGeneration.cmi \
--    src/translator/translation/translator.cmi
--src/translator/translation/translator.cmx: \
++    ./src/translator/translation/translator.cmi
++./src/translator/translation/translator.cmx: \
      ./src/translator/translation/versiondate.cmx \
      ./src/translator/compilation/nameResolve.cmx \
      ./src/translator/translation/libraryManager.cmx \
      ./src/translator/instantiation/instantiation.cmx \
      ./src/translator/exceptionHandling/exceptHandler.cmx \
      ./src/translator/translation/codeGeneration.cmx \
--    src/translator/translation/translator.cmi
++    ./src/translator/translation/translator.cmi
@@@ -2497,311 -2454,8 +2497,297 @@@ distclean-local
  
  #BUILT_SOURCES = depend
  
- @OCAML_TRUE@@XCOS_TRUE@depend: $(MLIS) $(MLS) $(MLIS_XML2Modelica) $(MLS_XML2Modelica) $(MLIS_modelicat) $(MLS_modelicat)
- @OCAML_TRUE@@XCOS_TRUE@       $(OCAMLDEP) $(INCLUDE_modelicat) $(INCLUDE) $^ > .depend
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/parseTree.cmi:
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/linenum.cmi:
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/parser.cmi: ./src/modelica_compiler/parseTree.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/lexer.cmi: ./src/translator/parsing/parser.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/precompilation.cmi: \
+ @OCAML_TRUE@@XCOS_TRUE@depend: 
+ @OCAML_TRUE@@XCOS_TRUE@       $(OCAMLDEP) $(INCLUDE_modelicat) $(INCLUDE) $(MLIS) $(MLS) $(MLIS_XML2Modelica) $(MLS_XML2Modelica) $(MLIS_modelicat) $(MLS_modelicat) > .depend
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parseTree.cmi:
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/lexer.cmi: ./src/translator/parsing/parser.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/precompilation.cmi: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/compilation.cmi: \
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/compilation.cmi: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/instantiation.cmi: \
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/instantiation.cmi: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/graphNodeSet.cmi:
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/symbolicExpression.cmi:
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/squareSparseMatrix.cmi:
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/bipartiteGraph.cmi:
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/hungarianMethod.cmi:
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/causalityGraph.cmi:
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/optimization.cmi: \
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/graphNodeSet.cmi:
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/symbolicExpression.cmi:
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/squareSparseMatrix.cmi:
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/bipartiteGraph.cmi:
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/hungarianMethod.cmi:
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/causalityGraph.cmi:
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/optimization.cmi: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/xMLCodeGeneration.cmi: \
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/xMLCodeGeneration.cmi: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/optimizingCompiler.cmi: \
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/optimizingCompiler.cmi: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/scicosCodeGeneration.cmi: \
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/scicosCodeGeneration.cmi: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/scicosOptimizingCompiler.cmi:
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/parseTree.cmo: src/modelica_compiler/parseTree.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/parseTree.cmx: src/modelica_compiler/parseTree.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/linenum.cmo: src/modelica_compiler/linenum.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/linenum.cmx: src/modelica_compiler/linenum.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/parser.cmo: ./src/modelica_compiler/parseTree.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmi src/modelica_compiler/parser.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/parser.cmx: ./src/modelica_compiler/parseTree.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmx src/modelica_compiler/parser.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/lexer.cmo: ./src/translator/parsing/parser.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/lexer.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/lexer.cmx: ./src/translator/parsing/parser.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/lexer.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/precompilation.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/scicosOptimizingCompiler.cmi:
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parseTree.cmo: ./src/modelica_compiler/parseTree.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parseTree.cmx: ./src/modelica_compiler/parseTree.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmo:
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/linenum.cmx:
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parser.cmo: ./src/modelica_compiler/parseTree.cmi \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmo
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/parser.cmx: ./src/modelica_compiler/parseTree.cmx \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmx
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/lexer.cmo: ./src/translator/parsing/parser.cmi \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/lexer.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/lexer.cmx: ./src/translator/parsing/parser.cmx \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/lexer.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/precompilation.cmo: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/precompilation.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/precompilation.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/precompilation.cmx: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/precompilation.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/compilation.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/compilation.cmo: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/compilation.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/compilation.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/compilation.cmx: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/parseTree.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/compilation.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/instantiation.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/instantiation.cmo: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/instantiation.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/instantiation.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/instantiation.cmx: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/instantiation.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/graphNodeSet.cmo: \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/graphNodeSet.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/graphNodeSet.cmx: \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/graphNodeSet.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/symbolicExpression.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/instantiation.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/graphNodeSet.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/graphNodeSet.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/symbolicExpression.cmo: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/symbolicExpression.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/symbolicExpression.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/symbolicExpression.cmx: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/graphNodeSet.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/symbolicExpression.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/squareSparseMatrix.cmo: \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/squareSparseMatrix.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/squareSparseMatrix.cmx: \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/squareSparseMatrix.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/bipartiteGraph.cmo: \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/bipartiteGraph.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/bipartiteGraph.cmx: \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/bipartiteGraph.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/hungarianMethod.cmo: \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/hungarianMethod.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/hungarianMethod.cmx: \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/hungarianMethod.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/causalityGraph.cmo: \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/causalityGraph.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/causalityGraph.cmx: \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/causalityGraph.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/optimization.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/squareSparseMatrix.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/squareSparseMatrix.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/bipartiteGraph.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/bipartiteGraph.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/hungarianMethod.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/hungarianMethod.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/causalityGraph.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/causalityGraph.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/optimization.cmo: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/optimization.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/optimization.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/optimization.cmx: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/squareSparseMatrix.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/hungarianMethod.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/causalityGraph.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/bipartiteGraph.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/optimization.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/xMLCodeGeneration.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/xMLCodeGeneration.cmo: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/xMLCodeGeneration.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/xMLCodeGeneration.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/xMLCodeGeneration.cmx: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/xMLCodeGeneration.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/optimizingCompiler.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/optimizingCompiler.cmo: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/lexer.cmi \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/lexer.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/optimizingCompiler.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/optimizingCompiler.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/optimizingCompiler.cmx: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/xMLCodeGeneration.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/precompilation.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/lexer.cmx \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/lexer.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/compilation.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/optimizingCompiler.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/scicosCodeGeneration.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/scicosCodeGeneration.cmo: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/scicosCodeGeneration.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/scicosCodeGeneration.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosCodeGeneration.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/scicosCodeGeneration.cmx: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/symbolicExpression.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimization.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/scicosCodeGeneration.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/scicosOptimizingCompiler.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosCodeGeneration.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/scicosOptimizingCompiler.cmo: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosCodeGeneration.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/scicosOptimizingCompiler.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/modelica_compiler/scicosOptimizingCompiler.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosOptimizingCompiler.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/modelica_compiler/scicosOptimizingCompiler.cmx: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosCodeGeneration.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/optimizingCompiler.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/modelica_compiler/scicosOptimizingCompiler.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xMLTree.cmo:
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xMLTree.cmx:
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/linenum.cmo:
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/linenum.cmx:
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/stringParser.cmo:
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/stringParser.cmx:
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/stringLexer.cmo: ./src/xml2modelica/stringParser.cmo
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/stringLexer.cmx: ./src/xml2modelica/stringParser.cmx
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xMLParser.cmo: ./src/xml2modelica/xMLTree.cmo \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xMLParser.cmx: ./src/xml2modelica/xMLTree.cmx \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/modelica_compiler/scicosOptimizingCompiler.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLTree.cmo:
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLTree.cmx:
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/linenum.cmo:
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/linenum.cmx:
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringParser.cmo:
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringParser.cmx:
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringLexer.cmo: ./src/xml2modelica/stringParser.cmo
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/stringLexer.cmx: ./src/xml2modelica/stringParser.cmx
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLParser.cmo: ./src/xml2modelica/xMLTree.cmo \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmo
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLParser.cmx: ./src/xml2modelica/xMLTree.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmx
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xMLLexer.cmo: ./src/xml2modelica/xMLParser.cmo
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xMLLexer.cmx: ./src/xml2modelica/xMLParser.cmx
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/modelicaCodeGenerator.cmo: ./src/xml2modelica/xMLTree.cmo \
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLLexer.cmo: ./src/xml2modelica/xMLParser.cmo
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xMLLexer.cmx: ./src/xml2modelica/xMLParser.cmx
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/modelicaCodeGenerator.cmo: ./src/xml2modelica/xMLTree.cmo \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.cmo ./src/xml2modelica/stringLexer.cmo
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/modelicaCodeGenerator.cmx: ./src/xml2modelica/xMLTree.cmx \
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/modelicaCodeGenerator.cmx: ./src/xml2modelica/xMLTree.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/stringParser.cmx ./src/xml2modelica/stringLexer.cmx
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xML2Modelica.cmo: ./src/xml2modelica/xMLParser.cmo \
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xML2Modelica.cmo: ./src/xml2modelica/xMLParser.cmo \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLLexer.cmo \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.cmo
- @OCAML_TRUE@@XCOS_TRUE@src/xml2modelica/xML2Modelica.cmx: ./src/xml2modelica/xMLParser.cmx \
++@OCAML_TRUE@@XCOS_TRUE@./src/xml2modelica/xML2Modelica.cmx: ./src/xml2modelica/xMLParser.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/xMLLexer.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/xml2modelica/modelicaCodeGenerator.cmx
- @OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/syntax.cmi:
- @OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/parser.cmi: ./src/translator/parsing/syntax.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/lexer.cmi: ./src/translator/parsing/parser.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/linenum.cmi:
- @OCAML_TRUE@@XCOS_TRUE@src/translator/compilation/types.cmi:
- @OCAML_TRUE@@XCOS_TRUE@src/translator/compilation/nameResolve.cmi: \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/instantiation/instantiation.cmi: \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/parser.cmi: ./src/translator/parsing/syntax.cmo
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/nameResolve.cmi: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmo \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmo ./src/translator/parsing/parser.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/instantiation/instantiation.cmi: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmo \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmo ./src/translator/parsing/parser.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/msgDico.cmi:
- @OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/errorDico.cmi: \
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/errorDico.cmi: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/exceptHandler.cmi: \
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/exceptHandler.cmi: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/translation/libraryManager.cmi: \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/translation/codeGeneration.cmi: \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/libraryManager.cmi: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmo ./src/translator/parsing/parser.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/codeGeneration.cmi: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmo \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/translation/versiondate.cmi:
- @OCAML_TRUE@@XCOS_TRUE@src/translator/translation/translator.cmi: \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi \
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/translator.cmi: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmo \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/syntax.cmo: src/translator/parsing/syntax.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/syntax.cmx: src/translator/parsing/syntax.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/parser.cmo: ./src/translator/parsing/syntax.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/parsing/parser.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/parser.cmx: ./src/translator/parsing/syntax.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/parsing/parser.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/lexer.cmo: ./src/translator/parsing/parser.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/parsing/lexer.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/lexer.cmx: ./src/translator/parsing/parser.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/parsing/lexer.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/linenum.cmo: src/translator/parsing/linenum.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/parsing/linenum.cmx: src/translator/parsing/linenum.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/compilation/types.cmo: src/translator/compilation/types.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/compilation/types.cmx: src/translator/compilation/types.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/compilation/nameResolve.cmo: \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/compilation/nameResolve.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/compilation/nameResolve.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/syntax.cmo:
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/syntax.cmx:
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/parser.cmo: ./src/translator/parsing/syntax.cmo \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/parser.cmx: ./src/translator/parsing/syntax.cmx \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/lexer.cmo: ./src/translator/parsing/parser.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/lexer.cmx: ./src/translator/parsing/parser.cmx
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/linenum.cmo:
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/parsing/linenum.cmx:
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/types.cmo:
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/types.cmx:
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/nameResolve.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmo \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmo ./src/translator/parsing/parser.cmi \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/compilation/nameResolve.cmx: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/compilation/nameResolve.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/instantiation/instantiation.cmo: \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmi ./src/translator/parsing/parser.cmi \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/instantiation/instantiation.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmo \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmo ./src/translator/parsing/parser.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/instantiation/instantiation.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/instantiation/instantiation.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/instantiation/instantiation.cmx: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/syntax.cmx ./src/translator/parsing/parser.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/instantiation/instantiation.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/msgDico.cmo: \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/exceptionHandling/msgDico.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/msgDico.cmx: \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/exceptionHandling/msgDico.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/errorDico.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/msgDico.cmo:
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/msgDico.cmx:
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/errorDico.cmo: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/exceptionHandling/errorDico.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/errorDico.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/errorDico.cmx: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/exceptionHandling/errorDico.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/exceptHandler.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/exceptHandler.cmo: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmi \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.cmo \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmo \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/exceptionHandling/exceptHandler.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/exceptionHandling/exceptHandler.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/exceptionHandling/exceptHandler.cmx: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/msgDico.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/linenum.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/exceptionHandling/exceptHandler.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/translation/libraryManager.cmo: \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/translator/parsing/lexer.cmi \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/libraryManager.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmi ./src/modelica_compiler/lexer.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/libraryManager.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/translation/libraryManager.cmx: \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmx ./src/translator/parsing/lexer.cmx \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/libraryManager.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/parsing/parser.cmx ./src/modelica_compiler/lexer.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/libraryManager.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/translation/codeGeneration.cmo: \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmi \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/codeGeneration.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmo \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/codeGeneration.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/translation/codeGeneration.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/codeGeneration.cmx: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/types.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/errorDico.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/codeGeneration.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/translation/versiondate.cmo: \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/versiondate.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/translation/versiondate.cmx: \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/versiondate.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/translation/translator.cmo: \
- @OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.cmi \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/versiondate.cmo:
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/versiondate.cmx:
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/translator.cmo: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.cmo \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmi \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.cmi \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/translator.cmi
- @OCAML_TRUE@@XCOS_TRUE@src/translator/translation/translator.cmx: \
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/translator.cmi
++@OCAML_TRUE@@XCOS_TRUE@./src/translator/translation/translator.cmx: \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/versiondate.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/compilation/nameResolve.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/libraryManager.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/instantiation/instantiation.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/exceptionHandling/exceptHandler.cmx \
 +@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/codeGeneration.cmx \
- @OCAML_TRUE@@XCOS_TRUE@    src/translator/translation/translator.cmi
++@OCAML_TRUE@@XCOS_TRUE@    ./src/translator/translation/translator.cmi
  
  .NOTPARALLEL: libscisundials.la libsciscicos.la
  
@@@ -819,11 -843,11 +843,11 @@@ int OLE_convert_directory(struct OLE_ob
      dir->right_child = get_4byte_value(buf + 0x48);
  
      /** Directory ID (DID) of the root node entry of the RB tree of all
-       ** storage members (if this entry is a storage), else -1.
-       **/
+     ** storage members (if this entry is a storage), else -1.
+     **/
      dir->root = get_4byte_value(buf + 0x4c);
  
 -    memcpy(dir->class, buf + 0x50, 16);
 +    memcpy(dir->_class, buf + 0x50, 16);
      dir->userflags = get_4byte_value(buf + 0x60);
      memcpy(dir->timestamps, buf + 0x64, 16);  /** Actually consists of 2 8 byte stamps **/
  
Simple merge
Simple merge