Modify configure.in and Remakefile.in to use menhir instead of ocamlyacc.

[tatoo.git] / Remakefile.in

diff --git a/Remakefile.in b/Remakefile.in
index 50ae9d2..1b54199 100644 (file)
--- a/Remakefile.in
+++ b/Remakefile.in
@@ -1,14 +1,15 @@
 .OPTIONS = variable-propagation
-OCAMLFINDPACKAGES = "ulex,unix,expat,camlp4.macro"
+OCAMLFINDPACKAGES = "ulex,unix,expat,camlp4.macro,bigarray"
 OCAMLFINDSYNTAX = camlp4o
 OCAMLFINDPPOPTS = $(addprefix "-ppopt ", @CAMLP4FLAGS@ -I include)
 OCAMLFINDINCLUDES = $(addprefix "-I ", src)
-OCAMLFINDFLAGS = -syntax $(OCAMLFINDSYNTAX) -package $(OCAMLFINDPACKAGES)  \
-       $(OCAMLFINDPPOPTS) $(OCAMLFINDINCLUDES)
+OCAMLFINDFLAGSNOSYNTAX = -package $(OCAMLFINDPACKAGES) $(OCAMLFINDPPOPTS) $(OCAMLFINDINCLUDES)
+OCAMLFINDFLAGS = -syntax $(OCAMLFINDSYNTAX) $(OCAMLFINDFLAGSNOSYNTAX)
 OCAMLFINDLINKFLAGS = -linkpkg
 PACKAGE = @PACKAGE_TARNAME@
 SRC = src
 BIN = src/@PACKAGE_TARNAME@.native@EXE@
+BYTE = src/@PACKAGE_TARNAME@.byte@EXE@
 EXE = @EXE@
 
 REMAKE = @REMAKE@
@@ -19,10 +20,15 @@ OCAMLOPT = @OCAMLOPT@
 OCAMLFLAGS = @OCAMLFLAGS@
 OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
 OCAMLCFLAGS = @OCAMLCFLAGS@
-OCAMLYACC = @OCAMLYACC@
+MENHIR = @MENHIR@
+
+
 
 all: $(BIN)
 
+src/xpath/xpath_internal_parser.cmx: OCAMLFINDFLAGS = $(OCAMLFINDFLAGSNOSYNTAX)
+src/xpath/xpath_internal_parser.cmo: OCAMLFINDFLAGS = $(OCAMLFINDFLAGSNOSYNTAX)
+
 tools: tools/xml_diff.native$(EXE) tools/XPathEval.class tools/split_path.native$(EXE)
 
 Remakefile: Remakefile.in config.status
@@ -36,7 +42,7 @@ clean:
        for dir in src tools; do
                find $dir -name '*.cm*' -o -name '*.o' -o -name '*.byte' -o \
                          -name '*.native' -o -name '*.mll' -o -name '*.mly' -o \
-                         -name '*.class' -o -name '*.dep' | while read file; do
+                         -name '*.class' -o -name '*.depo' -o -name '*.depx' -o -name '*.ml.str' | while read file; do
                case "$file" in
                        *.mll)
                                rm -f "${file%.mll}.ml"
@@ -44,8 +50,11 @@ clean:
                        *.mly)
                                rm -f "${file%.mly}.ml" "${file%.mly}.mli"
                        ;;
+                       *.ml.str)
+                               rm -f "${file%.ml.str}.ml"
+                       ;;
                        *)
-                       rm -f "$file"
+                               rm -f "$file"
                        ;;
                esac
                done
@@ -57,26 +66,38 @@ distclean: clean test_clean
 %.class: %.java
        javac $<
 
-%.native$(EXE): %.cmx %.dep
-       objects=`cat $*.dep | xargs | sed 's/[.]dep/.cmx/g'`
-       $(OCAMLOPT) -o $@  $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objects $<
+%.native$(EXE): %.cmx %.depx
+       if test -f $@".flags"; then
+               FLAGS=`cat $@".flags"`
+       fi
+       objects=`cat $*.depx | xargs | sed 's/[.]depx/.cmx/g'`
+       $(REMAKE) OCAMLNATIVE="-native" $objects #ensure all objects have been built
+       $(OCAMLOPT) -o $@  $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $FLAGS $objects $<
 
