Split the formula cache into a top-down and bottom-up cache.

[tatoo.git] / Remakefile.in

diff --git a/Remakefile.in b/Remakefile.in
index b3b1168..a4fe1c9 100644 (file)
--- a/Remakefile.in
+++ b/Remakefile.in
@@ -17,7 +17,7 @@ OCAMLDEP = @OCAMLDEP@
 ODEPS = tools/odeps.sh $(OCAMLDEP)
 OCAMLC = @OCAMLC@
 OCAMLOPT = @OCAMLOPT@
-OCAMLFLAGS = @OCAMLFLAGS@
+OCAMLFLAGS = @OCAMLFLAGS@ 
 OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
 OCAMLCFLAGS = @OCAMLCFLAGS@
 OCAMLYACC = @OCAMLYACC@
@@ -59,9 +59,12 @@ distclean: clean test_clean
        javac $<
 
 %.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) $objects $<
+       $(OCAMLOPT) -o $@  $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $FLAGS $objects $<
 
 %.byte$(EXE): %.cmo %.depo
        objects=`cat $*.depo | xargs | sed 's/[.]depo/.cmo/g'`
@@ -85,7 +88,10 @@ distclean: clean test_clean
        REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
        OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
        SRC=$(SRC)
-       COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
+       if test -f "$base".flags; then
+               FLAGS=`cat "$base".flags`
+       fi
+       COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS) $FLAGS"
        . tools/ocamldriver.sh
 
 %.cmo %.depo: