aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7>2003-11-07 22:44:36 +0000
committerGravatar herbelin <herbelin@85f007b7-540e-0410-9357-904b9bb8a0f7>2003-11-07 22:44:36 +0000
commitfb07608cdd6c530cf8360f4f8fe0a0d34729ad43 (patch)
tree86aae5e5884e0e3158507a1687e6876db8e51dbb
parent568366ceb8437efa002aaf5ca66a86b5c0c30020 (diff)
Biblio standard sans mention de la possibilite d'etre impredicatif; Hurkens_set disparait de la biblio standard
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@4824 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 804bd0e92..f841dccd3 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,6 @@ OCAMLC_P4O=$(OCAMLC) -pp $(CAMLP4O) $(BYTEFLAGS)
OCAMLOPT_P4O=$(OCAMLOPT) -pp $(CAMLP4O) $(OPTFLAGS)
CAMLP4EXTENDFLAGS=-I . pa_extend.cmo pa_extend_m.cmo pa_ifdef.cmo q_MLast.cmo
CAMLP4DEPS=sed -n -e 's|^(\*.*camlp4deps: "\(.*\)".*\*)$$|\1|p'
-LOGICDEP=sed -n -e 's|^(\*.*logic: "\(.*\)".*\*)$$|\1|p'
COQINCLUDES= # coqtop includes itself the needed paths
GLOB= # is "-dump-glob file" when making the doc
@@ -535,8 +534,7 @@ LOGICVO=\
theories/Logic/Berardi.vo theories/Logic/Eqdep_dec.vo \
theories/Logic/Decidable.vo theories/Logic/JMeq.vo \
theories/Logic/ClassicalDescription.vo theories/Logic/ClassicalChoice.vo \
- theories/Logic/RelationalChoice.vo theories/Logic/Diaconescu.vo \
- theories/Logic/Hurkens_Set.vo
+ theories/Logic/RelationalChoice.vo theories/Logic/Diaconescu.vo
ARITHVO=\
theories/Arith/Arith.vo theories/Arith/Gt.vo \
@@ -805,7 +803,7 @@ newtheories/%.v: theories/%.vo
@cp -f theories/$*.v8 newtheories/$*.v
theories/%.vo: theories/%.v states/initial.coq
- $(BOOTCOQTOP) $(TRANSLATE) `$(LOGICDEP) $<` -compile theories/$*
+ $(BOOTCOQTOP) $(TRANSLATE) -compile theories/$*
newcontrib/%.v: contrib/%.vo
@$(MKDIR) newcontrib/`dirname $*`
@@ -818,7 +816,7 @@ newtheories/Init/%.vo: $(BESTCOQTOP) newtheories/Init/%.v
$(BOOTCOQTOP) -nois -compile $*
newtheories/%.vo: newtheories/%.v states/initialnew.coq
- $(BOOTCOQTOP) `$(LOGICDEP) $<` -compile newtheories/$*
+ $(BOOTCOQTOP) -compile newtheories/$*
newcontrib/%.vo: newcontrib/%.v states/initialnew.coq
$(BOOTCOQTOP) -compile newcontrib/$*