aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorherbelin2000-04-26 14:28:56 +0000
committerherbelin2000-04-26 14:28:56 +0000
commit895c929407228fe1d20f9c72d2f5af2b75781a2d (patch)
tree4845c8815240c906e8fd258732ba2cef068a9e3c
parent436460de70b57532e966cf1d42c25dea3cac39ea (diff)
Débranchement provisoire equality et tauto
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@374 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index d8e9142ab4..d83cb94acf 100644
--- a/Makefile
+++ b/Makefile
@@ -108,8 +108,8 @@ TOPLEVEL=toplevel/himsg.cmo toplevel/errors.cmo toplevel/vernacinterp.cmo \
toplevel/protectedtoplevel.cmo toplevel/toplevel.cmo \
toplevel/usage.cmo toplevel/coqinit.cmo toplevel/coqtop.cmo
-HIGHTACTICS=tactics/dhyp.cmo tactics/auto.cmo tactics/equality.cmo \
- tactics/tauto.cmo
+HIGHTACTICS=tactics/dhyp.cmo tactics/auto.cmo # tactics/equality.cmo \
+# tactics/tauto.cmo
CMA=$(CLIBS) $(CAMLP4OBJS)
CMXA=$(CMA:.cma=.cmxa)
@@ -198,15 +198,15 @@ INITVO=theories/Init/Datatypes.vo theories/Init/Peano.vo \
theories/Init/Logic_TypeSyntax.vo
theories/Init/%.vo: theories/Init/%.v states/barestate.coq
- $(COQC) -bindir $(COQTOP) -q -I theories/Init -is states/barestate.coq $<
+ $(COQC) -q -I theories/Init -is states/barestate.coq $<
TACTICSVO=tactics/Equality.vo tactics/Tauto.vo tactics/Inv.vo
tactics/%.vo: tactics/%.v states/barestate.coq
- $(COQC) -bindir $(COQTOP) -q -I tactics -is states/barestate.coq $<
+ $(COQC) -q -I tactics -is states/barestate.coq $<
states/initial.coq: states/barestate.coq states/MakeInitial.v $(INITVO) $(TACTICSVO)
- ./coqtop.byte -q -batch -silent -is states/barestate.coq -I tactics -I theories/Init -load-vernac-source states/MakeInitial.v -outputstate states/initial.coq
+ ./coqtop.byte -q -batch -silent -is states/barestate.coq -I tactics -load-vernac-source states/MakeInitial.v -outputstate states/initial.coq
clean::
rm -f states/barestate.coq states/initial.coq
@@ -447,7 +447,7 @@ toplevel/mltop.cmx: toplevel/mltop.ml4
$(OCAMLOPT) $(OPTFLAGS) -pp "$(CAMLP4EXTEND) -impl" -c -impl $<
.v.vo:
- $(COQC) -bindir $(COQTOP) -I states $(COQINCLUDES) -q $<
+ $(COQC) $(COQINCLUDES) -q $<
.el.elc:
echo "(setq load-path (cons \".\" load-path))" > $*.compile