X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=components%2Ftactics%2FMakefile;h=aa16069976a5c9461407fc0007382b08c21a1dd5;hb=894b08ca7d14aa7e31c35f3acb3903a1c3472a27;hp=698729bef9379cc7f8338130f0dac5b703d1d0b9;hpb=eba67a7f8b8f479ff60226d2d8c935c60277f8e6;p=helm.git

diff --git a/components/tactics/Makefile b/components/tactics/Makefile
index 698729bef..aa1606997 100644
--- a/components/tactics/Makefile
+++ b/components/tactics/Makefile
@@ -6,19 +6,19 @@ INTERFACE_FILES = \
 	continuationals.mli \
 	tacticals.mli reductionTactics.mli proofEngineStructuralRules.mli \
 	primitiveTactics.mli hashtbl_equiv.mli metadataQuery.mli \
-  paramodulation/utils.mli \
-  paramodulation/subst.mli\
-  paramodulation/equality.mli\
-  paramodulation/inference.mli\
-  paramodulation/equality_indexing.mli\
-  paramodulation/indexing.mli \
-  paramodulation/saturation.mli \
-	variousTactics.mli autoTactic.mli \
+	paramodulation/utils.mli \
+ 	paramodulation/subst.mli\
+	paramodulation/equality.mli\
+	paramodulation/inference.mli\
+	paramodulation/equality_indexing.mli\
+	paramodulation/indexing.mli \
+	paramodulation/saturation.mli \
+	variousTactics.mli \
 	introductionTactics.mli	eliminationTactics.mli negationTactics.mli \
-	equalityTactics.mli discriminationTactics.mli inversion.mli \
-	inversion_principle.mli ring.mli \
+	equalityTactics.mli autoTactic.mli discriminationTactics.mli \
+        inversion.mli inversion_principle.mli ring.mli setoids.mli \
 	fourier.mli fourierR.mli fwdSimplTactic.mli history.mli \
-	statefulProofEngine.mli tactics.mli
+	statefulProofEngine.mli tactics.mli declarative.mli
 
 IMPLEMENTATION_FILES = $(INTERFACE_FILES:%.mli=%.ml)
 
@@ -30,19 +30,19 @@ tactics_mli_deps=tactics.ml *Tactics.mli *Tactic.mli fourierR.mli ring.mli param
 tactics.mli: 
 	$(H)echo "  OCAMLC -i $$(tactics_mli_deps) > $@"
 	$(H)echo "(* GENERATED FILE, DO NOT EDIT. STAMP:`date` *)" > $@
-	$(H)$(OCAMLC) -I paramodulation -i $(tactics_mli_deps) >> $@
+	$(H)$(OCAMLC) -I paramodulation -i tactics.ml >> $@
+# FG: tactics.ml was (wrongly) $(tactics_mli_deps)
 
 UTF8DIR = $(shell $(OCAMLFIND) query helm-syntax_extensions)
-MY_SYNTAXOPTIONS = -pp "camlp4o -I $(UTF8DIR) pa_extend.cmo profiling_macros.cma -loc loc"
+STR=$(shell $(OCAMLFIND) query str)
+MY_SYNTAXOPTIONS = -pp "camlp4o -I $(UTF8DIR) -I $(STR) str.cma pa_extend.cmo profiling_macros.cma -loc loc"
 paramodulation/%.cmo: SYNTAXOPTIONS = $(MY_SYNTAXOPTIONS)
-paramodulation/%.cmx: SYNTAXOPTIONS = $(MY_SYNTAXOPTIONS)
-depend: SYNTAXOPTIONS = $(MY_SYNTAXOPTIONS)
-depend.opt: SYNTAXOPTIONS = $(MY_SYNTAXOPTIONS)
-# </cross>
-#
 paramodulation/%.cmo: OCAMLC = $(OCAMLC_P4)
+paramodulation/%.cmx: SYNTAXOPTIONS = $(MY_SYNTAXOPTIONS)
 paramodulation/%.cmx: OCAMLOPT = $(OCAMLOPT_P4)
 
+depend: SYNTAXOPTIONS = $(MY_SYNTAXOPTIONS)
+depend.opt: SYNTAXOPTIONS = $(MY_SYNTAXOPTIONS)
 
 STATS_EXCLUDE = tactics.mli