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

diff --git a/Remakefile.in b/Remakefile.in
index 5c3fe42..2a32aa2 100644
--- a/Remakefile.in
+++ b/Remakefile.in
@@ -26,9 +26,6 @@ MENHIR = @MENHIR@
 
 all: $(BIN)
 
-src/xpath/xpath_internal_parser.cmx: OCAMLFINDFLAGS = $(OCAMLFINDFLAGSNOSYNTAX)
-src/xpath/xpath_internal_parser.cmo: OCAMLFINDFLAGS = $(OCAMLFINDFLAGSNOSYNTAX)
-
 tools: tools/xml_diff.native$(EXE) tools/XPathEval.class tools/split_path.native$(EXE)
 
 Remakefile: Remakefile.in config.status
@@ -82,7 +79,11 @@ distclean: clean test_clean
 %.ml:
 	if test -f $*.mly; then
 		$(REMAKE) $*.mly
-		$(MENHIR) $*.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
@@ -114,7 +115,7 @@ distclean: clean test_clean
 	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
 	OCAMLNATIVE=$(OCAMLNATIVE)
 	SRC=$(SRC)
-	COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFIND_EXTRAFLAGS) "
+	COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
 	. tools/ocamldriver.sh
 
 %.cmi: