revert scicos modelica makefiles 32/14632/3
Antoine ELIAS [Fri, 6 Jun 2014 11:57:23 +0000 (13:57 +0200)]
Change-Id: I07beeadd61ded00d72f9bc32e69bf84a7b5a39c6

scilab/configure
scilab/modules/javasci/Makefile.in
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/Makefile.modelica.am

index e7472f4..910cec7 100755 (executable)
@@ -4485,7 +4485,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
                       && LARGE_OFF_T % 2147483647 == 1)
                      ? 1 : -1];
@@ -4531,7 +4531,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
                       && LARGE_OFF_T % 2147483647 == 1)
                      ? 1 : -1];
@@ -4555,7 +4555,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
                       && LARGE_OFF_T % 2147483647 == 1)
                      ? 1 : -1];
@@ -4600,7 +4600,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
                       && LARGE_OFF_T % 2147483647 == 1)
                      ? 1 : -1];
@@ -4624,7 +4624,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
                       && LARGE_OFF_T % 2147483647 == 1)
                      ? 1 : -1];
index d3b6de0..8b8bd61 100644 (file)
@@ -985,10 +985,10 @@ maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@JAVASCI_FALSE@clean-local:
 @JAVASCI_FALSE@install-data-local:
 @JAVASCI_FALSE@install-html-local:
 @JAVASCI_FALSE@distclean-local:
+@JAVASCI_FALSE@clean-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-local \
index c3fd7e1..cd163e0 100644 (file)
@@ -1162,15 +1162,8 @@ HELP_CHAPTERLANG = en_US fr_FR pt_BR
 
 ### XML2Modelica
 @OCAML_TRUE@@XCOS_TRUE@XML2Modelica_SOURCES = $(MLS_XML2Modelica)
-@OCAML_TRUE@@XCOS_TRUE@MLS_XML2Modelica = \
-@OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/xMLTree.ml \
-@OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/linenum.ml \
-@OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/stringParser.ml \
-@OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/stringLexer.ml \
-@OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/xMLParser.ml \
-@OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/xMLLexer.ml \
-@OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/modelicaCodeGenerator.ml \
-@OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/xML2Modelica.ml
+@OCAML_TRUE@@XCOS_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\
+@OCAML_TRUE@@XCOS_TRUE@        $(srcdir)/src/xml2modelica/modelicaCodeGenerator.ml $(srcdir)/src/xml2modelica/xML2Modelica.ml
 
 @OCAML_TRUE@@XCOS_TRUE@BASE_PATH_XML2Modelica = $(srcdir)/src/xml2modelica
 
@@ -3359,38 +3352,38 @@ distclean-local:
 
 @OCAML_TRUE@@XCOS_TRUE@%.cmo: %.ml %.cmi
 @OCAML_TRUE@@XCOS_TRUE@        @if echo "$<"|grep src/translator; then \
-@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
-@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE_modelicat)  -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE_modelicat)  -c $<; \
 @OCAML_TRUE@@XCOS_TRUE@        else \
-@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
-@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE)  -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE)  -c $<; \
 @OCAML_TRUE@@XCOS_TRUE@        fi
 
 @OCAML_TRUE@@XCOS_TRUE@.ml.cmx:
 @OCAML_TRUE@@XCOS_TRUE@        @if echo "$<"|grep src/translator; then \
-@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $<; \
-@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLOPT) $(INCLUDE_modelicat) -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLOPT) $(INCLUDE_modelicat) -c $<; \
 @OCAML_TRUE@@XCOS_TRUE@        else \
-@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $<; \
-@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLOPT) $(INCLUDE) -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLOPT) $(INCLUDE) -c $<; \
 @OCAML_TRUE@@XCOS_TRUE@        fi
 
 @OCAML_TRUE@@XCOS_TRUE@.mli.cmi:
 @OCAML_TRUE@@XCOS_TRUE@        @if echo "$<"|grep src/translator; then \
-@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
-@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
 @OCAML_TRUE@@XCOS_TRUE@        else \
-@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
-@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE) -c $<; \
+@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE) -c $<; \
 @OCAML_TRUE@@XCOS_TRUE@        fi
 
 @OCAML_TRUE@@XCOS_TRUE@.ml.mli:
 @OCAML_TRUE@@XCOS_TRUE@        @if echo "$<"|grep src/translator; then \
