From 9b3572c135e272c508da7bc599ce187351917bf4 Mon Sep 17 00:00:00 2001 From: Ferruccio Guidi Date: Tue, 3 Oct 2006 11:18:21 +0000 Subject: [PATCH] updated to use destruct instead of disciminate/injection --- .../matita/contribs/RELATIONAL/Nat/fwd.ma | 6 ++--- .../matita/contribs/RELATIONAL/makefile | 22 +++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/helm/software/matita/contribs/RELATIONAL/Nat/fwd.ma b/helm/software/matita/contribs/RELATIONAL/Nat/fwd.ma index 09847de2e..0938e4d9a 100644 --- a/helm/software/matita/contribs/RELATIONAL/Nat/fwd.ma +++ b/helm/software/matita/contribs/RELATIONAL/Nat/fwd.ma @@ -19,13 +19,13 @@ include "logic/equality.ma". include "Nat/defs.ma". theorem eq_gen_zero_succ: \forall (P:Prop). \forall m2. zero = succ m2 \to P. - intros. discriminate H. + intros. destruct H. qed. theorem eq_gen_succ_zero: \forall (P:Prop). \forall m1. succ m1 = zero \to P. - intros. discriminate H. + intros. destruct H. qed. theorem eq_gen_succ_succ: \forall m1,m2. succ m1 = succ m2 \to m1 = m2. - intros. injection H. assumption. + intros. destruct H. assumption. qed. diff --git a/helm/software/matita/contribs/RELATIONAL/makefile b/helm/software/matita/contribs/RELATIONAL/makefile index a9ac2184e..b3177beae 100644 --- a/helm/software/matita/contribs/RELATIONAL/makefile +++ b/helm/software/matita/contribs/RELATIONAL/makefile @@ -9,25 +9,29 @@ CLEANO=$(RT_BASEDIR)matitaclean.opt $(OPTIONS) devel:=$(shell basename `pwd`) +ifneq "$(SRC)" "" + XXX="SRC=$(SRC)" +endif + all: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) build $(devel) + $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) build $(devel) clean: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) clean $(devel) + $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) clean $(devel) cleanall: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEAN) all + $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEAN) all all.opt opt: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) build $(devel) + $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) build $(devel) clean.opt: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) clean $(devel) + $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) clean $(devel) cleanall.opt: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEANO) all + $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MCLEANO) all %.mo: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) $@ + $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) $@ %.mo.opt: preall - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) $@ + $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKEO) $@ preall: - $(H)MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) init $(devel) + $(H)$(XXX) MATITA_FLAGS=$(MATITA_FLAGS) $(MMAKE) init $(devel) -- 2.39.2