X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=Remakefile.in;fp=Remakefile.in;h=5c3fe428aab6129020a08a4255504dadc081115e;hp=97234fba22ba16518ff71f880a57b748c3467025;hb=d7019c01a47613e258fccb127e6085cb91d26546;hpb=be3f8efc9faf12df977b5e64a50868279fcb435b

diff --git a/Remakefile.in b/Remakefile.in
index 97234fb..5c3fe42 100644
--- a/Remakefile.in
+++ b/Remakefile.in
@@ -22,7 +22,7 @@ OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
 OCAMLCFLAGS = @OCAMLCFLAGS@
 MENHIR = @MENHIR@
 
-.PHONY: clean distclean
+.PHONY:clean real_test test_native test
 
 all: $(BIN)
 
@@ -68,9 +68,9 @@ distclean: clean test_clean
 
 %.native$(EXE):
 	$(REMAKE) OCAMLNATIVE="-native" $*.cmx $*.depx
-	objects=`cat $*.depx | xargs | sed 's/[.]depx/.cmx/g'` 
+	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 $*.cmx 
+	$(OCAMLOPT) -o $@  $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objects $*.cmx
 
 
 %.byte$(EXE):
@@ -105,6 +105,7 @@ distclean: clean test_clean
 	COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
 	. tools/ocamldriver.sh
 
+
 %.cmo %.depo:
 	base=$*
 	target=$@
@@ -134,15 +135,9 @@ distclean: clean test_clean
 
 ## Tests
 
-test_byte: tools $(BYTE)
-	$(REMAKE) TEST=$(BYTE) real_test
-
-test_native: tools $(BIN)
-	$(REMAKE) TEST=$(BIN) real_test
-
-test: test_native
 
 real_test:
+	echo $(TEST)
 	for i in tests/*.xml
 	do
 	  for j in 1 2 3
@@ -151,10 +146,18 @@ real_test:
 	  done
 	done
 
+test_byte:
+	 $(REMAKE) TEST=$(BYTE) real_test
+test_native:
+	$(REMAKE) TEST=$(BIN) real_test
+
+test: test_native
+
 test_clean:
 	rm -rf tests/*.summary tests/*.results/*_"$(PACKAGE)"_*.*
 
 %.summary:
+	$(REMAKE) tools $(TEST)
 	target=$@
 	base=$*
 	test=${base#*.xml.}