-@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -i $< > $@; \
-@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -i $< > $@; \
+@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE_modelicat) -i $< > $@; \
+@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE_modelicat) -i $< > $@; \
 @OCAML_TRUE@@XCOS_TRUE@        else \
-@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -i $< > $@; \
-@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -i $< > $@; \
+@OCAML_TRUE@@XCOS_TRUE@                echo $(OCAMLC) $(INCLUDE) -i $< > $@; \
+@OCAML_TRUE@@XCOS_TRUE@                $(OCAMLC) $(INCLUDE) -i $< > $@; \
 @OCAML_TRUE@@XCOS_TRUE@        fi
 
 @OCAML_TRUE@@XCOS_TRUE@.mll.ml:
@@ -3401,23 +3394,14 @@ distclean-local:
 
 # Build the binaries
 
-@OCAML_TRUE@@XCOS_TRUE@modelicac: $(MLS:.ml=.cmx)
-@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $^
+@OCAML_TRUE@@XCOS_TRUE@modelicac:$(MLIS:.mli=.cmi) $(MLS:.ml=.cmo) $(MLS:.ml=.cmx)
+@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLOPT) -o modelicac $(INCLUDE) $(OCAMLLIBS:.cma=.cmxa) $(MLS:.ml=.cmx)
 
-@OCAML_TRUE@@XCOS_TRUE@modelicac.ocamlc: $(MLS:.ml=.cmo)
-@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $^
+@OCAML_TRUE@@XCOS_TRUE@XML2Modelica: $(MLS_XML2Modelica:.ml=.cmo) $(MLS_XML2Modelica:.ml=.cmx) 
+@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLOPT) -o XML2Modelica $(INCLUDE) $(OCAMLLIBS:.cma=.cmxa) $(MLS_XML2Modelica:.ml=.cmx) 
 
-@OCAML_TRUE@@XCOS_TRUE@XML2Modelica: $(MLS_XML2Modelica:.ml=.cmx) 
-@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS:.cma=.cmxa) $^
-
-@OCAML_TRUE@@XCOS_TRUE@XML2Modelica.ocamlc: $(MLS_XML2Modelica:.ml=.cmo)
-@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS) $^
-
-@OCAML_TRUE@@XCOS_TRUE@modelicat: $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmx) $(MLS_modelicat:.ml=.cmx)
-@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLOPT) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $^
-
-@OCAML_TRUE@@XCOS_TRUE@modelicat.ocamlc: $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmo) $(MLS_modelicat:.ml=.cmo)
-@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLC) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $^
+@OCAML_TRUE@@XCOS_TRUE@modelicat: $(MLIS_modelicat:.mli=.cmi) $(MLS_modelicat:.ml=.cmo) $(MLS_modelicat:.ml=.cmx)
+@OCAML_TRUE@@XCOS_TRUE@        $(OCAMLOPT) -o modelicat $(INCLUDE_modelicat) $(OCAMLLIBS:.cma=.cmxa) $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmx) $(MLS_modelicat:.ml=.cmx) 
 
 #BUILT_SOURCES = depend
 
index d7c387b..56149a2 100644 (file)
@@ -24,15 +24,8 @@ OCAMLLIBS=nums.cma
 ### XML2Modelica
 
 XML2Modelica_SOURCES = $(MLS_XML2Modelica)
-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 \
-       $(srcdir)/src/xml2modelica/modelicaCodeGenerator.ml \
-       $(srcdir)/src/xml2modelica/xML2Modelica.ml
+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\
+       $(srcdir)/src/xml2modelica/modelicaCodeGenerator.ml $(srcdir)/src/xml2modelica/xML2Modelica.ml
 
 BASE_PATH_XML2Modelica = $(srcdir)/src/xml2modelica
 
@@ -102,40 +95,42 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi .cmx
 
 %.cmo: %.ml %.cmi
        @if echo "$<"|grep src/translator; then \
-               echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
-               $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
+               echo $(OCAMLC) $(INCLUDE_modelicat)  -c $<; \
+               $(OCAMLC) $(INCLUDE_modelicat)  -c $<; \
        else \
-               echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
-               $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
+               echo $(OCAMLC) $(INCLUDE)  -c $<; \
+               $(OCAMLC) $(INCLUDE)  -c $<; \
        fi
 
 .ml.cmx:
        @if echo "$<"|grep src/translator; then \
