Update to master version of remake.

[tatoo.git] / Remakefile.in

diff --git a/Remakefile.in b/Remakefile.in
index f8552fe..50ae9d2 100644 (file)
--- a/Remakefile.in
+++ b/Remakefile.in
@@ -1,3 +1,4 @@
+.OPTIONS = variable-propagation
 OCAMLFINDPACKAGES = "ulex,unix,expat,camlp4.macro"
 OCAMLFINDSYNTAX = camlp4o
 OCAMLFINDPPOPTS = $(addprefix "-ppopt ", @CAMLP4FLAGS@ -I include)
@@ -66,8 +67,10 @@ distclean: clean test_clean
 
 %.ml:
        if test -f $*.mly; then
+               $(REMAKE) $*.mly
                $(OCAMLYACC) $*.mly
        elif test -f $*.mll; then
+               $(REMAKE) $*.mll
                $(OCAMLLEX) $*.mll
        fi
 
@@ -75,7 +78,7 @@ distclean: clean test_clean
        base=$*
        target=$@
        NATIVE=-native
-       REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+       REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
        OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
        SRC=$(SRC)
        COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
@@ -85,7 +88,7 @@ distclean: clean test_clean
        base=$*
        target=$@
        NATIVE=
-       REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+       REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
        OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
        SRC=$(SRC)
        COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
@@ -95,7 +98,7 @@ distclean: clean test_clean
        base=$*
        target=$@
        NATIVE=$(OCAMLNATIVE)
-       REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+       REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
        OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
        SRC=$(SRC)
        if test -z "$NATIVE"; then