Update Makefile.am and .depend_ocaml

OCamlPro · Jan 31, 2013 · 7cea04a · 7cea04a
1 parent 4a95e83
commit 7cea04a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/scilab/modules/jit_ocaml/.depend_ocaml b/scilab/modules/jit_ocaml/.depend_ocaml
@@ -46,21 +46,19 @@ src/ocaml/scilabAst2String.cmi : src/ocaml/scilabAst.cmx
 src/ocaml/scilabInterp.cmi : src/ocaml/scilabContext.cmi \
     src/ocaml/scilabAst.cmx
 src/ocaml/scilabCallbacks.cmi :
+src/ocaml/scilabContext.cmo : src/ocaml/scilabContext.cmi
+src/ocaml/scilabContext.cmx : src/ocaml/scilabContext.cmi
 src/ocaml/scilabAst.cmo : src/ocaml/scilabContext.cmi
 src/ocaml/scilabAst.cmx : src/ocaml/scilabContext.cmx
+src/ocaml/scilabPreParser.cmo :
+src/ocaml/scilabPreParser.cmx :
 src/ocaml/scilabAstPrinter.cmo : src/ocaml/scilabContext.cmi \
     src/ocaml/scilabAst.cmx src/ocaml/scilabAstPrinter.cmi
 src/ocaml/scilabAstPrinter.cmx : src/ocaml/scilabContext.cmx \
     src/ocaml/scilabAst.cmx src/ocaml/scilabAstPrinter.cmi
-src/yacc/scilabParser.cmo : src/ocaml/scilabContext.cmi \
-    src/ocaml/scilabAst.cmx src/yacc/scilabParser.cmi
-src/yacc/scilabParser.cmx : src/ocaml/scilabContext.cmx \
-    src/ocaml/scilabAst.cmx src/yacc/scilabParser.cmi
-src/lex/scilabLexer.cmo : src/yacc/scilabParser.cmi
-src/lex/scilabLexer.cmx : src/yacc/scilabParser.cmx
-src/ocaml/scilabParserMain.cmo : src/yacc/scilabParser.cmi \
-    src/lex/scilabLexer.cmx src/ocaml/scilabAstPrinter.cmi \
-    src/ocaml/scilabAst.cmx
-src/ocaml/scilabParserMain.cmx : src/yacc/scilabParser.cmx \
-    src/lex/scilabLexer.cmx src/ocaml/scilabAstPrinter.cmx \
-    src/ocaml/scilabAst.cmx
+src/ocaml/scilabParserMain.cmo : src/ocaml/scilabUtils.cmx \
+    src/ocaml/scilabPrettyPrinter.cmx src/ocaml/scilabPreParser.cmx \
+    src/ocaml/scilabAstPrinter.cmi src/ocaml/scilabAst.cmx
+src/ocaml/scilabParserMain.cmx : src/ocaml/scilabUtils.cmx \
+    src/ocaml/scilabPrettyPrinter.cmx src/ocaml/scilabPreParser.cmx \
+    src/ocaml/scilabAstPrinter.cmx src/ocaml/scilabAst.cmx
diff --git a/scilab/modules/jit_ocaml/Makefile.am b/scilab/modules/jit_ocaml/Makefile.am
@@ -127,7 +127,10 @@ OCAML_MLIS = \
 OCAML_PARSER_MLS = \
 	src/ocaml/scilabContext.ml \
 	src/ocaml/scilabAst.ml \
+	src/ocaml/scilabPrettyPrinter.ml \
+	src/ocaml/scilabPreParser.ml \
 	src/ocaml/scilabAstPrinter.ml \
+	src/ocaml/scilabUtils.ml \
 	src/yacc/scilabParser.ml \
 	src/lex/scilabLexer.ml \
 	src/ocaml/scilabParserMain.ml
@@ -161,7 +164,7 @@ CLEANFILES= \
 
 
 scilab_parser : $(OCAML_PARSER_CMXS)
-	$(OCAMLOPT) -o scilab_parser $(OCAML_PARSER_CMXS)
+	$(OCAMLOPT) str.cmxa -o scilab_parser $(OCAML_PARSER_CMXS)
 
 
 ocamlcode.o: $(OCAML_CMXS)