X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=blobdiff_plain;f=Remakefile.in;h=c1f2b251a21d589c3958ec03c27f014a2873af27;hp=1b54199365041008a4537d5657ed9c50a5b3e0b3;hb=4f265eb7d78b740292b5543d94f9f0fa40d206d5;hpb=91d60f0cf46661abde8df94fead3688ec43a2db9

diff --git a/Remakefile.in b/Remakefile.in
index 1b54199..c1f2b25 100644
--- a/Remakefile.in
+++ b/Remakefile.in
@@ -3,8 +3,8 @@ OCAMLFINDPACKAGES = "ulex,unix,expat,camlp4.macro,bigarray"
 OCAMLFINDSYNTAX = camlp4o
 OCAMLFINDPPOPTS = $(addprefix "-ppopt ", @CAMLP4FLAGS@ -I include)
 OCAMLFINDINCLUDES = $(addprefix "-I ", src)
-OCAMLFINDFLAGSNOSYNTAX = -package $(OCAMLFINDPACKAGES) $(OCAMLFINDPPOPTS) $(OCAMLFINDINCLUDES)
-OCAMLFINDFLAGS = -syntax $(OCAMLFINDSYNTAX) $(OCAMLFINDFLAGSNOSYNTAX)
+OCAMLFINDFLAGS = -syntax $(OCAMLFINDSYNTAX) -package $(OCAMLFINDPACKAGES)  \
+	$(OCAMLFINDPPOPTS) $(OCAMLFINDINCLUDES)
 OCAMLFINDLINKFLAGS = -linkpkg
 PACKAGE = @PACKAGE_TARNAME@
 SRC = src
@@ -20,15 +20,10 @@ OCAMLOPT = @OCAMLOPT@
 OCAMLFLAGS = @OCAMLFLAGS@
 OCAMLOPTFLAGS = @OCAMLOPTFLAGS@
 OCAMLCFLAGS = @OCAMLCFLAGS@
-MENHIR = @MENHIR@
-
-
+OCAMLYACC = @OCAMLYACC@
 
 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 +77,7 @@ distclean: clean test_clean
 %.ml:
 	if test -f $*.mly; then
 		$(REMAKE) $*.mly
-		$(MENHIR) $*.mly
+		$(OCAMLYACC) $*.mly
 	elif test -f $*.mll; then
 		$(REMAKE) $*.mll
 		$(OCAMLLEX) $*.mll
@@ -102,7 +97,10 @@ distclean: clean test_clean
 	REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
 	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
 	SRC=$(SRC)
-	COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS)"
+	if test -f "$base".flags; then
+		FLAGS=`cat "$base".flags`
+	fi
+	COMPILE="$(OCAMLOPT) $(OCAMLFLAGS) $(OCAMLOPTFLAGS) $(OCAMLFINDFLAGS) $FLAGS"
 	. tools/ocamldriver.sh
 
 %.cmo %.depo:
@@ -111,10 +109,9 @@ distclean: clean test_clean
 	DEPEXT=depo
 	NATIVE=""
 	REMAKE="$(REMAKE) OCAMLNATIVE=$NATIVE"
-	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS) $(OCAMLFIND_EXTRAFLAGS)"
+	OCAMLDEP="$(OCAMLDEP) $(OCAMLFINDFLAGS)"
 	SRC=$(SRC)
-	COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFIND_EXTRAFLAGS) "
-
+	COMPILE="$(OCAMLC) $(OCAMLFLAGS) $(OCAMLCFLAGS) $(OCAMLFINDFLAGS)"
 	. tools/ocamldriver.sh
 
 %.cmi: