diff options
| author | filliatr | 2001-04-19 07:39:08 +0000 |
|---|---|---|
| committer | filliatr | 2001-04-19 07:39:08 +0000 |
| commit | 45f18a28307405c53ab560247cb228028ce1cea8 (patch) | |
| tree | ce5cd9bf90f174cfb76fea2c7195f2e335da5fb7 | |
| parent | 831886a339af8bd5cd14f9d7e5ea4f9ff9ecd744 (diff) | |
-boot n'implique plus -batch
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@1613 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | toplevel/coqtop.ml | 3 |
2 files changed, 6 insertions, 7 deletions
@@ -302,7 +302,7 @@ states: states/barestate.coq states/initial.coq SYNTAXPP=syntax/PPConstr.v syntax/PPCases.v syntax/PPTactic.v states/barestate.coq: $(SYNTAXPP) $(BESTCOQTOP) - $(BESTCOQTOP) -boot -silent -nois -I syntax -load-vernac-source syntax/MakeBare.v -outputstate states/barestate.coq + $(BESTCOQTOP) -boot -batch -silent -nois -I syntax -load-vernac-source syntax/MakeBare.v -outputstate states/barestate.coq INITVO=theories/Init/Datatypes.vo theories/Init/Peano.vo \ theories/Init/DatatypesSyntax.vo theories/Init/Prelude.vo \ @@ -312,7 +312,7 @@ INITVO=theories/Init/Datatypes.vo theories/Init/Peano.vo \ theories/Init/Logic_TypeSyntax.vo theories/Init/%.vo: theories/Init/%.v states/barestate.coq $(COQC) - $(COQC) -boot -$(BEST) $(INCLUDES) -R theories Coq -is states/barestate.coq $< + $(COQC) -boot -$(BEST) -R theories Coq -is states/barestate.coq $< init: $(INITVO) @@ -323,13 +323,13 @@ TACTICSVO=tactics/Equality.vo tactics/Tauto.vo tactics/Inv.vo \ tactics/EqDecide.vo $(EXTRACTIONVO) tactics/%.vo: tactics/%.v states/barestate.coq $(COQC) - $(COQC) -boot -$(BEST) $(INCLUDES) -I tactics -is states/barestate.coq $< + $(COQC) -boot -$(BEST) $(INCLUDES) -is states/barestate.coq $< contrib/extraction/%.vo: contrib/extraction/%.v states/barestate.coq $(COQC) $(COQC) -boot -$(BEST) $(COQINCLUDES) -is states/barestate.coq $< states/initial.coq: states/barestate.coq states/MakeInitial.v $(INITVO) $(TACTICSVO) $(BESTCOQTOP) - $(BESTCOQTOP) -boot -silent -is states/barestate.coq $(COQINCLUDES) $(INCLUDES) -load-vernac-source states/MakeInitial.v -outputstate states/initial.coq + $(BESTCOQTOP) -boot -batch -silent -is states/barestate.coq $(COQINCLUDES) $(INCLUDES) -load-vernac-source states/MakeInitial.v -outputstate states/initial.coq clean:: rm -f states/*.coq @@ -701,7 +701,7 @@ clean:: $(OCAMLC) $(BYTEFLAGS) -pp "$(CAMLP4O) $(CAMLP4EXTENDFLAGS) `$(CAMLP4DEPS) $<` -impl" -c -impl $< .v.vo: - $(COQC) -boot -$(BEST) $(COQINCLUDES) $< + $(COQC) -boot -$(BEST) $(COQINCLUDES) $< .el.elc: echo "(setq load-path (cons \".\" load-path))" > $*.compile diff --git a/toplevel/coqtop.ml b/toplevel/coqtop.ml index 9e9c3436a7..27bb17d850 100644 --- a/toplevel/coqtop.ml +++ b/toplevel/coqtop.ml @@ -120,8 +120,7 @@ let parse_args () = | "-full" :: rem -> warning "option -full deprecated\n"; parse rem | "-batch" :: rem -> set_batch_mode (); parse rem - | "-boot" :: rem -> boot := true; no_load_rc (); set_batch_mode (); - parse rem + | "-boot" :: rem -> boot := true; no_load_rc (); parse rem | "-outputstate" :: s :: rem -> set_outputstate s; parse rem | "-outputstate" :: [] -> usage () |