diff --git a/commons/Makefile b/commons/Makefile index 6f6b55012..e37c80fa9 100644 --- a/commons/Makefile +++ b/commons/Makefile @@ -293,11 +293,13 @@ install: all all.opt common.mli ocaml.mli \ $(OCAMLSTDLIB)/$(LIBNAME) +#todo: $(EXPORTSRC:%.mli=%.cmt) but must be guarded by having bin-annot + # note that the dlllib.so will be added in lib/stublibs/ install-findlib: all all.opt ocamlfind install $(LIBNAME) META lib.cma lib.cmxa lib.a \ dlllib.so liblib.a \ - $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) $(EXPORTSRC:%.mli=%.cmt) + $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) uninstall-findlib: ocamlfind remove $(LIBNAME) diff --git a/graph_code/Makefile b/graph_code/Makefile index 162f6a844..64075a14c 100644 --- a/graph_code/Makefile +++ b/graph_code/Makefile @@ -45,4 +45,4 @@ EXPORTSRC= install-findlib: all all.opt ocamlfind install $(LIBNAME) META \ lib.cma lib.cmxa lib.a \ - $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) $(EXPORTSRC:%.mli=%.cmt) + $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) diff --git a/h_program-lang/Makefile b/h_program-lang/Makefile index f32384d55..b5ea6b77b 100644 --- a/h_program-lang/Makefile +++ b/h_program-lang/Makefile @@ -74,4 +74,4 @@ EXPORTSRC=parse_info.mli scope_code.mli install-findlib: all all.opt ocamlfind install $(LIBNAME) META \ lib.cma lib.cmxa lib.a \ - $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) $(EXPORTSRC:%.mli=%.cmt) + $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) diff --git a/h_visualization/treemap.ml b/h_visualization/treemap.ml index bb02bf5f9..8dce69e16 100644 --- a/h_visualization/treemap.ml +++ b/h_visualization/treemap.ml @@ -98,7 +98,7 @@ type rectangle1 = * use the full width. * old: was 16/9 = 1.777777 *) -let xy_ratio = 1.6 +let xy_ratio = 1.71 (* The dimentions are in a [0.0-1.0] range for y and [0.0-xyratio] for x, * where xyratio is used to cope with most 16/9 screens. diff --git a/lang_cpp/parsing/Makefile b/lang_cpp/parsing/Makefile index add210ea7..77c066048 100644 --- a/lang_cpp/parsing/Makefile +++ b/lang_cpp/parsing/Makefile @@ -96,5 +96,5 @@ EXPORTSRC=meta_ast_cpp.mli \ install-findlib: ocamlfind install $(LIBNAME) META lib.cma lib.cmxa lib.a \ - $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) $(EXPORTSRC:%.mli=%.cmt) \ + $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) \ ast_cpp.ml ast_cpp.cmi diff --git a/lang_css/parsing/Makefile b/lang_css/parsing/Makefile index a40d743ee..ffd48aa3c 100644 --- a/lang_css/parsing/Makefile +++ b/lang_css/parsing/Makefile @@ -82,5 +82,5 @@ EXPORTSRC=meta_ast_css.mli \ install-findlib: ocamlfind install $(LIBNAME) META lib.cma lib.cmxa lib.a \ - $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) $(EXPORTSRC:%.mli=%.cmt) \ + $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) \ ast_css.ml ast_css.cmi diff --git a/lang_html/parsing/Makefile b/lang_html/parsing/Makefile index 3340e22b5..ac7eff7a8 100644 --- a/lang_html/parsing/Makefile +++ b/lang_html/parsing/Makefile @@ -85,5 +85,5 @@ EXPORTSRC=meta_ast_html.mli \ install-findlib: ocamlfind install $(LIBNAME) META lib.cma lib.cmxa lib.a \ - $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) $(EXPORTSRC:%.mli=%.cmt) \ + $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) \ ast_html.ml ast_html.cmi diff --git a/lang_java/parsing/Makefile b/lang_java/parsing/Makefile index f84c2d7bc..67d4c05a2 100644 --- a/lang_java/parsing/Makefile +++ b/lang_java/parsing/Makefile @@ -75,5 +75,5 @@ EXPORTSRC=meta_ast_java.mli \ install-findlib: ocamlfind install $(LIBNAME) META lib.cma lib.cmxa lib.a \ - $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) $(EXPORTSRC:%.mli=%.cmt) \ + $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) \ ast_java.ml ast_java.cmi diff --git a/lang_js/parsing/Makefile b/lang_js/parsing/Makefile index 557c7a8f1..d842327ac 100644 --- a/lang_js/parsing/Makefile +++ b/lang_js/parsing/Makefile @@ -80,5 +80,5 @@ EXPORTSRC=meta_ast_js.mli \ install-findlib: ocamlfind install $(LIBNAME) META lib.cma lib.cmxa lib.a \ - $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) $(EXPORTSRC:%.mli=%.cmt) \ + $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) \ ast_js.ml ast_js.cmi ast_js.cmo ast_js.cmx diff --git a/lang_ml/parsing/Makefile b/lang_ml/parsing/Makefile index d89dd9b72..d6d0879d1 100644 --- a/lang_ml/parsing/Makefile +++ b/lang_ml/parsing/Makefile @@ -78,5 +78,5 @@ EXPORTSRC=meta_ast_ml.mli \ install-findlib: ocamlfind install $(LIBNAME) META lib.cma lib.cmxa lib.a \ - $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) $(EXPORTSRC:%.mli=%.cmt) \ + $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) \ ast_ml.ml ast_ml.cmi diff --git a/lang_php/parsing/Makefile b/lang_php/parsing/Makefile index ca684afdf..7e8ca91f7 100644 --- a/lang_php/parsing/Makefile +++ b/lang_php/parsing/Makefile @@ -81,7 +81,7 @@ EXPORTSRC=meta_ast_php.mli unparse_php.mli \ install-findlib: ocamlfind install $(LIBNAME) META lib.cma lib.cmxa lib.a \ - $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) $(EXPORTSRC:%.mli=%.cmt) \ + $(EXPORTSRC) $(EXPORTSRC:%.mli=%.cmi) \ ast_php.ml ast_php.cmi ast_php.cmo ast_php.cmx \ flag_parsing_php.ml flag_parsing_php.cmi flag_parsing_php.cmo flag_parsing_php.cmx \