This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository biniou.
commit 04c490a2c02e76694cd886b5dd86cf892c892869
Author: Stephane Glondu <st...@glondu.net>
Date: Wed Aug 3 13:20:51 2016 +0200
Imported Upstream version 1.0.11
---
.gitignore | 3 +++
Makefile | 21 ++++++++++++++++++---
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2ff1963..76fa4f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,7 @@ META
bdump
test-stream.dat
test2.bin
+*.byte
+*.native
+*.exe
test_biniou
diff --git a/Makefile b/Makefile
index 93681b9..aae8631 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.0.10
+VERSION = 1.0.11
FLAGS = -g -annot -bin-annot
PACKS = easy-format
@@ -9,8 +9,21 @@ else
EXE=
endif
-BEST != if ocamlfind ocamlopt 2>/dev/null; then echo .native; else echo .byte;
fi
-NATDYNLINK != if [ -f `ocamlfind ocamlc -where`/dynlink.cmxa ]; then echo YES;
else echo NO; fi
+BEST = $(shell \
+ if ocamlfind ocamlopt 2>/dev/null; then \
+ echo .native; \
+ else \
+ echo .byte; \
+ fi \
+)
+
+NATDYNLINK = $(shell \
+ if [ -f `ocamlfind ocamlc -where`/dynlink.cmxa ]; then \
+ echo YES; \
+ else \
+ echo NO; \
+ fi \
+)
ifeq "${NATDYNLINK}" "YES"
CMXS=biniou.cmxs
@@ -18,11 +31,13 @@ endif
.PHONY: default all byte opt install doc test
default: all test_biniou$(EXE)
+
ifeq "$(BEST)" ".native"
all: byte opt doc META
else
all: byte doc META
endif
+
byte: biniou.cma bdump.byte
opt: biniou.cmxa $(CMXS) bdump.native
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/biniou.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
