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

diff --git a/Remakefile.in b/Remakefile.in
index 623fb86..2a32aa2 100644
--- a/Remakefile.in
+++ b/Remakefile.in
@@ -1,10 +1,11 @@
 .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)
-OCAMLFINDFLAGS = -syntax $(OCAMLFINDSYNTAX) -package $(OCAMLFINDPACKAGES)  \
-	$(OCAMLFINDPPOPTS) $(OCAMLFINDINCLUDES)
+OCAMLFINDFLAGSNOSYNTAX = -package $(OCAMLFINDPACKAGES) $(OCAMLFINDPPOPTS) $(OCAMLFINDINCLUDES)
+OCAMLFINDFLAGS = -syntax $(OCAMLFINDSYNTAX) $(OCAMLFINDFLAGSNOSYNTAX)
 OCAMLFINDLINKFLAGS = -linkpkg
 PACKAGE = @PACKAGE_TARNAME@
 SRC = src
@@ -13,14 +14,15 @@ BYTE = src/@PACKAGE_TARNAME@.byte@EXE@
 EXE = @EXE@
 
 REMAKE = @REMAKE@
-OCAMLDEP = @OCAMLDEP@
-ODEPS = tools/odeps.sh $(OCAMLDEP)
 OCAMLC = @OCAMLC@
 OCAMLOPT = @OCAMLOPT@
+OCAMLDEP = @OCAMLDEP@
 OCAMLFLAGS = @OCAMLFLAGS@
 OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
 OCAMLCFLAGS = @OCAMLCFLAGS@
-OCAMLYACC = @OCAMLYACC@
+MENHIR = @MENHIR@
+
+.PHONY:clean real_test test_native test
 
 all: $(BIN)
 
@@ -37,7 +39,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' -o -name '*.ml.str' | while read file; do
 		case "$file" in
 			*.mll)
 				rm -f "${file%.mll}.ml"
@@ -45,8 +47,11 @@ clean:
 			*.mly)
 				rm -f "${file%.mly}.ml" "${file%.mly}.mli"
 			;;
+			*.ml.str)
+				rm -f "${file%.ml.str}.ml"
+			;;
 			*)
-			rm -f "$file"
+				rm -f "$file"
 			;;
 		esac
 		done
@@ -58,39 +63,57 @@ distclean: clean test_clean
 %.class: %.java
 	javac $<
 
-%.native$(EXE): %.cmx %.dep
-	objects=`cat $*.dep | xargs | sed 's/[.]dep/.cmx/g'`
-	$(OCAMLOPT) -o $@  $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objects $<
+%.native$(EXE):
+	$(REMAKE) OCAMLNATIVE="-native" $*.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 $*.cmx
+
 
-%.byte$(EXE): %.cmo %.dep
-	objects=`cat $*.dep | xargs | sed 's/[.]dep/.cmo/g'`
-	$(OCAMLC) -o $@  $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDLINKFLAGS) $(OCAMLFINDFLAGS) $objects $<
+%.byte$(EXE):
+	$(REMAKE) OCAMLNATIVE="" $*.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 $*.cmo
 
 %.ml:
 	if test -f $*.mly; then
 		$(REMAKE) $*.mly
-		$(OCAMLYACC) $*.mly
+		#Work around menhir warning
+		$(MENHIR) $*.mly 2>&1 | grep -v -- 'you are\|--infer'
+		#Work around crazy ulex chocking on identifier 'lexer', generated by menhir.
+		cat $*.ml | sed -e 's/\blexer\b/__lexer/g' > $*.tmp
+		mv $*.tmp $*.ml
 	elif test -f $*.mll; then
 		$(REMAKE) $*.mll
 		$(OCAMLLEX) $*.mll
+	elif test -f $*.ml.str; then
+		$(REMAKE) $*.ml.str
+		echo -n 'let content = "' > $*.ml
+		sed -e 's/\(["\\]\)/\\\1/g' $*.ml.str | sed -e 's/^\(.*\)$/\1\\n\\/g' >> $*.ml
+                echo '' >> $*.ml
+                echo '"' >> $*.ml
 	fi
 
-%.cmx %.dep:
+%.cmx %.depx:
 	base=$*
 	target=$@
-	NATIVE=-native
-	REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
+	DEPEXT=depx
+	REMAKE="$(REMAKE)"
 	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+	OCAMLNATIVE=$(OCAMLNATIVE)
 	SRC=$(SRC)
 	COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
 	. tools/ocamldriver.sh
 
-%.cmo %.dep:
+
+%.cmo %.depo:
 	base=$*
 	target=$@
-	NATIVE=
-	REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
+	DEPEXT=depo
+	REMAKE="$(REMAKE)"
 	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
+	OCAMLNATIVE=$(OCAMLNATIVE)
 	SRC=$(SRC)
 	COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
 	. tools/ocamldriver.sh
@@ -98,28 +121,24 @@ distclean: clean test_clean
 %.cmi:
 	base=$*
 	target=$@
-	NATIVE=$(OCAMLNATIVE)
-	REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
+	REMAKE="$(REMAKE)"
 	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
 	SRC=$(SRC)
-	if test -z "$NATIVE"; then
+	OCAMLNATIVE=$(OCAMLNATIVE)
+	if test -z "$OCAMLNATIVE"; then
+		DEPEXT=.depo
 		COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
 	else
 		COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
+		DEPEXT=.depx
 	fi
 	. tools/ocamldriver.sh
 
 ## 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
@@ -128,10 +147,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.}