X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=Remakefile.in;h=b3b1168e2c1fff9025404329bf6f739ce3cfe9c6;hp=627f79ca540fe85b593140462357deccc60d33eb;hb=03a5cae4ee4f036cc9fc915d6dbbf52d38bb0bf2;hpb=524e7cad6802c1c32160d69728889cfe734753a4

diff --git a/Remakefile.in b/Remakefile.in
index 627f79c..b3b1168 100644
--- a/Remakefile.in
+++ b/Remakefile.in
@@ -1,4 +1,5 @@
-OCAMLFINDPACKAGES = "ulex,unix,expat,camlp4.macro"
+.OPTIONS = variable-propagation
+OCAMLFINDPACKAGES = "ulex,unix,expat,camlp4.macro,bigarray"
 OCAMLFINDSYNTAX = camlp4o
 OCAMLFINDPPOPTS = $(addprefix "-ppopt ", @CAMLP4FLAGS@ -I include)
 OCAMLFINDINCLUDES = $(addprefix "-I ", src)
@@ -8,6 +9,7 @@ OCAMLFINDLINKFLAGS = -linkpkg
 PACKAGE = @PACKAGE_TARNAME@
 SRC = src
 BIN = src/@PACKAGE_TARNAME@.native@EXE@
+BYTE = src/@PACKAGE_TARNAME@.byte@EXE@
 EXE = @EXE@
 
 REMAKE = @REMAKE@
@@ -35,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"
@@ -56,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:
@@ -73,21 +77,23 @@ distclean: clean test_clean
 		$(OCAMLLEX) $*.mll
 	fi
 
-%.cmx %.dep:
+%.cmx %.depx:
 	base=$*
 	target=$@
+	DEPEXT=depx
 	NATIVE=-native
-	REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+	REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
 	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
 	SRC=$(SRC)
 	COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
 	. tools/ocamldriver.sh
 
-%.cmo %.dep:
+%.cmo %.depo:
 	base=$*
 	target=$@
-	NATIVE=
-	REMAKE="$(REMAKE) -v OCAMLNATIVE=$NATIVE"
+	DEPEXT=depo
+	NATIVE=""
+	REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
 	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
 	SRC=$(SRC)
 	COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
@@ -97,40 +103,50 @@ 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
+		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