summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-05-03 11:10:34 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-05-03 11:10:34 +0200
commit540065058c714c23db5a55000a344668df5b6f80 (patch)
treec877118f12de722da3b092eae7b0fc12860aa7ff /scilab/modules/scicos
parent911aadfd077077acd0b0046c6aacddeddd509b25 (diff)
downloadscilab-540065058c714c23db5a55000a344668df5b6f80.zip
scilab-540065058c714c23db5a55000a344668df5b6f80.tar.gz
* bug 6643 fixed - --without-gui failed to disable Ocaml build (A xcos
dependency) Change-Id: I5445a36997e528c92e387d985bd4d5f915184718
Diffstat (limited to 'scilab/modules/scicos')
-rw-r--r--scilab/modules/scicos/Makefile.in314
-rw-r--r--scilab/modules/scicos/Makefile.modelica.am2
2 files changed, 164 insertions, 152 deletions
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index 4cc1152..a1d5e5f 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -81,10 +81,10 @@ DIST_COMMON = $(am__libsciscicos_la_include_HEADERS_DIST) \
81 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ 81 $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
82 $(srcdir)/Makefile.modelica.am $(top_srcdir)/Makefile.incl.am 82 $(srcdir)/Makefile.modelica.am $(top_srcdir)/Makefile.incl.am
83@NEED_JAVA_TRUE@am__append_1 = java 83@NEED_JAVA_TRUE@am__append_1 = java
84@OCAML_TRUE@bin_PROGRAMS = $(am__EXEEXT_1) 84@OCAML_TRUE@@SCICOS_TRUE@bin_PROGRAMS = $(am__EXEEXT_1)
85 85
86########## COMMON 86########## COMMON
87@OCAML_TRUE@am__append_2 = .ml .mli .mll .mly .cmo .cmi .cmx 87@OCAML_TRUE@@SCICOS_TRUE@am__append_2 = .ml .mli .mll .mly .cmo .cmi .cmx
88subdir = modules/scicos 88subdir = modules/scicos
89ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 89ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
90am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \ 90am__aclocal_m4_deps = $(top_srcdir)/m4/docbook.m4 \
@@ -306,8 +306,9 @@ libscisundials_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
306 $(libscisundials_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ 306 $(libscisundials_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
307 -o $@ 307 -o $@
308@SCICOS_TRUE@am_libscisundials_la_rpath = -rpath $(pkglibdir) 308@SCICOS_TRUE@am_libscisundials_la_rpath = -rpath $(pkglibdir)
309@OCAML_TRUE@am__EXEEXT_1 = modelicac$(EXEEXT) XML2Modelica$(EXEEXT) \ 309@OCAML_TRUE@@SCICOS_TRUE@am__EXEEXT_1 = modelicac$(EXEEXT) \
310@OCAML_TRUE@ modelicat$(EXEEXT) 310@OCAML_TRUE@@SCICOS_TRUE@ XML2Modelica$(EXEEXT) \
311@OCAML_TRUE@@SCICOS_TRUE@ modelicat$(EXEEXT)
311PROGRAMS = $(bin_PROGRAMS) 312PROGRAMS = $(bin_PROGRAMS)
312am__XML2Modelica_SOURCES_DIST = $(srcdir)/src/xml2modelica/xMLTree.ml \ 313am__XML2Modelica_SOURCES_DIST = $(srcdir)/src/xml2modelica/xMLTree.ml \
313 $(srcdir)/src/xml2modelica/linenum.ml \ 314 $(srcdir)/src/xml2modelica/linenum.ml \
@@ -318,7 +319,7 @@ am__XML2Modelica_SOURCES_DIST = $(srcdir)/src/xml2modelica/xMLTree.ml \
318 $(srcdir)/src/xml2modelica/modelicaCodeGenerator.ml \ 319 $(srcdir)/src/xml2modelica/modelicaCodeGenerator.ml \
319 $(srcdir)/src/xml2modelica/xML2Modelica.ml 320 $(srcdir)/src/xml2modelica/xML2Modelica.ml
320am__objects_7 = 321am__objects_7 =
321@OCAML_TRUE@am_XML2Modelica_OBJECTS = $(am__objects_7) 322@OCAML_TRUE@@SCICOS_TRUE@am_XML2Modelica_OBJECTS = $(am__objects_7)
322XML2Modelica_OBJECTS = $(am_XML2Modelica_OBJECTS) 323XML2Modelica_OBJECTS = $(am_XML2Modelica_OBJECTS)
323XML2Modelica_LDADD = $(LDADD) 324XML2Modelica_LDADD = $(LDADD)
324am__modelicac_SOURCES_DIST = \ 325am__modelicac_SOURCES_DIST = \
@@ -340,7 +341,7 @@ am__modelicac_SOURCES_DIST = \
340 $(srcdir)/src/modelica_compiler/optimizingCompiler.ml \ 341 $(srcdir)/src/modelica_compiler/optimizingCompiler.ml \
341 $(srcdir)/src/modelica_compiler/scicosCodeGeneration.ml \ 342 $(srcdir)/src/modelica_compiler/scicosCodeGeneration.ml \
342 $(srcdir)/src/modelica_compiler/scicosOptimizingCompiler.ml 343 $(srcdir)/src/modelica_compiler/scicosOptimizingCompiler.ml
343@OCAML_TRUE@am_modelicac_OBJECTS = $(am__objects_7) 344@OCAML_TRUE@@SCICOS_TRUE@am_modelicac_OBJECTS = $(am__objects_7)
344modelicac_OBJECTS = $(am_modelicac_OBJECTS) 345modelicac_OBJECTS = $(am_modelicac_OBJECTS)
345modelicac_LDADD = $(LDADD) 346modelicac_LDADD = $(LDADD)
346am__modelicat_SOURCES_DIST = \ 347am__modelicat_SOURCES_DIST = \
@@ -354,7 +355,7 @@ am__modelicat_SOURCES_DIST = \
354 $(srcdir)/src/translator/translation/codeGeneration.ml \ 355 $(srcdir)/src/translator/translation/codeGeneration.ml \
355 $(srcdir)/src/translator/translation/versiondate.ml \ 356 $(srcdir)/src/translator/translation/versiondate.ml \
356 $(srcdir)/src/translator/translation/translator.ml 357 $(srcdir)/src/translator/translation/translator.ml
357@OCAML_TRUE@am_modelicat_OBJECTS = $(am__objects_7) 358@OCAML_TRUE@@SCICOS_TRUE@am_modelicat_OBJECTS = $(am__objects_7)
358modelicat_OBJECTS = $(am_modelicat_OBJECTS) 359modelicat_OBJECTS = $(am_modelicat_OBJECTS)
359modelicat_LDADD = $(LDADD) 360modelicat_LDADD = $(LDADD)
360DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes 361DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
@@ -705,105 +706,105 @@ JARMASK = *.jar
705HELP_CHAPTERDIR = help/ 706HELP_CHAPTERDIR = help/
706HELP_CHAPTERFILE = addchapter.sce 707HELP_CHAPTERFILE = addchapter.sce
707HELP_CHAPTERLANG = en_US fr_FR pt_BR 708HELP_CHAPTERLANG = en_US fr_FR pt_BR
708@OCAML_TRUE@TARGET = modelicac XML2Modelica modelicat 709@OCAML_TRUE@@SCICOS_TRUE@TARGET = modelicac XML2Modelica modelicat
709@OCAML_TRUE@BASE_PATH = $(srcdir)/src/ 710@OCAML_TRUE@@SCICOS_TRUE@BASE_PATH = $(srcdir)/src/
710@OCAML_TRUE@OCAMLLIBS = nums.cma 711@OCAML_TRUE@@SCICOS_TRUE@OCAMLLIBS = nums.cma
711 712
712### XML2Modelica 713### XML2Modelica
713@OCAML_TRUE@XML2Modelica_SOURCES = $(MLS_XML2Modelica) 714@OCAML_TRUE@@SCICOS_TRUE@XML2Modelica_SOURCES = $(MLS_XML2Modelica)
714@OCAML_TRUE@MLS_XML2Modelica = $(srcdir)/src/xml2modelica/xMLTree.ml $(srcdir)/src/xml2modelica/linenum.ml $(srcdir)/src/xml2modelica/stringParser.ml $(srcdir)/src/xml2modelica/stringLexer.ml $(srcdir)/src/xml2modelica/xMLParser.ml $(srcdir)/src/xml2modelica/xMLLexer.ml\ 715@OCAML_TRUE@@SCICOS_TRUE@MLS_XML2Modelica = $(srcdir)/src/xml2modelica/xMLTree.ml $(srcdir)/src/xml2modelica/linenum.ml $(srcdir)/src/xml2modelica/stringParser.ml $(srcdir)/src/xml2modelica/stringLexer.ml $(srcdir)/src/xml2modelica/xMLParser.ml $(srcdir)/src/xml2modelica/xMLLexer.ml\
715@OCAML_TRUE@ $(srcdir)/src/xml2modelica/modelicaCodeGenerator.ml $(srcdir)/src/xml2modelica/xML2Modelica.ml 716@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/xml2modelica/modelicaCodeGenerator.ml $(srcdir)/src/xml2modelica/xML2Modelica.ml
716 717
717@OCAML_TRUE@BASE_PATH_XML2Modelica = $(srcdir)/src/xml2modelica 718@OCAML_TRUE@@SCICOS_TRUE@BASE_PATH_XML2Modelica = $(srcdir)/src/xml2modelica
718 719
719### Translator 720### Translator
720@OCAML_TRUE@modelicat_SOURCES = $(MLS_modelicat) 721@OCAML_TRUE@@SCICOS_TRUE@modelicat_SOURCES = $(MLS_modelicat)
721@OCAML_TRUE@MLS_modelicat = $(srcdir)/src/translator/compilation/types.ml \ 722@OCAML_TRUE@@SCICOS_TRUE@MLS_modelicat = $(srcdir)/src/translator/compilation/types.ml \
722@OCAML_TRUE@ $(srcdir)/src/translator/compilation/nameResolve.ml \ 723@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/translator/compilation/nameResolve.ml \
723@OCAML_TRUE@ $(srcdir)/src/translator/instantiation/instantiation.ml \ 724@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/translator/instantiation/instantiation.ml \
724@OCAML_TRUE@ $(srcdir)/src/translator/exceptionHandling/msgDico.ml \ 725@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/translator/exceptionHandling/msgDico.ml \
725@OCAML_TRUE@ $(srcdir)/src/translator/exceptionHandling/errorDico.ml \ 726@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/translator/exceptionHandling/errorDico.ml \
726@OCAML_TRUE@ $(srcdir)/src/translator/exceptionHandling/exceptHandler.ml \ 727@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/translator/exceptionHandling/exceptHandler.ml \
727@OCAML_TRUE@ $(srcdir)/src/translator/translation/libraryManager.ml \ 728@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/translator/translation/libraryManager.ml \
728@OCAML_TRUE@ $(srcdir)/src/translator/translation/codeGeneration.ml \ 729@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/translator/translation/codeGeneration.ml \
729@OCAML_TRUE@ $(srcdir)/src/translator/translation/versiondate.ml \ 730@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/translator/translation/versiondate.ml \
730@OCAML_TRUE@ $(srcdir)/src/translator/translation/translator.ml 731@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/translator/translation/translator.ml
731 732
732@OCAML_TRUE@MLS_SPECIFIC_PRE_modelicat = $(srcdir)/src/translator/parsing/syntax.ml \ 733@OCAML_TRUE@@SCICOS_TRUE@MLS_SPECIFIC_PRE_modelicat = $(srcdir)/src/translator/parsing/syntax.ml \
733@OCAML_TRUE@$(srcdir)/src/translator/parsing/parser.ml \ 734@OCAML_TRUE@@SCICOS_TRUE@$(srcdir)/src/translator/parsing/parser.ml \
734@OCAML_TRUE@$(srcdir)/src/translator/parsing/lexer.ml \ 735@OCAML_TRUE@@SCICOS_TRUE@$(srcdir)/src/translator/parsing/lexer.ml \
735@OCAML_TRUE@$(srcdir)/src/translator/parsing/linenum.ml 736@OCAML_TRUE@@SCICOS_TRUE@$(srcdir)/src/translator/parsing/linenum.ml
736 737
737@OCAML_TRUE@PARSER_SRC_modelicat = $(srcdir)/src/translator/parsing/parser.mly 738@OCAML_TRUE@@SCICOS_TRUE@PARSER_SRC_modelicat = $(srcdir)/src/translator/parsing/parser.mly
738@OCAML_TRUE@LEXER_SRC_modelicat = $(srcdir)/src/translator/parsing/lexer.mll 739@OCAML_TRUE@@SCICOS_TRUE@LEXER_SRC_modelicat = $(srcdir)/src/translator/parsing/lexer.mll
739@OCAML_TRUE@INCLUDE_modelicat = -I $(srcdir)/src/translator/compilation \ 740@OCAML_TRUE@@SCICOS_TRUE@INCLUDE_modelicat = -I $(srcdir)/src/translator/compilation \
740@OCAML_TRUE@-I $(srcdir)/src/translator/exceptionHandling \ 741@OCAML_TRUE@@SCICOS_TRUE@-I $(srcdir)/src/translator/exceptionHandling \
741@OCAML_TRUE@-I $(srcdir)/src/translator/parsing \ 742@OCAML_TRUE@@SCICOS_TRUE@-I $(srcdir)/src/translator/parsing \
742@OCAML_TRUE@-I $(srcdir)/src/translator/instantiation \ 743@OCAML_TRUE@@SCICOS_TRUE@-I $(srcdir)/src/translator/instantiation \
743@OCAML_TRUE@-I $(srcdir)/src/translator/translation 744@OCAML_TRUE@@SCICOS_TRUE@-I $(srcdir)/src/translator/translation
744 745
745 746
746### Modelicac 747### Modelicac
747@OCAML_TRUE@modelicac_SOURCES = $(MLS) 748@OCAML_TRUE@@SCICOS_TRUE@modelicac_SOURCES = $(MLS)
748@OCAML_TRUE@MLS = $(srcdir)/src/modelica_compiler/parseTree.ml \ 749@OCAML_TRUE@@SCICOS_TRUE@MLS = $(srcdir)/src/modelica_compiler/parseTree.ml \
749@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/linenum.ml \ 750@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/linenum.ml \
750@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/parser.ml \ 751@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/parser.ml \
751@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/lexer.ml \ 752@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/lexer.ml \
752@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/precompilation.ml \ 753@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/precompilation.ml \
753@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/compilation.ml \ 754@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/compilation.ml \
754@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/instantiation.ml \ 755@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/instantiation.ml \
755@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/graphNodeSet.ml \ 756@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/graphNodeSet.ml \
756@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/symbolicExpression.ml \ 757@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/symbolicExpression.ml \
757@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/squareSparseMatrix.ml \ 758@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/squareSparseMatrix.ml \
758@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/bipartiteGraph.ml \ 759@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/bipartiteGraph.ml \
759@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/hungarianMethod.ml \ 760@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/hungarianMethod.ml \
760@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/causalityGraph.ml \ 761@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/causalityGraph.ml \
761@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/optimization.ml \ 762@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/optimization.ml \
762@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/xMLCodeGeneration.ml \ 763@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/xMLCodeGeneration.ml \
763@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/optimizingCompiler.ml \ 764@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/optimizingCompiler.ml \
764@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/scicosCodeGeneration.ml \ 765@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/scicosCodeGeneration.ml \
765@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/scicosOptimizingCompiler.ml 766@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/scicosOptimizingCompiler.ml
766 767
767 768
768# This is a basic copy of MLS with some elements removed 769# This is a basic copy of MLS with some elements removed
769@OCAML_TRUE@MLIS = $(srcdir)/src/modelica_compiler/parseTree.mli \ 770@OCAML_TRUE@@SCICOS_TRUE@MLIS = $(srcdir)/src/modelica_compiler/parseTree.mli \
770@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/precompilation.mli \ 771@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/precompilation.mli \
771@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/compilation.mli \ 772@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/compilation.mli \
772@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/instantiation.mli \ 773@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/instantiation.mli \
773@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/graphNodeSet.mli \ 774@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/graphNodeSet.mli \
774@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/symbolicExpression.mli \ 775@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/symbolicExpression.mli \
775@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/squareSparseMatrix.mli \ 776@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/squareSparseMatrix.mli \
776@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/bipartiteGraph.mli \ 777@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/bipartiteGraph.mli \
777@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/hungarianMethod.mli \ 778@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/hungarianMethod.mli \
778@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/causalityGraph.mli \ 779@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/causalityGraph.mli \
779@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/optimization.mli \ 780@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/optimization.mli \
780@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/xMLCodeGeneration.mli \ 781@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/xMLCodeGeneration.mli \
781@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/optimizingCompiler.mli \ 782@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/optimizingCompiler.mli \
782@OCAML_TRUE@ $(srcdir)/src/modelica_compiler/scicosCodeGeneration.mli 783@OCAML_TRUE@@SCICOS_TRUE@ $(srcdir)/src/modelica_compiler/scicosCodeGeneration.mli
783 784
784@OCAML_TRUE@PARSER_SRC = $(srcdir)/src/modelica_compiler/parser.mly 785@OCAML_TRUE@@SCICOS_TRUE@PARSER_SRC = $(srcdir)/src/modelica_compiler/parser.mly
785@OCAML_TRUE@LEXER_SRC = $(srcdir)/src/modelica_compiler/lexer.mll 786@OCAML_TRUE@@SCICOS_TRUE@LEXER_SRC = $(srcdir)/src/modelica_compiler/lexer.mll
786@OCAML_TRUE@BASE_PATH_MODELICAC = $(srcdir)/src/modelica_compiler 787@OCAML_TRUE@@SCICOS_TRUE@BASE_PATH_MODELICAC = $(srcdir)/src/modelica_compiler
787@OCAML_TRUE@INCLUDE = -I $(BASE_PATH_MODELICAC) -I $(BASE_PATH_XML2Modelica) 788@OCAML_TRUE@@SCICOS_TRUE@INCLUDE = -I $(BASE_PATH_MODELICAC) -I $(BASE_PATH_XML2Modelica)
788@OCAML_TRUE@CLEANFILES = $(BASE_PATH)/*/*.cmi \ 789@OCAML_TRUE@@SCICOS_TRUE@CLEANFILES = $(BASE_PATH)/*/*.cmi \
789@OCAML_TRUE@ $(BASE_PATH)/*/*.o \ 790@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/*/*.o \
790@OCAML_TRUE@ $(BASE_PATH)/*/*.cmo \ 791@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/*/*.cmo \
791@OCAML_TRUE@ $(BASE_PATH)/*/*.cm[aiox] \ 792@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/*/*.cm[aiox] \
792@OCAML_TRUE@ $(BASE_PATH)/*/parser.mli \ 793@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/*/parser.mli \
793@OCAML_TRUE@ $(BASE_PATH)/*/lexer.mli \ 794@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/*/lexer.mli \
794@OCAML_TRUE@ $(BASE_PATH)/*/parser.ml \ 795@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/*/parser.ml \
795@OCAML_TRUE@ $(BASE_PATH)/*/lexer.ml \ 796@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/*/lexer.ml \
796@OCAML_TRUE@ $(BASE_PATH)/translator/*/*.cmi \ 797@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/translator/*/*.cmi \
797@OCAML_TRUE@ $(BASE_PATH)/translator/*/*.o \ 798@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/translator/*/*.o \
798@OCAML_TRUE@ $(BASE_PATH)/translator/*/*.a \ 799@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/translator/*/*.a \
799@OCAML_TRUE@ $(BASE_PATH)/translator/*/*.cmo \ 800@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/translator/*/*.cmo \
800@OCAML_TRUE@ $(BASE_PATH)/translator/*/*.cmxa \ 801@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/translator/*/*.cmxa \
801@OCAML_TRUE@ $(BASE_PATH)/translator/*/*.cm[aiox] \ 802@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/translator/*/*.cm[aiox] \
802@OCAML_TRUE@ $(BASE_PATH)/translator/*/parser.mli \ 803@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/translator/*/parser.mli \
803@OCAML_TRUE@ $(BASE_PATH)/translator/*/lexer.mli \ 804@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/translator/*/lexer.mli \
804@OCAML_TRUE@ $(BASE_PATH)/translator/*/parser.ml \ 805@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/translator/*/parser.ml \
805@OCAML_TRUE@ $(BASE_PATH)/translator/*/lexer.ml \ 806@OCAML_TRUE@@SCICOS_TRUE@ $(BASE_PATH)/translator/*/lexer.ml \
806@OCAML_TRUE@ $(TARGET) 807@OCAML_TRUE@@SCICOS_TRUE@ $(TARGET)
807 808
808@SCICOS_FALSE@pkglib_LTLIBRARIES = libsciscicos.la 809@SCICOS_FALSE@pkglib_LTLIBRARIES = libsciscicos.la
809 810
@@ -1143,12 +1144,21 @@ clean-binPROGRAMS:
1143@OCAML_FALSE@XML2Modelica$(EXEEXT): $(XML2Modelica_OBJECTS) $(XML2Modelica_DEPENDENCIES) 1144@OCAML_FALSE@XML2Modelica$(EXEEXT): $(XML2Modelica_OBJECTS) $(XML2Modelica_DEPENDENCIES)
1144@OCAML_FALSE@ @rm -f XML2Modelica$(EXEEXT) 1145@OCAML_FALSE@ @rm -f XML2Modelica$(EXEEXT)
1145@OCAML_FALSE@ $(LINK) $(XML2Modelica_OBJECTS) $(XML2Modelica_LDADD) $(LIBS) 1146@OCAML_FALSE@ $(LINK) $(XML2Modelica_OBJECTS) $(XML2Modelica_LDADD) $(LIBS)
1147@SCICOS_FALSE@XML2Modelica$(EXEEXT): $(XML2Modelica_OBJECTS) $(XML2Modelica_DEPENDENCIES)
1148@SCICOS_FALSE@ @rm -f XML2Modelica$(EXEEXT)
1149@SCICOS_FALSE@ $(LINK) $(XML2Modelica_OBJECTS) $(XML2Modelica_LDADD) $(LIBS)
1146@OCAML_FALSE@modelicac$(EXEEXT): $(modelicac_OBJECTS) $(modelicac_DEPENDENCIES) 1150@OCAML_FALSE@modelicac$(EXEEXT): $(modelicac_OBJECTS) $(modelicac_DEPENDENCIES)
1147@OCAML_FALSE@ @rm -f modelicac$(EXEEXT) 1151@OCAML_FALSE@ @rm -f modelicac$(EXEEXT)
1148@OCAML_FALSE@ $(LINK) $(modelicac_OBJECTS) $(modelicac_LDADD) $(LIBS) 1152@OCAML_FALSE@ $(LINK) $(modelicac_OBJECTS) $(modelicac_LDADD) $(LIBS)
1153@SCICOS_FALSE@modelicac$(EXEEXT): $(modelicac_OBJECTS) $(modelicac_DEPENDENCIES)
1154@SCICOS_FALSE@ @rm -f modelicac$(EXEEXT)
1155@SCICOS_FALSE@ $(LINK) $(modelicac_OBJECTS) $(modelicac_LDADD) $(LIBS)
1149@OCAML_FALSE@modelicat$(EXEEXT): $(modelicat_OBJECTS) $(modelicat_DEPENDENCIES) 1156@OCAML_FALSE@modelicat$(EXEEXT): $(modelicat_OBJECTS) $(modelicat_DEPENDENCIES)
1150@OCAML_FALSE@ @rm -f modelicat$(EXEEXT) 1157@OCAML_FALSE@ @rm -f modelicat$(EXEEXT)
1151@OCAML_FALSE@ $(LINK) $(modelicat_OBJECTS) $(modelicat_LDADD) $(LIBS) 1158@OCAML_FALSE@ $(LINK) $(modelicat_OBJECTS) $(modelicat_LDADD) $(LIBS)
1159@SCICOS_FALSE@modelicat$(EXEEXT): $(modelicat_OBJECTS) $(modelicat_DEPENDENCIES)
1160@SCICOS_FALSE@ @rm -f modelicat$(EXEEXT)
1161@SCICOS_FALSE@ $(LINK) $(modelicat_OBJECTS) $(modelicat_LDADD) $(LIBS)
1152 1162
1153mostlyclean-compile: 1163mostlyclean-compile:
1154 -rm -f *.$(OBJEXT) 1164 -rm -f *.$(OBJEXT)
@@ -2387,76 +2397,76 @@ distclean-local:
2387 2397
2388# @TODO check how to avoid the rebuild of the parser/lexer 2398# @TODO check how to avoid the rebuild of the parser/lexer
2389 2399
2390@OCAML_TRUE@.ml.cmo: 2400@OCAML_TRUE@@SCICOS_TRUE@.ml.cmo:
2391@OCAML_TRUE@ @if echo "$<"|grep src/translator; then \ 2401@OCAML_TRUE@@SCICOS_TRUE@ @if echo "$<"|grep src/translator; then \
2392@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE_modelicat) -c $<; \ 2402@OCAML_TRUE@@SCICOS_TRUE@ echo $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
2393@OCAML_TRUE@ $(OCAMLC) $(INCLUDE_modelicat) -c $<; \ 2403@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
2394@OCAML_TRUE@ else \ 2404@OCAML_TRUE@@SCICOS_TRUE@ else \
2395@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE) -c $<; \ 2405@OCAML_TRUE@@SCICOS_TRUE@ echo $(OCAMLC) $(INCLUDE) -c $<; \
2396@OCAML_TRUE@ $(OCAMLC) $(INCLUDE) -c $<; \ 2406@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLC) $(INCLUDE) -c $<; \
2397@OCAML_TRUE@ fi 2407@OCAML_TRUE@@SCICOS_TRUE@ fi
2398 2408
2399@OCAML_TRUE@.ml.cmx: 2409@OCAML_TRUE@@SCICOS_TRUE@.ml.cmx:
2400@OCAML_TRUE@ @if echo "$<"|grep src/translator; then \ 2410@OCAML_TRUE@@SCICOS_TRUE@ @if echo "$<"|grep src/translator; then \
2401@OCAML_TRUE@ echo $(OCAMLOPT) $(INCLUDE_modelicat) -c $<; \ 2411@OCAML_TRUE@@SCICOS_TRUE@ echo $(OCAMLOPT) $(INCLUDE_modelicat) -c $<; \
2402@OCAML_TRUE@ $(OCAMLOPT) $(INCLUDE_modelicat) -c $<; \ 2412@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLOPT) $(INCLUDE_modelicat) -c $<; \
2403@OCAML_TRUE@ else \ 2413@OCAML_TRUE@@SCICOS_TRUE@ else \
2404@OCAML_TRUE@ echo $(OCAMLOPT) $(INCLUDE) -c $<; \ 2414@OCAML_TRUE@@SCICOS_TRUE@ echo $(OCAMLOPT) $(INCLUDE) -c $<; \
2405@OCAML_TRUE@ $(OCAMLOPT) $(INCLUDE) -c $<; \ 2415@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLOPT) $(INCLUDE) -c $<; \
2406@OCAML_TRUE@ fi 2416@OCAML_TRUE@@SCICOS_TRUE@ fi
2407 2417
2408@OCAML_TRUE@.mli.cmi: 2418@OCAML_TRUE@@SCICOS_TRUE@.mli.cmi:
2409@OCAML_TRUE@ @if echo "$<"|grep src/translator; then \ 2419@OCAML_TRUE@@SCICOS_TRUE@ @if echo "$<"|grep src/translator; then \
2410@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE_modelicat) -c $<; \ 2420@OCAML_TRUE@@SCICOS_TRUE@ echo $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
2411@OCAML_TRUE@ $(OCAMLC) $(INCLUDE_modelicat) -c $<; \ 2421@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
2412@OCAML_TRUE@ else \ 2422@OCAML_TRUE@@SCICOS_TRUE@ else \
2413@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE) -c $<; \ 2423@OCAML_TRUE@@SCICOS_TRUE@ echo $(OCAMLC) $(INCLUDE) -c $<; \
2414@OCAML_TRUE@ $(OCAMLC) $(INCLUDE) -c $<; \ 2424@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLC) $(INCLUDE) -c $<; \
2415@OCAML_TRUE@ fi 2425@OCAML_TRUE@@SCICOS_TRUE@ fi
2416 2426
2417@OCAML_TRUE@.ml.mli: 2427@OCAML_TRUE@@SCICOS_TRUE@.ml.mli:
2418@OCAML_TRUE@ @if echo "$<"|grep src/translator; then \ 2428@OCAML_TRUE@@SCICOS_TRUE@ @if echo "$<"|grep src/translator; then \
2419@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE_modelicat) -c $<; \ 2429@OCAML_TRUE@@SCICOS_TRUE@ echo $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
2420@OCAML_TRUE@ $(OCAMLC) $(INCLUDE_modelicat) -c $<; \ 2430@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
2421@OCAML_TRUE@ else \ 2431@OCAML_TRUE@@SCICOS_TRUE@ else \
2422@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE) -c $<; \ 2432@OCAML_TRUE@@SCICOS_TRUE@ echo $(OCAMLC) $(INCLUDE) -c $<; \
2423@OCAML_TRUE@ $(OCAMLC) $(INCLUDE) -c $<; \ 2433@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLC) $(INCLUDE) -c $<; \
2424@OCAML_TRUE@ fi 2434@OCAML_TRUE@@SCICOS_TRUE@ fi
2425 2435
2426@OCAML_TRUE@.mll.ml: 2436@OCAML_TRUE@@SCICOS_TRUE@.mll.ml:
2427@OCAML_TRUE@ $(OCAMLLEX) $< 2437@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLLEX) $<
2428 2438
2429@OCAML_TRUE@.mly.ml: 2439@OCAML_TRUE@@SCICOS_TRUE@.mly.ml:
2430@OCAML_TRUE@ $(OCAMLYACC) $< 2440@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLYACC) $<
2431 2441
2432# call the ocaml/Yacc 2442# call the ocaml/Yacc
2433@OCAML_TRUE@generate-parser: $(PARSER_SRC) 2443@OCAML_TRUE@@SCICOS_TRUE@generate-parser: $(PARSER_SRC)
2434@OCAML_TRUE@ $(OCAMLYACC) $(<) 2444@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLYACC) $(<)
2435@OCAML_TRUE@ $(RM) -f $(<:.mly=.mli) 2445@OCAML_TRUE@@SCICOS_TRUE@ $(RM) -f $(<:.mly=.mli)
2436 2446
2437# Call the lexer 2447# Call the lexer
2438@OCAML_TRUE@generate-lexer: $(LEXER_SRC) 2448@OCAML_TRUE@@SCICOS_TRUE@generate-lexer: $(LEXER_SRC)
2439@OCAML_TRUE@ $(OCAMLLEX) $(<) 2449@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLLEX) $(<)
2440 2450
2441# Build the binaries 2451# Build the binaries
2442 2452
2443@OCAML_TRUE@modelicac:generate-parser generate-lexer $(MLIS:.mli=.cmi) $(MLS:.ml=.cmo) $(MLS:.ml=.cmx) 2453@OCAML_TRUE@@SCICOS_TRUE@modelicac:generate-parser generate-lexer $(MLIS:.mli=.cmi) $(MLS:.ml=.cmo) $(MLS:.ml=.cmx)
2444@OCAML_TRUE@ $(OCAMLOPT) -o modelicac $(INCLUDE) $(OCAMLLIBS:.cma=.cmxa) $(MLS:.ml=.cmx) 2454@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLOPT) -o modelicac $(INCLUDE) $(OCAMLLIBS:.cma=.cmxa) $(MLS:.ml=.cmx)
2445 2455
2446@OCAML_TRUE@XML2Modelica: $(MLS_XML2Modelica:.ml=.cmo) $(MLS_XML2Modelica:.ml=.cmx) 2456@OCAML_TRUE@@SCICOS_TRUE@XML2Modelica: $(MLS_XML2Modelica:.ml=.cmo) $(MLS_XML2Modelica:.ml=.cmx)
2447@OCAML_TRUE@ $(OCAMLOPT) -o XML2Modelica $(INCLUDE) $(OCAMLLIBS:.cma=.cmxa) $(MLS_XML2Modelica:.ml=.cmx) 2457@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLOPT) -o XML2Modelica $(INCLUDE) $(OCAMLLIBS:.cma=.cmxa) $(MLS_XML2Modelica:.ml=.cmx)
2448 2458
2449# call the ocaml/Yacc 2459# call the ocaml/Yacc
2450@OCAML_TRUE@generate-parser_modelicat: $(PARSER_SRC_modelicat) 2460@OCAML_TRUE@@SCICOS_TRUE@generate-parser_modelicat: $(PARSER_SRC_modelicat)
2451@OCAML_TRUE@ $(OCAMLYACC) $(<) 2461@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLYACC) $(<)
2452@OCAML_TRUE@ $(RM) -f $(<:.mly=.mli) 2462@OCAML_TRUE@@SCICOS_TRUE@ $(RM) -f $(<:.mly=.mli)
2453 2463
2454# Call the lexer 2464# Call the lexer
2455@OCAML_TRUE@generate-lexer_modelicat: $(LEXER_SRC_modelicat) 2465@OCAML_TRUE@@SCICOS_TRUE@generate-lexer_modelicat: $(LEXER_SRC_modelicat)
2456@OCAML_TRUE@ $(OCAMLLEX) $(<) 2466@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLLEX) $(<)
2457 2467
2458@OCAML_TRUE@modelicat: generate-parser_modelicat generate-lexer_modelicat $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmo) $(MLS_modelicat:.ml=.mli) $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmx) $(MLS_modelicat:.ml=.cmo) $(MLS_modelicat:.ml=.cmx) 2468@OCAML_TRUE@@SCICOS_TRUE@modelicat: generate-parser_modelicat generate-lexer_modelicat $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmo) $(MLS_modelicat:.ml=.mli) $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmx) $(MLS_modelicat:.ml=.cmo) $(MLS_modelicat:.ml=.cmx)
2459@OCAML_TRUE@ $(OCAMLOPT) -o modelicat $(INCLUDE_modelicat) $(OCAMLLIBS:.cma=.cmxa) $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmx) $(MLS_modelicat:.ml=.cmx) 2469@OCAML_TRUE@@SCICOS_TRUE@ $(OCAMLOPT) -o modelicat $(INCLUDE_modelicat) $(OCAMLLIBS:.cma=.cmxa) $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmx) $(MLS_modelicat:.ml=.cmx)
2460 2470
2461.NOTPARALLEL: libscisundials.la libsciscicos.la 2471.NOTPARALLEL: libscisundials.la libsciscicos.la
2462 2472
diff --git a/scilab/modules/scicos/Makefile.modelica.am b/scilab/modules/scicos/Makefile.modelica.am
index 0ac2e45..0b4654e 100644
--- a/scilab/modules/scicos/Makefile.modelica.am
+++ b/scilab/modules/scicos/Makefile.modelica.am
@@ -13,6 +13,7 @@
13 13
14######### Common Modelica elements ############# 14######### Common Modelica elements #############
15 15
16if SCICOS
16if OCAML 17if OCAML
17TARGET = modelicac XML2Modelica modelicat 18TARGET = modelicac XML2Modelica modelicat
18BASE_PATH = $(srcdir)/src/ 19BASE_PATH = $(srcdir)/src/
@@ -210,3 +211,4 @@ CLEANFILES = $(BASE_PATH)/*/*.cmi \
210 $(TARGET) 211 $(TARGET)
211 212
212endif # OCAML 213endif # OCAML
214endif # SCICOS \ No newline at end of file