.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)
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' | while read file; do
case "$file" in
*.mll)
rm -f "${file%.mll}.ml"
%.class: %.java
javac $<
-%.native$(EXE): %.cmx %.dep
- objects=`cat $*.dep | xargs | sed 's/[.]dep/.cmx/g'`
+%.native$(EXE): %.cmx %.depx
+ 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 $<
-%.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:
$(OCAMLLEX) $*.mll
fi
-%.cmx %.dep:
+%.cmx %.depx:
base=$*
target=$@
+ DEPEXT=depx
NATIVE=-native
REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
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)"
SRC=$(SRC)
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