-               echo $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $<; \
-               $(OCAMLOPT) $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) -c $<; \
+               echo $(OCAMLOPT) $(INCLUDE_modelicat) -c $<; \
+               $(OCAMLOPT) $(INCLUDE_modelicat) -c $<; \
        else \
-               echo $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $<; \
-               $(OCAMLOPT) $(INCLUDE) $(OCAMLOPTFLAGS) -c $<; \
+               echo $(OCAMLOPT) $(INCLUDE) -c $<; \
+               $(OCAMLOPT) $(INCLUDE) -c $<; \
        fi
 
+
 .mli.cmi:
        @if echo "$<"|grep src/translator; then \
-               echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
-               $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -c $<; \
+               echo $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
+               $(OCAMLC) $(INCLUDE_modelicat) -c $<; \
        else \
-               echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
-               $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -c $<; \
+               echo $(OCAMLC) $(INCLUDE) -c $<; \
+               $(OCAMLC) $(INCLUDE) -c $<; \
        fi
 
 .ml.mli:
        @if echo "$<"|grep src/translator; then \
-               echo $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -i $< > $@; \
-               $(OCAMLC) $(INCLUDE_modelicat) $(OCAMLCFLAGS) -i $< > $@; \
+               echo $(OCAMLC) $(INCLUDE_modelicat) -i $< > $@; \
+               $(OCAMLC) $(INCLUDE_modelicat) -i $< > $@; \
        else \
-               echo $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -i $< > $@; \
-               $(OCAMLC) $(INCLUDE) $(OCAMLCFLAGS) -i $< > $@; \
+               echo $(OCAMLC) $(INCLUDE) -i $< > $@; \
+               $(OCAMLC) $(INCLUDE) -i $< > $@; \
        fi
 
+
 .mll.ml:
        $(OCAMLLEX) $<
 
@@ -144,23 +139,16 @@ SUFFIXES += .ml .mli .mll .mly .cmo .cmi .cmx
 
 # Build the binaries
 
-modelicac: $(MLS:.ml=.cmx)
-       $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $^
-
-modelicac.ocamlc: $(MLS:.ml=.cmo)
-       $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $^
+modelicac:$(MLIS:.mli=.cmi) $(MLS:.ml=.cmo) $(MLS:.ml=.cmx)
+       $(OCAMLOPT) -o modelicac $(INCLUDE) $(OCAMLLIBS:.cma=.cmxa) $(MLS:.ml=.cmx)
 
-XML2Modelica: $(MLS_XML2Modelica:.ml=.cmx) 
-       $(OCAMLOPT) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS:.cma=.cmxa) $^
 
-XML2Modelica.ocamlc: $(MLS_XML2Modelica:.ml=.cmo)
-       $(OCAMLC) -o $@ $(INCLUDE) $(OCAMLCFLAGS) $(OCAMLLIBS) $^
+XML2Modelica: $(MLS_XML2Modelica:.ml=.cmo) $(MLS_XML2Modelica:.ml=.cmx) 
+       $(OCAMLOPT) -o XML2Modelica $(INCLUDE) $(OCAMLLIBS:.cma=.cmxa) $(MLS_XML2Modelica:.ml=.cmx) 
 
-modelicat: $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmx) $(MLS_modelicat:.ml=.cmx)
-       $(OCAMLOPT) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS:.cma=.cmxa) $^
+modelicat: $(MLIS_modelicat:.mli=.cmi) $(MLS_modelicat:.ml=.cmo) $(MLS_modelicat:.ml=.cmx)
+       $(OCAMLOPT) -o modelicat $(INCLUDE_modelicat) $(OCAMLLIBS:.cma=.cmxa) $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmx) $(MLS_modelicat:.ml=.cmx) 
 
-modelicat.ocamlc: $(MLS_SPECIFIC_PRE_modelicat:.ml=.cmo) $(MLS_modelicat:.ml=.cmo)
-       $(OCAMLC) -o $@ $(INCLUDE_modelicat) $(OCAMLOPTFLAGS) $(OCAMLLIBS) $^
 
 CLEANFILES = $(BASE_PATH)/*/*.cmi \
        $(BASE_PATH)/*/*.o \