Skip to content
Snippets Groups Projects
Commit 30f46c0c authored by Pierre Loic Garoche's avatar Pierre Loic Garoche
Browse files

Renamed math lib into lustrec_math to avoid conflicting calls to <math.h>

parent 212d6eff
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,7 @@ bindir=@bindir@ ...@@ -4,7 +4,7 @@ bindir=@bindir@
datarootdir = ${prefix}/share datarootdir = ${prefix}/share
includedir = ${prefix}/include includedir = ${prefix}/include
LUSI_LIBS=include/math.lusi include/conv.lusi LUSI_LIBS=include/lustrec_math.lusi include/simulink_math_fcn.lusi include/conv.lusi
LUSI_MPFR_LIB=include/mpfr_lustre.lusi LUSI_MPFR_LIB=include/mpfr_lustre.lusi
LOCAL_BINDIR=bin LOCAL_BINDIR=bin
LOCAL_DOCDIR=doc/manual LOCAL_DOCDIR=doc/manual
...@@ -40,7 +40,7 @@ clean: clean-lusic ...@@ -40,7 +40,7 @@ clean: clean-lusic
@make -C src clean @make -C src clean
dist-src-clean: clean dist-src-clean: clean
@rm -f config.log config.status include/*.lusic include/math.h include/conv.h include/mpfr_lustre.h @rm -f config.log config.status include/*.lusic include/lustrec_math.h include/simulink_math_fcn.h include/conv.h include/mpfr_lustre.h
@rm -f Makefile ./src/Makefile ./src/pluginList.ml ./src/version.ml ./src/_tags @rm -f Makefile ./src/Makefile ./src/pluginList.ml ./src/version.ml ./src/_tags
DIST_ARCHIVE_NAME=lustrec-$(shell $(LOCAL_BINDIR)/lustrec -version | grep version | cut -d, -f 2 | sed -e "s/ version //" -e "s/ (/-/" -e "s/ /-/" -e "s/\//-/" -e "s/)//")-src.tar.gz DIST_ARCHIVE_NAME=lustrec-$(shell $(LOCAL_BINDIR)/lustrec -version | grep version | cut -d, -f 2 | sed -e "s/ version //" -e "s/ (/-/" -e "s/ /-/" -e "s/\//-/" -e "s/)//")-src.tar.gz
......
File moved
File moved
...@@ -13,7 +13,7 @@ let pp_call fmt m f outputs inputs = ...@@ -13,7 +13,7 @@ let pp_call fmt m f outputs inputs =
if Corelang.is_imported_node decl then if Corelang.is_imported_node decl then
let inode = Corelang.imported_node_of_top decl in let inode = Corelang.imported_node_of_top decl in
match inode.nodei_id, Filename.basename decl.top_decl_owner with match inode.nodei_id, Filename.basename decl.top_decl_owner with
| name, (("math" | "conv") as lib) -> ( | name, (("lustrec_math" | "simulink_math_fcn" | "conv") as lib) -> (
fprintf fmt "\"kind\": \"functioncall\",@ \"name\": \"%s\",@ \"library\": \"%s\",@ " fprintf fmt "\"kind\": \"functioncall\",@ \"name\": \"%s\",@ \"library\": \"%s\",@ "
name lib; name lib;
fprintf fmt "\"lhs\": [@[%a@]],@ \"args\": [@[%a@]]" fprintf fmt "\"lhs\": [@[%a@]],@ \"args\": [@[%a@]]"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment