X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=Remakefile.in;h=b3b1168e2c1fff9025404329bf6f739ce3cfe9c6;hp=623fb865123eb5ccefcc9ccd8c2c2f4507a0b63e;hb=03a5cae4ee4f036cc9fc915d6dbbf52d38bb0bf2;hpb=9f093d2dd2ad1186eb2d5401861e0bb44c45133f

diff --git a/Remakefile.in b/Remakefile.in
index 623fb86..b3b1168 100644
--- a/Remakefile.in
+++ b/Remakefile.in
@@ -1,5 +1,5 @@
 .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)
@@ -37,7 +37,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' | while read file; do
 		case "$file" in
 			*.mll)
 				rm -f "${file%.mll}.ml"
@@ -58,12 +58,14 @@ distclean: clean test_clean
 %.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:
@@ -75,9 +77,10 @@ distclean: clean test_clean
 		$(OCAMLLEX) $*.mll
 	fi
 
-%.cmx %.dep:
+%.cmx %.depx:
 	base=$*
 	target=$@
+	DEPEXT=depx
 	NATIVE=-native
 	REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
 	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
@@ -85,10 +88,11 @@ 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)"
 	SRC=$(SRC)
@@ -103,9 +107,11 @@ 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