This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository cppo.
commit 4ece36e0bd6f717680ba7b8dbe7c27e2ab89fee4
Author: Stephane Glondu <st...@glondu.net>
Date: Wed Jun 1 11:26:50 2016 +0200
Imported Upstream version 1.3.2
---
Makefile | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 205face..b031fe2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,14 @@
-VERSION = 1.3.1
+VERSION = 1.3.2
ifeq "$(shell ocamlc -config |grep os_type)" "os_type: Win32"
EXE=.exe
else
EXE=
endif
+OBJ_EXT := $(shell ocamlc -config 2>/dev/null \
+ | grep '^ext_obj'|sed 's/ext_obj: //')
+LIB_EXT := $(shell ocamlc -config 2>/dev/null \
+ | grep '^ext_lib'|sed 's/ext_lib: //')
ifndef OCAMLYACC
OCAMLYACC = ocamlyacc
@@ -34,7 +38,7 @@ NATDYNLINK ?= $(shell if [ -f `ocamlc -where`/dynlink.cmxa ];
then \
OCAMLBUILD_IMPL := ocamlbuild_cppo.cma
ifeq "${BEST}" ".native"
-OCAMLBUILD_IMPL += ocamlbuild_cppo.cmxa ocamlbuild_cppo.a
+OCAMLBUILD_IMPL += ocamlbuild_cppo.cmxa ocamlbuild_cppo$(LIB_EXT)
ifeq "${NATDYNLINK}" "YES"
OCAMLBUILD_IMPL += ocamlbuild_cppo.cmxs
endif
@@ -99,7 +103,7 @@ test:
$(MAKE) -C test
clean:
- rm -f *.cm[iox] *.o *.annot *.conflicts *.automaton \
+ rm -f *.cm[iox] *$(OBJ_EXT) *.annot *.conflicts *.automaton \
cppo \
cppo_parser.mli cppo_parser.ml cppo_lexer.ml cppo_version.ml
$(MAKE) -C examples clean
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cppo.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
