summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-04-07 15:54:38 +0200
committerAllan CORNET <allan.cornet@scilab.org>2010-04-07 15:54:38 +0200
commitc173fdc8e1c623d4f0be9f380c3e4c5ca8a5b707 (patch)
tree295d8829db6399de5747e3ab93fd69e09eeb17b8 /scilab/modules/scicos
parent953f1ec4fe32497c8311113ef3b110bf4ad8da96 (diff)
downloadscilab-c173fdc8e1c623d4f0be9f380c3e4c5ca8a5b707.zip
scilab-c173fdc8e1c623d4f0be9f380c3e4c5ca8a5b707.tar.gz
update target (modelicat was not embedded in binary)
Diffstat (limited to 'scilab/modules/scicos')
-rw-r--r--scilab/modules/scicos/Makefile.in43
1 files changed, 21 insertions, 22 deletions
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index 804e0a8..5b00295 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -52,7 +52,6 @@
52 52
53# TODO: 53# TODO:
54# * see if we can do more factorisation (on the lexer for example) 54# * see if we can do more factorisation (on the lexer for example)
55# * translator must be renamed
56 55
57######### Common Modelica elements ############# 56######### Common Modelica elements #############
58 57
@@ -308,7 +307,7 @@ libscisundials_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
308 -o $@ 307 -o $@
309@SCICOS_TRUE@am_libscisundials_la_rpath = -rpath $(pkglibdir) 308@SCICOS_TRUE@am_libscisundials_la_rpath = -rpath $(pkglibdir)
310@OCAML_TRUE@am__EXEEXT_1 = modelicac$(EXEEXT) XML2Modelica$(EXEEXT) \ 309@OCAML_TRUE@am__EXEEXT_1 = modelicac$(EXEEXT) XML2Modelica$(EXEEXT) \
311@OCAML_TRUE@ translator$(EXEEXT) 310@OCAML_TRUE@ modelicat$(EXEEXT)
312PROGRAMS = $(bin_PROGRAMS) 311PROGRAMS = $(bin_PROGRAMS)
313am__XML2Modelica_SOURCES_DIST = $(srcdir)/src/xml2modelica/xMLTree.ml \ 312am__XML2Modelica_SOURCES_DIST = $(srcdir)/src/xml2modelica/xMLTree.ml \
314 $(srcdir)/src/xml2modelica/linenum.ml \ 313 $(srcdir)/src/xml2modelica/linenum.ml \
@@ -344,7 +343,7 @@ am__modelicac_SOURCES_DIST = \
344@OCAML_TRUE@am_modelicac_OBJECTS = $(am__objects_7) 343@OCAML_TRUE@am_modelicac_OBJECTS = $(am__objects_7)
345modelicac_OBJECTS = $(am_modelicac_OBJECTS) 344modelicac_OBJECTS = $(am_modelicac_OBJECTS)
346modelicac_LDADD = $(LDADD) 345modelicac_LDADD = $(LDADD)
347am__translator_SOURCES_DIST = \ 346am__modelicat_SOURCES_DIST = \
348 $(srcdir)/src/translator/compilation/types.ml \ 347 $(srcdir)/src/translator/compilation/types.ml \
349 $(srcdir)/src/translator/compilation/nameResolve.ml \ 348 $(srcdir)/src/translator/compilation/nameResolve.ml \
350 $(srcdir)/src/translator/instantiation/instantiation.ml \ 349 $(srcdir)/src/translator/instantiation/instantiation.ml \
@@ -355,9 +354,9 @@ am__translator_SOURCES_DIST = \
355 $(srcdir)/src/translator/translation/codeGeneration.ml \ 354 $(srcdir)/src/translator/translation/codeGeneration.ml \
356 $(srcdir)/src/translator/translation/versiondate.ml \ 355 $(srcdir)/src/translator/translation/versiondate.ml \
357 $(srcdir)/src/translator/translation/translator.ml 356 $(srcdir)/src/translator/translation/translator.ml
358@OCAML_TRUE@am_translator_OBJECTS = $(am__objects_7) 357@OCAML_TRUE@am_modelicat_OBJECTS = $(am__objects_7)
359translator_OBJECTS = $(am_translator_OBJECTS) 358modelicat_OBJECTS = $(am_modelicat_OBJECTS)
360translator_LDADD = $(LDADD) 359modelicat_LDADD = $(LDADD)
361DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes 360DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/modules/core/includes
362depcomp = $(SHELL) $(top_srcdir)/config/depcomp 361depcomp = $(SHELL) $(top_srcdir)/config/depcomp
363am__depfiles_maybe = depfiles 362am__depfiles_maybe = depfiles
@@ -380,11 +379,11 @@ F77LINK = $(LIBTOOL) --tag=F77 $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
380 $(LDFLAGS) -o $@ 379 $(LDFLAGS) -o $@
381SOURCES = $(libsciscicos_la_SOURCES) $(libscisundials_la_SOURCES) \ 380SOURCES = $(libsciscicos_la_SOURCES) $(libscisundials_la_SOURCES) \
382 $(XML2Modelica_SOURCES) $(modelicac_SOURCES) \ 381 $(XML2Modelica_SOURCES) $(modelicac_SOURCES) \
383 $(translator_SOURCES) 382 $(modelicat_SOURCES)
384DIST_SOURCES = $(am__libsciscicos_la_SOURCES_DIST) \ 383DIST_SOURCES = $(am__libsciscicos_la_SOURCES_DIST) \
385 $(am__libscisundials_la_SOURCES_DIST) \ 384 $(am__libscisundials_la_SOURCES_DIST) \
386 $(am__XML2Modelica_SOURCES_DIST) $(am__modelicac_SOURCES_DIST) \ 385 $(am__XML2Modelica_SOURCES_DIST) $(am__modelicac_SOURCES_DIST) \
387 $(am__translator_SOURCES_DIST) 386 $(am__modelicat_SOURCES_DIST)
388DATA = $(libsciscicos_la_etc_DATA) $(libsciscicos_la_help_en_US_DATA) \ 387DATA = $(libsciscicos_la_etc_DATA) $(libsciscicos_la_help_en_US_DATA) \
389 $(libsciscicos_la_help_fr_FR_DATA) \ 388 $(libsciscicos_la_help_fr_FR_DATA) \
390 $(libsciscicos_la_root_DATA) \ 389 $(libsciscicos_la_root_DATA) \
@@ -706,7 +705,7 @@ JARMASK = *.jar
706HELP_CHAPTERDIR = help/ 705HELP_CHAPTERDIR = help/
707HELP_CHAPTERFILE = addchapter.sce 706HELP_CHAPTERFILE = addchapter.sce
708HELP_CHAPTERLANG = en_US fr_FR pt_BR 707HELP_CHAPTERLANG = en_US fr_FR pt_BR
709@OCAML_TRUE@TARGET = modelicac XML2Modelica translator 708@OCAML_TRUE@TARGET = modelicac XML2Modelica modelicat
710@OCAML_TRUE@BASE_PATH = $(srcdir)/src/ 709@OCAML_TRUE@BASE_PATH = $(srcdir)/src/
711@OCAML_TRUE@OCAMLLIBS = nums.cma 710@OCAML_TRUE@OCAMLLIBS = nums.cma
712 711
@@ -718,8 +717,8 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
718@OCAML_TRUE@BASE_PATH_XML2Modelica = $(srcdir)/src/xml2modelica 717@OCAML_TRUE@BASE_PATH_XML2Modelica = $(srcdir)/src/xml2modelica
719 718
720### Translator 719### Translator
721@OCAML_TRUE@translator_SOURCES = $(MLS_translator) 720@OCAML_TRUE@modelicat_SOURCES = $(MLS_modelicat)
722@OCAML_TRUE@MLS_translator = $(srcdir)/src/translator/compilation/types.ml \ 721@OCAML_TRUE@MLS_modelicat = $(srcdir)/src/translator/compilation/types.ml \
723@OCAML_TRUE@ $(srcdir)/src/translator/compilation/nameResolve.ml \ 722@OCAML_TRUE@ $(srcdir)/src/translator/compilation/nameResolve.ml \
724@OCAML_TRUE@ $(srcdir)/src/translator/instantiation/instantiation.ml \ 723@OCAML_TRUE@ $(srcdir)/src/translator/instantiation/instantiation.ml \
725@OCAML_TRUE@ $(srcdir)/src/translator/exceptionHandling/msgDico.ml \ 724@OCAML_TRUE@ $(srcdir)/src/translator/exceptionHandling/msgDico.ml \
@@ -730,14 +729,14 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
730@OCAML_TRUE@ $(srcdir)/src/translator/translation/versiondate.ml \ 729@OCAML_TRUE@ $(srcdir)/src/translator/translation/versiondate.ml \
731@OCAML_TRUE@ $(srcdir)/src/translator/translation/translator.ml 730@OCAML_TRUE@ $(srcdir)/src/translator/translation/translator.ml
732 731
733@OCAML_TRUE@MLS_SPECIFIC_PRE_translator = $(srcdir)/src/translator/parsing/syntax.ml \ 732@OCAML_TRUE@MLS_SPECIFIC_PRE_modelicat = $(srcdir)/src/translator/parsing/syntax.ml \
734@OCAML_TRUE@$(srcdir)/src/translator/parsing/parser.ml \ 733@OCAML_TRUE@$(srcdir)/src/translator/parsing/parser.ml \
735@OCAML_TRUE@$(srcdir)/src/translator/parsing/lexer.ml \ 734@OCAML_TRUE@$(srcdir)/src/translator/parsing/lexer.ml \
736@OCAML_TRUE@$(srcdir)/src/translator/parsing/linenum.ml 735@OCAML_TRUE@$(srcdir)/src/translator/parsing/linenum.ml
737 736
738@OCAML_TRUE@PARSER_SRC_translator = $(srcdir)/src/translator/parsing/parser.mly 737@OCAML_TRUE@PARSER_SRC_modelicat = $(srcdir)/src/translator/parsing/parser.mly
739@OCAML_TRUE@LEXER_SRC_translator = $(srcdir)/src/translator/parsing/lexer.mll 738@OCAML_TRUE@LEXER_SRC_modelicat = $(srcdir)/src/translator/parsing/lexer.mll
740@OCAML_TRUE@INCLUDE_translator = -I $(srcdir)/src/translator/compilation \ 739@OCAML_TRUE@INCLUDE_modelicat = -I $(srcdir)/src/translator/compilation \
741@OCAML_TRUE@-I $(srcdir)/src/translator/exceptionHandling \ 740@OCAML_TRUE@-I $(srcdir)/src/translator/exceptionHandling \
742@OCAML_TRUE@-I $(srcdir)/src/translator/parsing \ 741@OCAML_TRUE@-I $(srcdir)/src/translator/parsing \
743@OCAML_TRUE@-I $(srcdir)/src/translator/instantiation \ 742@OCAML_TRUE@-I $(srcdir)/src/translator/instantiation \
@@ -1149,9 +1148,9 @@ clean-binPROGRAMS:
1149@OCAML_FALSE@modelicac$(EXEEXT): $(modelicac_OBJECTS) $(modelicac_DEPENDENCIES) 1148@OCAML_FALSE@modelicac$(EXEEXT): $(modelicac_OBJECTS) $(modelicac_DEPENDENCIES)
1150@OCAML_FALSE@ @rm -f modelicac$(EXEEXT) 1149@OCAML_FALSE@ @rm -f modelicac$(EXEEXT)
1151@OCAML_FALSE@ $(LINK) $(modelicac_OBJECTS) $(modelicac_LDADD) $(LIBS) 1150@OCAML_FALSE@ $(LINK) $(modelicac_OBJECTS) $(modelicac_LDADD) $(LIBS)
1152@OCAML_FALSE@translator$(EXEEXT): $(translator_OBJECTS) $(translator_DEPENDENCIES) 1151@OCAML_FALSE@modelicat$(EXEEXT): $(modelicat_OBJECTS) $(modelicat_DEPENDENCIES)
1153@OCAML_FALSE@ @rm -f translator$(EXEEXT) 1152@OCAML_FALSE@ @rm -f modelicat$(EXEEXT)
1154@OCAML_FALSE@ $(LINK) $(translator_OBJECTS) $(translator_LDADD) $(LIBS) 1153@OCAML_FALSE@ $(LINK) $(modelicat_OBJECTS) $(modelicat_LDADD) $(LIBS)
1155 1154
1156mostlyclean-compile: 1155mostlyclean-compile:
1157 -rm -f *.$(OBJEXT) 1156 -rm -f *.$(OBJEXT)
@@ -2449,16 +2448,16 @@ distclean-local:
2449@OCAML_TRUE@ $(OCAMLOPT) -o XML2Modelica $(INCLUDE) $(OCAMLLIBS:.cma=.cmxa) $(MLS_XML2Modelica:.ml=.cmx) 2448@OCAML_TRUE@ $(OCAMLOPT) -o XML2Modelica $(INCLUDE) $(OCAMLLIBS:.cma=.cmxa) $(MLS_XML2Modelica:.ml=.cmx)
2450 2449
2451# call the ocaml/Yacc 2450# call the ocaml/Yacc
2452@OCAML_TRUE@generate-parser_translator: $(PARSER_SRC_translator) 2451@OCAML_TRUE@generate-parser_modelicat: $(PARSER_SRC_modelicat)
2453@OCAML_TRUE@ $(OCAMLYACC) $(<) 2452@OCAML_TRUE@ $(OCAMLYACC) $(<)
2454@OCAML_TRUE@ $(RM) -f $(<:.mly=.mli) 2453@OCAML_TRUE@ $(RM) -f $(<:.mly=.mli)
2455 2454
2456# Call the lexer 2455# Call the lexer
2457@OCAML_TRUE@generate-lexer_translator: $(LEXER_SRC_translator) 2456@OCAML_TRUE@generate-lexer_modelicat: $(LEXER_SRC_modelicat)
2458@OCAML_TRUE@ $(OCAMLLEX) $(<) 2457@OCAML_TRUE@ $(OCAMLLEX) $(<)
2459 2458
2460@OCAML_TRUE@translator: 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) 2459@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)
2461@OCAML_TRUE@ $(OCAMLOPT) -o modelicat $(INCLUDE_translator) $(OCAMLLIBS:.cma=.cmxa) $(MLS_SPECIFIC_PRE_translator:.ml=.cmx) $(MLS_translator:.ml=.cmx) 2460@OCAML_TRUE@ $(OCAMLOPT) -o modelicat $(INCLUDE_modelicat) $(OCAMLLIBS:.cma=.cmxa) $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmx) $(MLS_modelicat:.ml=.cmx)
2462 2461
2463.NOTPARALLEL: libscisundials.la libsciscicos.la 2462.NOTPARALLEL: libscisundials.la libsciscicos.la
2464 2463