summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-04-07 16:04:06 +0200
committerAllan CORNET <allan.cornet@scilab.org>2010-04-07 16:04:06 +0200
commitd80f66919fb78925c570ab85797af66ec443316f (patch)
treeaf7513ca972aeb490b630e5a9562100d9a958600 /scilab/modules/scicos
parentc173fdc8e1c623d4f0be9f380c3e4c5ca8a5b707 (diff)
downloadscilab-d80f66919fb78925c570ab85797af66ec443316f.zip
scilab-d80f66919fb78925c570ab85797af66ec443316f.tar.gz
update target (modelicat was not embedded in binary)
Diffstat (limited to 'scilab/modules/scicos')
-rw-r--r--scilab/modules/scicos/Makefile.in16
-rw-r--r--scilab/modules/scicos/Makefile.modelica.am39
2 files changed, 27 insertions, 28 deletions
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index 5b00295..8b79666 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -2390,8 +2390,8 @@ distclean-local:
2390 2390
2391@OCAML_TRUE@.ml.cmo: 2391@OCAML_TRUE@.ml.cmo:
2392@OCAML_TRUE@ @if echo "$<"|grep src/translator; then \ 2392@OCAML_TRUE@ @if echo "$<"|grep src/translator; then \
2393@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE_translator) -c $<; \ 2393@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
2394@OCAML_TRUE@ $(OCAMLC) $(INCLUDE_translator) -c $<; \ 2394@OCAML_TRUE@ $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
2395@OCAML_TRUE@ else \ 2395@OCAML_TRUE@ else \
2396@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE) -c $<; \ 2396@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE) -c $<; \
2397@OCAML_TRUE@ $(OCAMLC) $(INCLUDE) -c $<; \ 2397@OCAML_TRUE@ $(OCAMLC) $(INCLUDE) -c $<; \
@@ -2399,8 +2399,8 @@ distclean-local:
2399 2399
2400@OCAML_TRUE@.ml.cmx: 2400@OCAML_TRUE@.ml.cmx:
2401@OCAML_TRUE@ @if echo "$<"|grep src/translator; then \ 2401@OCAML_TRUE@ @if echo "$<"|grep src/translator; then \
2402@OCAML_TRUE@ echo $(OCAMLOPT) $(INCLUDE_translator) -c $<; \ 2402@OCAML_TRUE@ echo $(OCAMLOPT) $(INCLUDE_modelicat) -c $<; \
2403@OCAML_TRUE@ $(OCAMLOPT) $(INCLUDE_translator) -c $<; \ 2403@OCAML_TRUE@ $(OCAMLOPT) $(INCLUDE_modelicat) -c $<; \
2404@OCAML_TRUE@ else \ 2404@OCAML_TRUE@ else \
2405@OCAML_TRUE@ echo $(OCAMLOPT) $(INCLUDE) -c $<; \ 2405@OCAML_TRUE@ echo $(OCAMLOPT) $(INCLUDE) -c $<; \
2406@OCAML_TRUE@ $(OCAMLOPT) $(INCLUDE) -c $<; \ 2406@OCAML_TRUE@ $(OCAMLOPT) $(INCLUDE) -c $<; \
@@ -2408,8 +2408,8 @@ distclean-local:
2408 2408
2409@OCAML_TRUE@.mli.cmi: 2409@OCAML_TRUE@.mli.cmi:
2410@OCAML_TRUE@ @if echo "$<"|grep src/translator; then \ 2410@OCAML_TRUE@ @if echo "$<"|grep src/translator; then \
2411@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE_translator) -c $<; \ 2411@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
2412@OCAML_TRUE@ $(OCAMLC) $(INCLUDE_translator) -c $<; \ 2412@OCAML_TRUE@ $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
2413@OCAML_TRUE@ else \ 2413@OCAML_TRUE@ else \
2414@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE) -c $<; \ 2414@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE) -c $<; \
2415@OCAML_TRUE@ $(OCAMLC) $(INCLUDE) -c $<; \ 2415@OCAML_TRUE@ $(OCAMLC) $(INCLUDE) -c $<; \
@@ -2417,8 +2417,8 @@ distclean-local:
2417 2417
2418@OCAML_TRUE@.ml.mli: 2418@OCAML_TRUE@.ml.mli:
2419@OCAML_TRUE@ @if echo "$<"|grep src/translator; then \ 2419@OCAML_TRUE@ @if echo "$<"|grep src/translator; then \
2420@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE_translator) -c $<; \ 2420@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
2421@OCAML_TRUE@ $(OCAMLC) $(INCLUDE_translator) -c $<; \ 2421@OCAML_TRUE@ $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
2422@OCAML_TRUE@ else \ 2422@OCAML_TRUE@ else \
2423@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE) -c $<; \ 2423@OCAML_TRUE@ echo $(OCAMLC) $(INCLUDE) -c $<; \
2424@OCAML_TRUE@ $(OCAMLC) $(INCLUDE) -c $<; \ 2424@OCAML_TRUE@ $(OCAMLC) $(INCLUDE) -c $<; \
diff --git a/scilab/modules/scicos/Makefile.modelica.am b/scilab/modules/scicos/Makefile.modelica.am
index 572bb15..0ac2e45 100644
--- a/scilab/modules/scicos/Makefile.modelica.am
+++ b/scilab/modules/scicos/Makefile.modelica.am
@@ -10,12 +10,11 @@
10 10
11# TODO: 11# TODO:
12# * see if we can do more factorisation (on the lexer for example) 12# * see if we can do more factorisation (on the lexer for example)
13# * translator must be renamed
14 13
15######### Common Modelica elements ############# 14######### Common Modelica elements #############
16 15
17if OCAML 16if OCAML
18TARGET = modelicac XML2Modelica translator 17TARGET = modelicac XML2Modelica modelicat
19BASE_PATH = $(srcdir)/src/ 18BASE_PATH = $(srcdir)/src/
20bin_PROGRAMS = $(TARGET) 19bin_PROGRAMS = $(TARGET)
21OCAMLLIBS=nums.cma 20OCAMLLIBS=nums.cma
@@ -32,9 +31,9 @@ BASE_PATH_XML2Modelica = $(srcdir)/src/xml2modelica
32 31
33### Translator 32### Translator
34 33
35translator_SOURCES = $(MLS_translator) 34modelicat_SOURCES = $(MLS_modelicat)
36 35
37MLS_translator = $(srcdir)/src/translator/compilation/types.ml \ 36MLS_modelicat = $(srcdir)/src/translator/compilation/types.ml \
38 $(srcdir)/src/translator/compilation/nameResolve.ml \ 37 $(srcdir)/src/translator/compilation/nameResolve.ml \
39 $(srcdir)/src/translator/instantiation/instantiation.ml \ 38 $(srcdir)/src/translator/instantiation/instantiation.ml \
40 $(srcdir)/src/translator/exceptionHandling/msgDico.ml \ 39 $(srcdir)/src/translator/exceptionHandling/msgDico.ml \
@@ -46,16 +45,16 @@ MLS_translator = $(srcdir)/src/translator/compilation/types.ml \
46 $(srcdir)/src/translator/translation/translator.ml 45 $(srcdir)/src/translator/translation/translator.ml
47 46
48 47
49MLS_SPECIFIC_PRE_translator = $(srcdir)/src/translator/parsing/syntax.ml \ 48MLS_SPECIFIC_PRE_modelicat = $(srcdir)/src/translator/parsing/syntax.ml \
50$(srcdir)/src/translator/parsing/parser.ml \ 49$(srcdir)/src/translator/parsing/parser.ml \
51$(srcdir)/src/translator/parsing/lexer.ml \ 50$(srcdir)/src/translator/parsing/lexer.ml \
52$(srcdir)/src/translator/parsing/linenum.ml 51$(srcdir)/src/translator/parsing/linenum.ml
53 52
54PARSER_SRC_translator = $(srcdir)/src/translator/parsing/parser.mly 53PARSER_SRC_modelicat = $(srcdir)/src/translator/parsing/parser.mly
55LEXER_SRC_translator = $(srcdir)/src/translator/parsing/lexer.mll 54LEXER_SRC_modelicat = $(srcdir)/src/translator/parsing/lexer.mll
56 55
57 56
58INCLUDE_translator = -I $(srcdir)/src/translator/compilation \ 57INCLUDE_modelicat = -I $(srcdir)/src/translator/compilation \
59-I $(srcdir)/src/translator/exceptionHandling \ 58-I $(srcdir)/src/translator/exceptionHandling \
60-I $(srcdir)/src/translator/parsing \ 59-I $(srcdir)/src/translator/parsing \
61-I $(srcdir)/src/translator/instantiation \ 60-I $(srcdir)/src/translator/instantiation \
@@ -115,8 +114,8 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi .cmx
115 114
116.ml.cmo: 115.ml.cmo:
117 @if echo "$<"|grep src/translator; then \ 116 @if echo "$<"|grep src/translator; then \
118 echo $(OCAMLC) $(INCLUDE_translator) -c $<; \ 117 echo $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
119 $(OCAMLC) $(INCLUDE_translator) -c $<; \ 118 $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
120 else \ 119 else \
121 echo $(OCAMLC) $(INCLUDE) -c $<; \ 120 echo $(OCAMLC) $(INCLUDE) -c $<; \
122 $(OCAMLC) $(INCLUDE) -c $<; \ 121 $(OCAMLC) $(INCLUDE) -c $<; \
@@ -124,8 +123,8 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi .cmx
124 123
125.ml.cmx: 124.ml.cmx:
126 @if echo "$<"|grep src/translator; then \ 125 @if echo "$<"|grep src/translator; then \
127 echo $(OCAMLOPT) $(INCLUDE_translator) -c $<; \ 126 echo $(OCAMLOPT) $(INCLUDE_modelicat) -c $<; \
128 $(OCAMLOPT) $(INCLUDE_translator) -c $<; \ 127 $(OCAMLOPT) $(INCLUDE_modelicat) -c $<; \
129 else \ 128 else \
130 echo $(OCAMLOPT) $(INCLUDE) -c $<; \ 129 echo $(OCAMLOPT) $(INCLUDE) -c $<; \
131 $(OCAMLOPT) $(INCLUDE) -c $<; \ 130 $(OCAMLOPT) $(INCLUDE) -c $<; \
@@ -134,8 +133,8 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi .cmx
134 133
135.mli.cmi: 134.mli.cmi:
136 @if echo "$<"|grep src/translator; then \ 135 @if echo "$<"|grep src/translator; then \
137 echo $(OCAMLC) $(INCLUDE_translator) -c $<; \ 136 echo $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
138 $(OCAMLC) $(INCLUDE_translator) -c $<; \ 137 $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
139 else \ 138 else \
140 echo $(OCAMLC) $(INCLUDE) -c $<; \ 139 echo $(OCAMLC) $(INCLUDE) -c $<; \
141 $(OCAMLC) $(INCLUDE) -c $<; \ 140 $(OCAMLC) $(INCLUDE) -c $<; \
@@ -143,8 +142,8 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi .cmx
143 142
144.ml.mli: 143.ml.mli:
145 @if echo "$<"|grep src/translator; then \ 144 @if echo "$<"|grep src/translator; then \
146 echo $(OCAMLC) $(INCLUDE_translator) -c $<; \ 145 echo $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
147 $(OCAMLC) $(INCLUDE_translator) -c $<; \ 146 $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
148 else \ 147 else \
149 echo $(OCAMLC) $(INCLUDE) -c $<; \ 148 echo $(OCAMLC) $(INCLUDE) -c $<; \
150 $(OCAMLC) $(INCLUDE) -c $<; \ 149 $(OCAMLC) $(INCLUDE) -c $<; \
@@ -178,16 +177,16 @@ XML2Modelica: $(MLS_XML2Modelica:.ml=.cmo) $(MLS_XML2Modelica:.ml=.cmx)
178 177
179 178
180# call the ocaml/Yacc 179# call the ocaml/Yacc
181generate-parser_translator: $(PARSER_SRC_translator) 180generate-parser_modelicat: $(PARSER_SRC_modelicat)
182 $(OCAMLYACC) $(<) 181 $(OCAMLYACC) $(<)
183 $(RM) -f $(<:.mly=.mli) 182 $(RM) -f $(<:.mly=.mli)
184 183
185# Call the lexer 184# Call the lexer
186generate-lexer_translator: $(LEXER_SRC_translator) 185generate-lexer_modelicat: $(LEXER_SRC_modelicat)
187 $(OCAMLLEX) $(<) 186 $(OCAMLLEX) $(<)
188 187
189translator: generate-parser_translator generate-lexer_translator $(MLS_SPECIFIC_PRE_translator:.ml=.cmo) $(MLS_translator:.ml=.mli) $(MLS_SPECIFIC_PRE_translator:.ml=.cmx) $(MLS_translator:.ml=.cmo) $(MLS_translator:.ml=.cmx) 188modelicat: 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)
190 $(OCAMLOPT) -o modelicat $(INCLUDE_translator) $(OCAMLLIBS:.cma=.cmxa) $(MLS_SPECIFIC_PRE_translator:.ml=.cmx) $(MLS_translator:.ml=.cmx) 189 $(OCAMLOPT) -o modelicat $(INCLUDE_modelicat) $(OCAMLLIBS:.cma=.cmxa) $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmx) $(MLS_modelicat:.ml=.cmx)
191 190
192 191
193CLEANFILES = $(BASE_PATH)/*/*.cmi \ 192CLEANFILES = $(BASE_PATH)/*/*.cmi \