-%.byte$(EXE): %.cmo %.dep
-       objects=`cat $*.dep | xargs | sed 's/[.]dep/.cmo/g'`
+%.byte$(EXE): %.cmo %.depo
+       objects=`cat $*.depo | xargs | sed 's/[.]depo/.cmo/g'`
+       $(REMAKE) OCAMLNATIVE="" $objects #ensure all objects have been built
        $(OCAMLC) -o $@  $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objects $<
 
 %.ml:
        if test -f $*.mly; then
                $(REMAKE) $*.mly
-               $(OCAMLYACC) $*.mly
+               $(MENHIR) $*.mly
        elif test -f $*.mll; then
                $(REMAKE) $*.mll
                $(OCAMLLEX) $*.mll
+       elif test -f $*.ml.str; then
+               $(REMAKE) $*.ml.str
+               echo -n 'let content = "' > $*.ml
+               sed -e 's/\(["\\]\)/\\\1/g' $*.ml.str | sed -e 's/^\(.*\)$/\1\\n\\/g' >> $*.ml
+                echo '' >> $*.ml
+                echo '"' >> $*.ml
        fi
 
-%.cmx %.dep:
+%.cmx %.depx:
        base=$*
        target=$@
+       DEPEXT=depx
        NATIVE=-native
        REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
        OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
@@ -84,14 +105,16 @@ distclean: clean test_clean
        COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
        . tools/ocamldriver.sh
 
-%.cmo %.dep:
+%.cmo %.depo:
        base=$*
        target=$@
-       NATIVE=
+       DEPEXT=depo
+       NATIVE=""
        REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
-       OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+       OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS) $(OCAMLFIND_EXTRAFLAGS)"
        SRC=$(SRC)
-       COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
+       COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFIND_EXTRAFLAGS) "
+
        . tools/ocamldriver.sh
 
 %.cmi:
@@ -102,36 +125,46 @@ distclean: clean test_clean
        OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
        SRC=$(SRC)
        if test -z "$NATIVE"; then
+               DEPEXT=.depo
                COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
        else
                COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
+               DEPEXT=.depx
        fi
        . tools/ocamldriver.sh
 
 ## Tests
 
-test:
+test_byte: tools $(BYTE)
+       $(REMAKE) TEST=$(BYTE) real_test
+
+test_native: tools $(BIN)
+       $(REMAKE) TEST=$(BIN) real_test
+
+test: test_native
+
+real_test:
        for i in tests/*.xml
        do
          for j in 1 2 3
          do
-               $(REMAKE) "$i".test"$j".summary
+               $(REMAKE) TEST=$(TEST) "$i".test"$j".summary
          done
        done
 
 test_clean:
        rm -rf tests/*.summary tests/*.results/*_"$(PACKAGE)"_*.*
 
-%.summary:  tools $(BIN)
-               target=$@
-               base=$*
-               test=${base#*.xml.}
-               xml=${base%.$test}
-               REMAKE=$(REMAKE)
-               BIN=$(BIN)
-               SPLIT=tools/split_path.native$(EXE)
-               XMLDIFF=tools/xml_diff.native$(EXE)
-               PACKAGE=$(PACKAGE)
-               $REMAKE $xml ${xml}.queries tests/${test}.sh
-               rm -f "$target"
-               . tests/${test}.sh
+%.summary:
+       target=$@
+       base=$*
+       test=${base#*.xml.}
+       xml=${base%.$test}
+       REMAKE=$(REMAKE)
+       BIN=$(TEST)
+       SPLIT=tools/split_path.native$(EXE)
+       XMLDIFF=tools/xml_diff.native$(EXE)
+       PACKAGE=$(PACKAGE)
+       $REMAKE $xml ${xml}.queries tests/${test}.sh
+       rm -f "$target"
+       . tests/${test}.sh