why/why-2.23-Makefile.in.patch
Alan Dunn d5397effc2 - Upgrade to upstream version 2.23
- Move execstack fixing to spec file from patch
- Moved patch descriptions to initial patch declaration as in examples in
    Fedora documentation
- New Caduceus, Krakatoa documentation
- Update test result from small test min.mlw
- Added CVC3 interfacing capabilities
- Removed patch for gwhy configuration, as there is a new mechanism for
    this
2010-01-08 19:58:52 +00:00

49 lines
1.6 KiB
Diff

--- why-2.23-old/Makefile.in 2010-01-04 21:08:49.858843630 -0500
+++ why-2.23/Makefile.in 2010-01-05 20:34:20.912391080 -0500
@@ -650,14 +650,23 @@
bin/cadlog.opt: src/version.cmx c/cversion.cmx tools/cadlog.cmx
$(OCAMLOPT) unix.cmxa -o $@ $^
+ifeq ($(OCAMLBEST), opt)
+MAKE_FLOAT_MODEL = tools/make_float_model.opt
+else
+MAKE_FLOAT_MODEL = tools/make_float_model.byte
+endif
+
+tools/make_float_model.byte: tools/make_float_model.cmo
+ $(OCAMLC) -o $@ $^
+
tools/make_float_model.opt: tools/make_float_model.cmx
$(OCAMLOPT) -o $@ $^
-lib/why/double_model.why lib/why/double_strict.why: tools/make_float_model.opt
- tools/make_float_model.opt double 53 -1074
+lib/why/double_model.why lib/why/double_strict.why: $(MAKE_FLOAT_MODEL)
+ $(MAKE_FLOAT_MODEL) double 53 -1074
-lib/why/single_model.why lib/why/single_strict.why: tools/make_float_model.opt
- tools/make_float_model.opt single 24 -149
+lib/why/single_model.why lib/why/single_strict.why: $(MAKE_FLOAT_MODEL)
+ $(MAKE_FLOAT_MODEL) single 24 -149
static:: $(STATICBINARY)
@@ -842,15 +851,9 @@
cp -f $(V7FILES) $(LIBDIR)/why/coq7
cp -f $(VO7) $(LIBDIR)/why/coq7
install-coq-v8 install-coq-v8.1:
- if test -w $(COQLIB) ; then \
- mkdir -p $(COQLIB)/user-contrib ; \
- cp -f $(V8FILES) $(COQLIB)/user-contrib ; \
- cp -f $(VO8) $(COQLIB)/user-contrib ; \
- else \
- echo "Cannot copy to Coq standard library. Add $(LIBDIR)/why/coq to Coq include path." ;\
- mkdir -p $(LIBDIR)/why/coq ;\
- cp -f $(VO8) $(V8FILES) $(LIBDIR)/why/coq ;\
- fi
+ mkdir -p $(COQLIB)/user-contrib
+ cp -f $(V8FILES) $(COQLIB)/user-contrib
+ cp -f $(VO8) $(COQLIB)/user-contrib
install-pvs-no:
install-pvs-yes: $(PVSFILES)